Olof Johansson [Tue, 11 Mar 2014 20:30:39 +0000 (13:30 -0700)]
Merge tag 'bcm2835-for-3.15-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi into next/dt
Merge "ARM: bcm2835: DT changes for 3.15" from Stephen Warren:
A variety of features are added to the bcm2835 device trees:
- ARM PMU, for perf_event
- DMA controller
- I2S controller
A few cleanups are applied to the DTs too.
* tag 'bcm2835-for-3.15-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi:
ARM: bcm2835: fix clock DT node names
ARM: bcm2835: node name unit address cleanup
ARM: bcm2835: fix DT node sort order
ARM: bcm2835: add I2S driver to device tree
ARM: bcm2835: add dmaengine driver to device tree
ARM: bcm2835: perf_event support for Raspberry-Pi
Olof Johansson [Tue, 11 Mar 2014 20:00:21 +0000 (13:00 -0700)]
Merge tag 'keystone-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/dt
Keystone DTS updates for 3.15 from Santosh Shilimkar:
- Add watchdog timer, timer64 and gpio device nodes
- Add LED device nodes
- Fixes for debugss, msmc clock nodes
- Add support for Keystone Lamarr and Edision SOC/EVM support
- Add NAND and AEMIF device nodes
* tag 'keystone-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
ARM: dts: keystone: add AEMIF/NAND device entry
ARM: dts: keystone: add support for k2 Edison SoC and EVM
ARM: dts: keystone: add support for K2 Lamarr SoC and EVM
ARM: dts: keystone: preparatory patch to support K2L and K2E SOCs
ARM: dts: keystone: update for supporting K2L/K2E EVMs
ARM: dts: keystone: fix domain id for clkdebugsstrc
ARM: dts: keystone: drop msmcsram clock node
ARM: dts: k2hk-evm: rename clock node to clocks
ARM: dts: k2hk-evm: add leds supports
ARM: dts: keystone: add gpio device entry
ARM: dts: keystone: add keystone timer entry
ARM: dts: keystone: add watchdog entry
Olof Johansson [Sun, 9 Mar 2014 19:01:52 +0000 (12:01 -0700)]
Merge tag 'imx-dt-3.15-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
i.MX device tree changes for 3.15, take 2 from Shawn Guo:
- Cleanup and device additions for imx27-phytec-phycard boards
- eDMA and audio support for vf610-twr board
- Minor updates and fixes for a couple of imx28 and imx5 boards
* tag 'imx-dt-3.15-2' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: dts: vf610: i2c: Add eDMA support
ARM: dts: imx27-phytec-phycore-som: Add USBOTG node
ARM: dts: imx27-phytec-phycore-rdk: Add USBH2 node
ARM: dts: i.MX27: Add USB nodes
ARM: dts: vf610-twr: Add ADC support
ARM: dts: mxs: Fix the RTC compatible prop on M28EVK
ARM: dts: vf610-twr: Add simple-card support.
ARM: dts: vf610-twr: Enable SGTL5000 codec.
ARM: dts: vf610-twr: Enable SAI ALSA SoC DAI device
ARM: dts: vf610: Add edma mux Tx and Rx support for SAI node.
ARM: dts: vf610: lpuart: Add eDMA support
ARM: dts: vf610: Add eDMA node
ARM: dts: imx27-phytec-phycore: Add diagnostic PMIC LEDs
ARM: dts: imx27-phytec-phycard-s-som: Rename file to .dtsi
ARM: dts: i.MX51 babbage: Support diagnostic LED
ARM: dts: imx28-tx28: Remove 'enable-active-low' property
ARM: dts: mx53: Remove 'enable-active-low' property
ARM: dts: imx27-phytec-phycard-s-rdk: Add pinctrl definitions for SDHC2
ARM: dts: imx27-phytec-phycard-s-som: Add NFC node
ARM: dts: imx27-phytec-phycard-s-som: Sort entries
Olof Johansson [Sun, 9 Mar 2014 18:59:18 +0000 (11:59 -0700)]
Merge tag 'imx6-dt-3.15-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
i.MX6 device tree changes for 3.15, take 2 from Shawn Guo:
- Add USB, GPMI and SATA support for imx6q-phytec board
- Update imx6sl-evk board support regarding PFUZE100, audio and
LED etc.
- Minor updates on a few imx6qdl boards
* tag 'imx6-dt-3.15-2' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: dts: imx6q-phytec: Added SATA Support
ARM: dts: imx6q-phytec: Added GPMI-NAND Support
ARM: dts: imx6q-phytec: Added USB_HOST Support
ARM: dts: imx6q-phytec: Added USB_OTG Support
ARM: dts: imx6sl-evk: Keep VGEN1 regulator always enabled
ARM: dts: imx6qdl-sabreauto: Support debug LED
ARM: dts: imx6q: add 852MHz setpoint for CPU freq
ARM: dts: imx6qdl-wandboard: use GPIO_6 for FEC interrupt
ARM: dts: imx6sl-evk: Add debug LED support
ARM: dts: imx6qdl-sabreauto: Add PFUZE100 support
ARM: dts: imx6sl-evk: Add audio support
ARM: dts: imx6sl-evk: Add PFUZE100 support
ARM: dts: imx6qdl-sabresd: correct gpio key's active state
Olof Johansson [Sun, 9 Mar 2014 18:44:23 +0000 (11:44 -0700)]
Merge tag 'ux500-dt-v3.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt
A set of device tree-related cleanups for the ux500 platform from Linus
Walleij:
- Rename SSP/SPI clocks to the name found in the hardware
reference manual. (Also includes a rename in the U300
device tree file.)
- Delete dead non-DT code.
- Drop now completely unused GPIO definition header file.
- Delete all hardcoded IRQ number assignments. This hits
MFD a bit so the patch has been ACKed by Lee Jones from
the MFD side.
* tag 'ux500-dt-v3.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
mfd: dbx500/abx500: root out hardcoded IRQ assignments
ARM: ux500: drop a chunk of GPIO definitions
ARM: ux500: skip GIC CPU and dist address checks
ARM: ux500: delete pointless DT config option
ARM: u300: switch SSP/SPI clock name to "SSPCLK"
ARM: ux500: switch SSP/SPI clock name to "SSPCLK"
Olof Johansson [Sun, 9 Mar 2014 18:40:13 +0000 (11:40 -0700)]
Merge tag 'sunxi-dt-for-3.15' of https://github.com/mripard/linux into next/dt
Allwinner DT patches for 3.15, take 1 from Maxime Ripard:
- Add SPI controllers for all the SoCs
- Add various missing aliases
- Add USB clocks nodes
- Addition of the GMAC support
- Introduction of the pcDuino board
- A few DT cleanup patches: change of compatibles,
* tag 'sunxi-dt-for-3.15' of https://github.com/mripard/linux: (33 commits)
ARM: sun6i: dt: Fix mod0 compatible
ARM: dts: sun7i: Enable the SPI controllers of the A20-olinuxino-micro
ARM: dt: sun7i: Add SPI muxing options
ARM: dt: sun5i: Add A13 SPI controller nodes
ARM: dt: sun5i: Add A10s SPI controller nodes
ARM: dt: sun4i: Add A10 SPI controller nodes
ARM: dt: sun7i: Add A20 SPI controller nodes
ARM: sun4i: dt: Remove grouping + simple-bus compatible for regulators
ARM: sunxi: dt: Convert to the new clock compatibles
ARM: sun7i: add arch timer node
ARM: sun7i: dt: Add bindings for USB clocks
ARM: sun5i: dt: Add bindings for USB clocks
ARM: sun4i: dt: Add bindings for USB clocks
ARM: dts: sun7i: Add ethernet alias for GMAC
ARM: dts: sun7i: a20-olinuxino-micro: Enable GMAC instead of EMAC
ARM: dts: sun7i: cubieboard2: Enable GMAC instead of EMAC
ARM: dts: sun7i: cubietruck: Enable the GMAC
ARM: dts: sun7i: Add pin muxing options for the GMAC
ARM: dts: sun7i: Add GMAC controller node to sun7i DTSI
ARM: dts: sun7i: Add GMAC clock node to sun7i DTSI
...
Olof Johansson [Sun, 9 Mar 2014 18:33:01 +0000 (11:33 -0700)]
Merge tag 'exynos-clk' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt
Samsung exynos clock related DT updates for v3.15 from Kukjim Kim:
- use macros instead of hard coded numbers for clock bindings
NOTE: this is based on v3.15-next/dt-samsung
* tag 'exynos-clk' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: dts: use macros in clock bindings for exynos5440
ARM: dts: use macros in clock bindings for exynos5420
ARM: dts: use macros in clock bindings for exynos5250
ARM: dts: use macros in clock bindings for exynos4
Olof Johansson [Sun, 9 Mar 2014 18:30:49 +0000 (11:30 -0700)]
Merge tag 'samsung-dt' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt
Samsung DT updates for v3.15 from Kukjin Kim:
For exynos4412
- update vdd_arm voltage range for odroidx board
For exynos5250
- add PMU sysreg node and update watchdog node
- re-organize RTC status
- add max77686 pmic node for smdk5250
For exynos5420
- add PMU sysreg, i2s, adma and watchdog nodes
- re-organize RTC status
- add fixed voltage regulators and regulator nodes
for smdk5420
- add PMIC, GPIO based wake up key and vmmc-supply
support for arndale-octa board
* tag 'samsung-dt' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: dts: Add vmmc-supply to MMC on arndale-octa board
ARM: dts: Add wake up key to arndale-octa board
ARM: dts: Add PMIC support to arndale-octa board
ARM: dts: Add fixed voltage regulators to smdk5420
ARM: dts: Add I2S nodes to exynos5420
ARM: dts: Add ADMA node to exynos5420
ARM: dts: Re-organize RTC status for exynos5250
ARM: dts: Re-organize RTC status for exynos5420
ARM: dts: Add regulator entries to smdk5420
ARM: dts: add max77686 pmic node for smdk5250
ARM: dts: update vdd_arm voltage range for exynos4412 based boards
ARM: dts: update watchdog device nodes for exynos5250 and exynos5420
ARM: dts: Add pmu sysreg node to exynos5250 and exynos5420
Add ABB device nodes for OMAP443x family of devices. abb_iva is
populated, but disabled as it is not used on current OMAP443x family,
but the node is used on OMAP446x family. Data is based on OMAP443x
Technical Reference Manual revision AN (April 2013).
ABB device nodes for OMAP4460 device Data is based on OMAP4460
Technical Reference Manual revision Z (April 2013)
[nm@ti.com: co-developer] Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Andrii.Tseglytskyi <andrii.tseglytskyi@ti.com> Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
ARM: dts: omap5: added dt properties to adapt to the new phy framwork
Added device tree bindings for dwc3, usb2 and usb3 PHYs. The documentation
of these can be found at Documentation/devicetree/bindings/phy/phy-bindings.txt
and Documentation/devicetree/bindings/phy/ti-phy.txt.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Matt Porter [Wed, 19 Feb 2014 20:01:51 +0000 (15:01 -0500)]
ARM: dts: remove bcm11351-brt.dts
The BCM11351 BRT board will never see the light of day. Remove the BRT
dts since it is not maintainable.
Reviewed-by: Alex Elder <elder@linaro.org> Reviewed-by: Christian Daudt <bcm@fixthebug.org> Reviewed-by: Markus Mayer <markus.mayer@linaro.org> Signed-off-by: Matt Porter <mporter@linaro.org>
Roger Quadros [Thu, 27 Feb 2014 14:18:31 +0000 (16:18 +0200)]
ARM: dts: Update echi-omap DT binding example usage
Remove non-compatible id from examples.
CC: Alan Stern <stern@rowland.harvard.edu> CC: Nishant Menon <nm@ti.com> CC: Kevin Hilman <khilman@linaro.org> Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Roger Quadros [Thu, 27 Feb 2014 14:18:30 +0000 (16:18 +0200)]
ARM: dts: Get rid of incompatible ids for hci-omap USB host nodes
The OMAP EHCI and OHCI controllers are not compatible with drivers
other than "ti,ehci-omap" and "ti,ohci-omap3" respectively, so get
rid of the incompatible ids.
CC: Alan Stern <stern@rowland.harvard.edu> CC: Nishant Menon <nm@ti.com> CC: Kevin Hilman <khilman@linaro.org> Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Linus Walleij [Mon, 3 Feb 2014 23:35:56 +0000 (00:35 +0100)]
mfd: dbx500/abx500: root out hardcoded IRQ assignments
The DBx500 and ABx500 should be getting their IRQs from the
device tree and nowhere else. Get rid of all the static assignments
everywhere, delete it from the driver, platform data and the
board files in one swift strike.
Lots of cross-dependencies in the MFD drivers for PRCMU and
AB8500 makes it necessary to strike everywhere at once to
eradicate IRQs passed as resources and platform data to the left
and right around the platform.
Cc: Mark Brown <broonie@kernel.org> Cc: Samuel Ortiz <sameo@linux.intel.com> Acked-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Pekon Gupta [Wed, 5 Feb 2014 13:28:34 +0000 (18:58 +0530)]
ARM: dts: am43xx: add support for parallel NAND flash
This patch:
- enables GPMC h/w and ELM h/w engine for AM43xx devices (am4372.dtsi)
- adds pinmux and DT node for Micron 4K-paged x8 NAND device (MT29F4G08AB)
present on following boards:
am43x-epos-evm:
On this board, NAND Flash control lines are muxed with QSPI, Thus only
one of the two can be used at a time. Selection is controlled by:
(a) dynamically driving following GPIO pin from software
GPMC_A0(GPIO) == 0 NAND is selected (default)
GPMC_A0(GPIO) == 1 eMMC is selected
Signed-off-by: Pekon Gupta <pekon@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Pekon Gupta [Wed, 5 Feb 2014 13:28:32 +0000 (18:58 +0530)]
ARM: dts: AM33xx: updated default ECC scheme in nand-ecc-opt
This patch updated MTD/NAND DT node binding to replace deprecated bindings
as per following commit.
commit ac65caf514ec3e55e8d3d510ee37f80dd97418fe
ARM: OMAP2+: cleaned-up DT support of various ECC schemes
Also Refer: Documentation/devicetree/bindings/mtd/gpmc-nand.txt
Reviewed-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Pekon Gupta <pekon@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
This patch has following updates, specific to MTD/NAND DT
- update MTD NAND partition table to keep compatibility between
different boards and mainline u-boot.
- prefix 'NAND.' in names of NAND device MTD partitions to differentiate them
from other MTD device partitions (like NOR and QSPI)
Partition_Name Partition_Size
/dev/mtd0 NAND.SPL 1 block-size*
/dev/mtd1 NAND.SPL.backup1 1 block-size*
/dev/mtd2 NAND.SPL.backup2 1 block-size*
/dev/mtd3 NAND.SPL.backup3 1 block-size*
/dev/mtd5 NAND.u-boot-spl-os 2 block-size* [for falcon boot]
/dev/mtd4 NAND.u-boot 1 MB
/dev/mtd6 NAND.u-boot-env 1 block-size*
/dev/mtd7 NAND.u-boot-env.backup1 1 block-size*
/dev/mtd8 NAND.kernel till 0xA00000
/dev/mtd9 NAND.file-system till end of device
* am335x-evm uses NAND device with block-size=128KiB
Signed-off-by: Pekon Gupta <pekon@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Pekon Gupta [Wed, 5 Feb 2014 13:28:30 +0000 (18:58 +0530)]
ARM: OMAP2+: gpmc: update gpmc_hwecc_bch_capable() for new platforms and ECC schemes
This patch
- refactors gpmc_hwecc_bch_capable()
- add checks for new platforms like dra7xx, am43xx
- add checks for OMAP3 SoC, w.r.t. new ECC schemes spawned in following commit:
commit ac65caf514ec3e55e8d3d510ee37f80dd97418fe
ARM: OMAP2+: cleaned-up DT support of various ECC schemes
Signed-off-by: Pekon Gupta <pekon@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Nishanth Menon [Mon, 6 Jan 2014 22:37:33 +0000 (16:37 -0600)]
ARM: dts: omap3430-sdp: add dip switch information for MMC operation
MMC 8 bit mode operation depends on dip switch setting which is not
obvious - The current board file has this description. However, with
removal of the board file in the future, this information will be lost
and has to be rediscovered.
Nishanth Menon [Mon, 9 Dec 2013 21:55:50 +0000 (15:55 -0600)]
ARM: dts: Add basic devices for AM3517-craneboard
Craneboard is a hardware development platform based on the Sitara
AM3517 ARM Cortex - A8 microprocessor device - see [1] for more
details. Add basic devices for craneboard as replacement for the board
file scheduled for removal as part of device tree conversion
Suman Anna [Tue, 14 Jan 2014 00:26:45 +0000 (18:26 -0600)]
ARM: dts: OMAP: Add #hwlock-cells property to hwspinlock nodes
Add a new generic property "#hwlock-cells" to the hwspinlock
DT nodes on OMAP4, OMAP5 and AM33xx. This common property allows
different platform implementations to define the args specifier
length. OMAP implementations will always use a value of 1.
Signed-off-by: Suman Anna <s-anna@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Dmitry Lifshitz [Sun, 12 Jan 2014 13:22:55 +0000 (15:22 +0200)]
ARM: OMAP2+: make reset pulse for sbc-t3x usb hubs
sbc-t3x boards features two external USB ports on SB-T35 baseboard.
The baseboardi USB hub reset signal should be de-asserted to make
those ports functional.
sbc-t3517 features additional (assembled on CoM) USB hub which also
requires reset signal handling.
Add quirks code to handle proper reset pulse signal.
Signed-off-by: Dmitry Lifshitz <lifshitz@compulab.co.il> Signed-off-by: Tony Lindgren <tony@atomide.com>
update aliases for the ssi clocks ssi_ssr_fck, ssi_sst_fck and ssi_ick
to make them consistent for omap34xx and omap36xx. This makes it
possible to reference the clocks from generic omap3 dts files.
Signed-off-by: Sebastian Reichel <sre@debian.org> Acked-by: Tero Kristo <t-kristo@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Linus Walleij [Fri, 28 Feb 2014 12:59:43 +0000 (13:59 +0100)]
ARM: ux500: skip GIC CPU and dist address checks
The Ux500 is initializing its IRQs from the device tree and
does not need to figure out any static base addresses anymore,
this is just dead code so delete it.
Cc: Lee Jones <lee.jones@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Murali Karicheri [Mon, 24 Feb 2014 16:05:07 +0000 (11:05 -0500)]
ARM: dts: keystone: add support for k2 Edison SoC and EVM
Keystone2 Edison (K2E) is a Quad Cortex A15 based SoC with
1 DSP. It has standard peripherals such as i2c, spi, uart, timer,
pcie, etc similar to k2hk, but without wireless hardwares. This
patch add support for k2 Edison SoC and EVM. This re-uses the common
keystone.dtsi to include common bindings across the various k2
devices.
Murali Karicheri [Mon, 24 Feb 2014 15:56:48 +0000 (10:56 -0500)]
ARM: dts: keystone: add support for K2 Lamarr SoC and EVM
Keystone2 Lamarr (K2L) is a dual Cortex A15 core based SoC with
4 DSPs. It has standard peripherals such as i2c, spi, uart, timer,
pcie etc., similar to k2hk, but different set of wireless hardware.
This patch add support for k2 Lamarr SoC and EVM. This re-uses the
common keystone.dtsi to include common bindings across the various
k2 devices.
Cc: Olof Johansson <olof@lixom.net> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Rob Herring <robh+dt@kernel.org> Cc: Kumar Gala <galak@codeaurora.org> Cc: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Murali Karicheri [Mon, 24 Feb 2014 15:44:07 +0000 (10:44 -0500)]
ARM: dts: keystone: preparatory patch to support K2L and K2E SOCs
Current keystone.dtsi includes SoC specific definitions for K2HK
SoCs. In order to support two addition keystone devices, k2 Edison
and K2 Lamarr and corresponding EVMs, This patch restructure the
dts files for the following:-
- All clock nodes that are only available in k2hk SoC are moved
from keystone-clocks.dtsi to a new k2hk-clocks.dtsi include file
- The CPU nodes are now part of the soc specific k2hk.dtsi.
- Change the compatibility string to ti,k2hk-evm and change
the model name accordingly
- Finally include k2hk-clocks.dtsi in k2hk.dtsi and that in
k2hk-evm.dts
Cc: Olof Johansson <olof@lixom.net> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Rob Herring <robh+dt@kernel.org> Cc: Kumar Gala <galak@codeaurora.org> Cc: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Linus Walleij [Mon, 24 Feb 2014 12:34:59 +0000 (13:34 +0100)]
ARM: u300: switch SSP/SPI clock name to "SSPCLK"
As noted in recent discussions the name of the core clock for
the PL022 derived SPI blocks is erroneously named in the
U300 device tree. The kernel doesn't currently use the name,
but may do so soon so let use rename all these clocks in
accordance with the name given in the PL022 TRM (ARM DDI 0194G).
Reviewed-by: Mark Brown <broonie@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>