Arnd Bergmann [Mon, 17 Mar 2014 10:08:40 +0000 (11:08 +0100)]
Merge tag 'mvebu-dt-3.15-5' of git://git.infradead.org/linux-mvebu into next/dt
Merge "mvebu dt changes for v3.15 (incremental #5)" from Jason Cooper:
- mvebu
- 38x
- add 2GHz fixed clock, core divider clock, and nand controller
- 385
- add nand controller and partitions to 385-DB board
* tag 'mvebu-dt-3.15-5' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: Enable NAND controller in Armada 385-DB
ARM: mvebu: Add support for NAND controller in Armada 38x SoC
ARM: mvebu: Add the Core Divider clock to Armada 38x SoCs
ARM: mvebu: Add a 2 GHz fixed-clock on Armada 38x SoCs
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Arnd Bergmann [Mon, 17 Mar 2014 10:07:25 +0000 (11:07 +0100)]
Merge tag 'mvebu-dt-3.15-4' of git://git.infradead.org/linux-mvebu into next/dt
Merge "mvebu dt changes for v3.15 (incremental #4)" from Jason Cooper:
- dove
- add system controller node
- drop pinctrl PMU reg property _before_ it hits mainline and becomes ABI
- mvebu
- XP/370
- change default PCIe apertures
- switch GP and DB boards internal registers to 0xf1000000
- correct RAM size on Matrix board
- 385
- correct phy connection type for DB board
- add RD board
* tag 'mvebu-dt-3.15-4' of git://git.infradead.org/linux-mvebu:
ARM: dove: drop pinctrl PMU reg property
ARM: mvebu: add Device Tree for the Armada 385 RD board
ARM: mvebu: use the correct phy connection mode on Armada 385 DB
ARM: mvebu: the Armada XP Matrix board has 4 GB
ARM: mvebu: switch the Armada XP GP to use internal registers at 0xf1000000
ARM: mvebu: switch the Armada XP DB to use internal registers at 0xf1000000
ARM: mvebu: change the default PCIe apertures for Armada 370/XP
ARM: dove: add system controller node
Conflicts:
arch/arm/boot/dts/Makefile
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Arnd Bergmann [Mon, 17 Mar 2014 10:50:05 +0000 (11:50 +0100)]
Merge branch 'mvebu/soc3' into next/dt
The dts Makefile has a bunch of nasty conflicts, attempt to resolve
these now to avoid trouble later.
Conflicts:
arch/arm/boot/dts/Makefile
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Arnd Bergmann [Mon, 17 Mar 2014 10:02:46 +0000 (11:02 +0100)]
Merge tag 'mvebu-dt-3.15-3' of git://git.infradead.org/linux-mvebu into next/dt
Merge "mvebu dt changes for v3.15 (incremental pull #3)" from Jason Cooper:
- mvebu
- merge armada 375, 380, 385 boards (mvebu/dt-3xx)
- kirkwood
- Add many Synology NAS boards
- add board HP T5325
- add L2 cache node
- add system-controller node
- add audio node
- dove
- add pinctrl and global-config register
Depends:
- tags/mvebu-dt-fixes-3.14 (mvebu/dt-fixes)
- removed dove PMU interrupt controller
Conflicts:
- mvebu/soc (arch/arm/boot/dts/Makefile)
- add/add conflict.
- move CONFIG_ARCH_LPC32XX to alphabetical order (after KIRKWOOD)
* tag 'mvebu-dt-3.15-3' of git://git.infradead.org/linux-mvebu:
ARM: kirkwood: Add dts file describing HP T5325 thin client
ARM: kirkwood: Add i2c alias so setting bus number
ARM: kirkwood: Add audio node to kirkwood.dtsi
ARM: mvebu: select dtbs from MACH_ARMADA_*
ARM: dove: add global-config register node
ARM: dove: add additional pinctrl registers
ARM: mvebu: Instantiate system controller in kirkwood.dtsi
ARM: kirkwood: Instantiate L2 cache from DT.
ARM: mvebu: use macros for interrupt flags on Armada 375/38x
ARM: mvebu: use GIC_{SPI,PPI} in Armada 375/38x DTs
ARM: mvebu: use C preprocessor include for Armada 375/38x DTs
ARM: Kirkwood: Add support for many Synology NAS devices
DT: i2c: Trivial: Add sii,s35390a
DT: Vendor prefixes: Add ricoh, qnap, sii and synology
ARM: dove: dt: revert PMU interrupt controller node
ARM: mvebu: add Device Tree for the Armada 385 DB board
ARM: mvebu: add Device Tree description of the Armada 380/385 SoCs
ARM: mvebu: add Device Tree for the Armada 375 DB board
ARM: mvebu: add Device Tree description of the Armada 375 SoC
ARM: mvebu: dt: add missing alias 'eth3' on Armada XP mv78260
Conflicts:
Documentation/devicetree/bindings/vendor-prefixes.txt
arch/arm/boot/dts/Makefile
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Arnd Bergmann [Mon, 17 Mar 2014 09:14:40 +0000 (10:14 +0100)]
Merge tag 'efm32-next' of git://git.pengutronix.de/git/ukl/linux into next/dt
Merge "Two more dt related efm32 fixes" from Uwe Kleine-König:
* tag 'efm32-next' of git://git.pengutronix.de/git/ukl/linux:
ARM: efm32: properly namespace i2c location property
ARM: efm32: fix unit address part in USART2 device nodes' names
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Arnd Bergmann [Mon, 17 Mar 2014 09:14:10 +0000 (10:14 +0100)]
Merge branch 'efm32/cleanup' into next/dt
Dependency for efm32/dt branch.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Olof Johansson [Mon, 17 Mar 2014 07:46:17 +0000 (00:46 -0700)]
Merge tag 'renesas-dt4-for-v3.15' of git://git./linux/kernel/git/horms/renesas into next/dt
Merge "Fourth Round of Renesas ARM Based SoC DT Updates for v3.15" from Simon
Horman:
* r8a7791 (R-Car M2) based koelsch board
- Add SDHI devices
- Add ethernet
* r8a7791 (R-Car M2) SoC
- Correct clock index for i2c5
* r8a7790 (R-Car H2) based lager board
- Add ethernet
* tag 'renesas-dt4-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Add SDHI devices for Koelsch DTS
ARM: shmobile: Add SDHI devices to r8a7791 DTSI
ARM: shmobile: r8a7791: fix clock index for i2c5
ARM: shmobile: koelsch: add Ether DT support
ARM: shmobile: r8a7791: add Ether DT support
ARM: shmobile: lager: add Ether DT support
ARM: shmobile: r8a7790: add Ether DT support
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Mon, 17 Mar 2014 07:16:56 +0000 (00:16 -0700)]
Merge tag 'renesas-dt3-for-v3.15' of git://git./linux/kernel/git/horms/renesas into next/dt
Merge "Third Round of Renesas ARM Based SoC DT Updates for v3.15" from Simon
Horman:
* r7s72100 SoC (RZ/A1H)
- Add nodes for i2c controllers to DT
* r7s72100 (RZ/A1H) based Genmai board
- genmai: adapt dts to use native i2c driver
* r8a7791 SoC (R-Car M2)
- Remove superfluous interrupt-parents
* r8a7791 (R-Car M2) based Koelsch board
- Add i2c2 bus to DT
- Add DU device to DT
* r8a7790 SoC (R-Car H2)
- Add i2c aliases
- Remove superfluous interrupt-parents
- Add QSPI node
* r8a7790 SoC (R-Car M2) based Lager
- Add DU, SDHI0/1 and QSPI to DT
* r8a7778 SoC (R-Car M1)
- Remove duplicate i2c nodes
* tag 'renesas-dt3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: genmai: adapt dts to use native i2c driver
ARM: shmobile: r7s72100: add nodes for i2c controllers to dtsi
ARM: shmobile: r8a7791: add i2c2 bus to koelsch dt
ARM: shmobile: r8a7791: add i2c master nodes to dtsi
ARM: shmobile: r8a7790: add i2c aliases to dtsi
ARM: shmobile: r8a7790: remove superfluous interrupt-parents
ARM: shmobile: r8a7791: remove superfluous interrupt-parents
ARM: shmobile: koelsch-reference: Add DU device to DTS
ARM: shmobile: lager: Add DU device to DTS
ARM: shmobile: r8a7778 dtsi: Remove duplicate i2c nodes
ARM: shmobile: lager: add SDHI0/2 support on DTS
ARM: shmobile: lager dts: Add QSPI nodes
ARM: shmobile: r8a7790 dtsi: Add QSPI node
Signed-off-by: Olof Johansson <olof@lixom.net>
Uwe Kleine-König [Fri, 14 Mar 2014 14:24:52 +0000 (15:24 +0100)]
ARM: efm32: properly namespace i2c location property
Wolfram Sang pointed out during review of an efm32-i2c driver that the
property to specify the set of pins has a too general name. As several
other efm32 peripherals also have a similar register bit field, add an
"efm32" namespace.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Fri, 14 Mar 2014 14:51:15 +0000 (15:51 +0100)]
ARM: efm32: fix unit address part in USART2 device nodes' names
While removing the 0x prefixes in the unit addresses in reply to a review
comment, I must somehow have messed up these two. Uups.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Ezequiel Garcia [Thu, 13 Mar 2014 20:24:32 +0000 (17:24 -0300)]
ARM: mvebu: Enable NAND controller in Armada 385-DB
The Armada 385-DB board has a NAND flash, so enable it in the
devicetree and add the partitions as prepared in the factory images.
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Link: https://lkml.kernel.org/r/1394742273-5113-6-git-send-email-ezequiel.garcia@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Ezequiel Garcia [Thu, 13 Mar 2014 20:24:31 +0000 (17:24 -0300)]
ARM: mvebu: Add support for NAND controller in Armada 38x SoC
The Armada 38x SoC family has a NAND controller, compatible
with the controller in Armada 370/375/XP SoCs. Add support for
it in the devicetree file.
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Link: https://lkml.kernel.org/r/1394742273-5113-5-git-send-email-ezequiel.garcia@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Ezequiel Garcia [Thu, 13 Mar 2014 20:24:30 +0000 (17:24 -0300)]
ARM: mvebu: Add the Core Divider clock to Armada 38x SoCs
The Armada 38x SoC family has a clock provider called "Core Divider",
derived from the fixed 2 GHz main PLL clock. This is similar to the
one on A370, A375 and AXP.
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Link: https://lkml.kernel.org/r/1394742273-5113-4-git-send-email-ezequiel.garcia@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Ezequiel Garcia [Thu, 13 Mar 2014 20:24:29 +0000 (17:24 -0300)]
ARM: mvebu: Add a 2 GHz fixed-clock on Armada 38x SoCs
Armada 38x SoCs have a 2 GHz fixed main PLL that is used to feed
other clocks. This commit adds a DT representation of this clock
through a fixed-clock compatible node.
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Link: https://lkml.kernel.org/r/1394742273-5113-3-git-send-email-ezequiel.garcia@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Olof Johansson [Tue, 11 Mar 2014 21:21:28 +0000 (14:21 -0700)]
Merge tag 'zynq-dt-for-3.15' of git://git.xilinx.com/linux-xlnx into next/dt
Merge "arm: Xilinx Zynq dt patches for v3.15" from Michal Simek:
- Define fclk-enable property
* tag 'zynq-dt-for-3.15' of git://git.xilinx.com/linux-xlnx:
arm: dt: zynq: Add fclk-enable property to clkc node
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Tue, 11 Mar 2014 20:32:49 +0000 (13:32 -0700)]
Merge tag 'omap-for-v3.15/dt-part2' of git://git./linux/kernel/git/tmlind/linux-omap into next/dt
Merge "omap device tree changes for v3.15, part 2" from Tony Lindgren:
Part two of omap device tree changes enabling driver features
in the dts files.
* tag 'omap-for-v3.15/dt-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: dts: am335x-evmsk: enable dual_emac mode
ARM: dts: DRA7: Add device nodes for ABB
ARM: dts: OMAP4: Add device nodes for ABB
ARM: dts: OMAP36xx: Add device node for ABB
ARM: dts: am43x-epos-evm: add SD card hotplug support
ARM: dts: am335x-evm: add SD card hotplug support
ARM: dts: am437x gp-evm: add sd card dt nodes
ARM: dts: omap5: added dt properties to adapt to the new phy framwork
ARM: OMAP2+: Use pdata quirks for wl12xx on the AM335x EV-MSK
ARM: dts: Update echi-omap DT binding example usage
ARM: dts: Get rid of incompatible ids for hci-omap USB host nodes
ARM: OMAP2+: Remove legacy_init_ehci_clk()
ARM: dts: Add support for OMAP4 Gumstix DuoVero/Parlor
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Tue, 11 Mar 2014 20:30:39 +0000 (13:30 -0700)]
Merge tag 'bcm2835-for-3.15-dt' of git://git./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
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Tue, 11 Mar 2014 20:23:09 +0000 (13:23 -0700)]
Merge tag 'armsoc/for-3.15/dt' of git://github.com/broadcom/mach-bcm into next/dt
Merge "ARM: mach-bcm dt updates for 3.15" from Matt Porter:
- add BCM4708 dt support
- remove bcm11351-brt
- bcm281xx common clock support
* tag 'armsoc/for-3.15/dt' of git://github.com/broadcom/mach-bcm:
ARM: dts: remove bcm11351-brt.dts
ARM: dts: Leave sdio1 as disabled on bcm28155-ap
ARM: dts: bcm281xx: define real clocks
ARM: BCM5301X: add dts files for BCM4708 SoC
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Tue, 11 Mar 2014 20:00:21 +0000 (13:00 -0700)]
Merge tag 'keystone-dts' of git://git./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
Signed-off-by: Olof Johansson <olof@lixom.net>
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
Signed-off-by: Olof Johansson <olof@lixom.net>
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
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Sun, 9 Mar 2014 18:44:23 +0000 (11:44 -0700)]
Merge tag 'ux500-dt-v3.15-2' of git://git./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"
Signed-off-by: Olof Johansson <olof@lixom.net>
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
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Sun, 9 Mar 2014 18:33:01 +0000 (11:33 -0700)]
Merge tag 'exynos-clk' of git./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 git./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
Signed-off-by: Olof Johansson <olof@lixom.net>
Olof Johansson [Sun, 9 Mar 2014 07:19:06 +0000 (23:19 -0800)]
Merge tag 'omap-for-v3.15/dt-signed' of git://git./linux/kernel/git/tmlind/linux-omap into next/dt
OMAP device tree changes from Tony Lindgren:
Device tree related changes for omaps with minor code
changes also to platform data quirks that are still needed
for some features.
* tag 'omap-for-v3.15/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (60 commits)
ARM: dts: omap4+: Add DMM bindings
ARM: dts: am43x-gp-evm: Add matrix gpio keys.
ARM: dts: am43xx: add support for parallel NAND flash
ARM: dts: AM33xx: updated default ECC scheme in nand-ecc-opt
ARM: dts: am335x-evm: NAND: update MTD partition table
ARM: OMAP2+: gpmc: update gpmc_hwecc_bch_capable() for new platforms and ECC schemes
ARM: dts: omap3-gta04: Add bma180 accelerometer
ARM: dts: omap3-gta04: Enable mmc2 for wifi
ARM: dts: omap3-gta04: Add basic sound support
ARM: dts: omap3-gta04: Add twl4030 charger
ARM: dts: omap3-gta04: Add touchscreen properties
ARM: dts: omap3-gta04: Add support for magnetometer
ARM: dts: am437x-gp-evm: Enable gpio.
ARM: dts: am437x-gp-evm: Add pwm backlight support.
ARM: dts: am437x-gp-evm: Add gp dts.
ARM: dts: am43x-epos-evm: Add SPI data.
ARM: dts: am43x-epos-evm: Add I2C2 data.
pinctrl: am43xx: dt-bindings: add MUX_MODE8
ARM: dts: am43x-epos-evm: Add pwm backlight support.
ARM: dts: am4372: Add pwm-cells property for ecap device.
...
Sebastian Hesselbarth [Wed, 5 Mar 2014 00:03:08 +0000 (01:03 +0100)]
ARM: dove: drop pinctrl PMU reg property
Marvell Dove's pinctrl does require some PMU regs for muxing PMU
functions to MPP pins. Recently, a discussion started about consolidating
Power Management Unit (PMU) into a single DT node. As we don't want
anymore DT ABI in the way, drop the corresponding reg property from
pinctrl node now. The driver will derive the registers from existing
reg properties.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Gregory CLEMENT [Thu, 6 Mar 2014 15:17:55 +0000 (16:17 +0100)]
ARM: mvebu: add Device Tree for the Armada 385 RD board
The Armada 385 RD board is the reference design board from Marvell
for the Armada 385 SoC. This commit adds a Device Tree description for
this board, which enables the following features:
* Network interfaces
* I2C bus
* Serial port
* SPI bus, with a SPI flash
* PCIe interface
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Thomas Petazzoni [Thu, 6 Mar 2014 14:41:55 +0000 (15:41 +0100)]
ARM: mvebu: use the correct phy connection mode on Armada 385 DB
On Armada 385 DB, while the "rgmii" PHY connection mode works fine
with the generic PHY driver, it fails to work when the Marvell PHY
driver is enabled in the kernel configuration, due to a finer handling
of the PHY configuration. This is due to the fact that the phy
connection mode should instead be "rgmii-id", i.e with the TX/RX delay
mechanisms enabled.
This fixes the network operation on Armada 385 DB with
CONFIG_MARVELL_PHY=y. Without this patch and this option enabled, one
would only get messages such as:
mvneta
f1070000.ethernet eth1: bad rx status
0cc10000 (crc error), size=70
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Thomas Petazzoni [Tue, 4 Mar 2014 16:37:02 +0000 (17:37 +0100)]
ARM: mvebu: the Armada XP Matrix board has 4 GB
Since the Armada XP Matrix board has 4 GB of RAM and not 2 GB, we
update the Device Tree to take into account the correct amount of
memory. As noted in the new comment, the last 256 MB of RAM are in
fact not usable, due to the overlap with the MBus Window address
range.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Thomas Petazzoni [Tue, 4 Mar 2014 16:37:01 +0000 (17:37 +0100)]
ARM: mvebu: switch the Armada XP GP to use internal registers at 0xf1000000
Marvell has now provided bootloaders that are Device Tree capable for
the Armada XP GP board, and that also remap the internal register base
address to 0xf1000000. In addition, the bootloader now sets the MBus
Window base address to 0xf0000000, which allows to use much more RAM
in the last GB of RAM before the 4 GB limit (the entire space from
0xC0000000 to 0xFFFFFFFF was not usable due to being used for I/O, not
only the space from 0xF0000000 to 0xFFFFFFFF is used for I/O).
Therefore this commit:
* Updates the memory->reg Device Tree property with the fact that in
the first bank of RAM, memory up to 0xf0000000 can be used.
* Updates the soc->ranges Device Tree property with the fact that the
internal registers are now mapped at 0xf1000000.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Thomas Petazzoni [Tue, 4 Mar 2014 16:37:00 +0000 (17:37 +0100)]
ARM: mvebu: switch the Armada XP DB to use internal registers at 0xf1000000
Marvell has now provided bootloaders that are Device Tree capable for
the Armada XP DB board, and that also remap the internal register base
address to 0xf1000000. In addition, the bootloader now sets the MBus
Window base address to 0xf0000000, but on this board, this change
doesn't make much difference since the board is by default equipped
with 2 GB of RAM.
Therefore this commit updates the soc->ranges Device Tree property
with the fact that the internal registers are now mapped at
0xf1000000.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Thomas Petazzoni [Tue, 4 Mar 2014 16:36:59 +0000 (17:36 +0100)]
ARM: mvebu: change the default PCIe apertures for Armada 370/XP
The latest Marvell bootloaders for various boards change the MBus
Window base address from 0xC0000000 to 0xF0000000, in order to make
more RAM in the first 4 GB actually usable by the kernel (RAM that is
covered by the MBus window is "shadowed" and therefore not usable).
However, our default PCIe memory and I/O apertures where sitting at
0xe0000000 (for memory) and 0xe8000000 (for I/O), which will now be
outside of the MBus Window range on those platforms. To make things
work, we have to ensure those apertures use addresses in the
0xF0000000 -> 0xFFFFFFFF range.
Of course this change of the MBus Window base address from 0xC0000000
to 0xF0000000 also comes with a change of the internal register base
address from 0xD0000000 to 0xF1000000.
We have therefore designed the following memory map:
* 0xF0000000 -> 0xF1000000: 16 MB, used for NOR flashes on Armada XP
GP and Armada XP DB.
* 0xF1000000 -> 0xF1100000: 1 MB, used for internal registers.
* 0xF8000000 -> 0xFFE00000: 126 MB, used for PCIe memory.
* 0xFFE00000 -> 0xFFF00000: 1 MB, used for PCIe I/O.
* 0xFFF00000 -> 0xFFFFFFFF: 1 MB, used for the BootROM mapping
There is one exception to this layout: the Armada XP OpenBlocks, which
has a 128 MB NOR flash, mapped from 0xF0000000 to 0xF8000000. This
does not conflict with the current change for the PCIe I/O and memory
apertures, and continues to work because on Armada XP OpenBlocks, the
bootloader is an old one, and continues to have internal registers
mapped at 0xD0000000.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Yegor Yefremov [Wed, 5 Mar 2014 07:29:19 +0000 (08:29 +0100)]
ARM: dts: am335x-evmsk: enable dual_emac mode
EVM board provides two Ethernet ports, this patch sets them into
dual_emac mode to provide two independent network interfaces.
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Nishanth Menon [Mon, 3 Mar 2014 14:50:23 +0000 (20:20 +0530)]
ARM: dts: DRA7: Add device nodes for ABB
Add ABB device nodes for DRA7 family of devices. Data is based on
DRA7 Technical Reference Manual revision I (Sept 2013)
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Andrii.Tseglytskyi [Mon, 3 Mar 2014 14:50:22 +0000 (20:20 +0530)]
ARM: dts: OMAP4: Add device nodes for ABB
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>
Andrii.Tseglytskyi [Mon, 3 Mar 2014 14:50:21 +0000 (20:20 +0530)]
ARM: dts: OMAP36xx: Add device node for ABB
Add ABB device node for OMAP36xx family of devices. Data is based on
OMAP36XX Technical Reference Manual revision AB (Dec 2012).
[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>
Balaji T K [Mon, 3 Mar 2014 14:50:20 +0000 (20:20 +0530)]
ARM: dts: am43x-epos-evm: add SD card hotplug support
Add card detect gpio for SD card slot and include dt gpio header.
Signed-off-by: Balaji T K <balajitk@ti.com>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Balaji T K [Mon, 3 Mar 2014 14:50:19 +0000 (20:20 +0530)]
ARM: dts: am335x-evm: add SD card hotplug support
Add card detect gpio for SD card slot
Signed-off-by: Balaji T K <balajitk@ti.com>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Balaji T K [Mon, 3 Mar 2014 14:50:18 +0000 (20:20 +0530)]
ARM: dts: am437x gp-evm: add sd card dt nodes
enable sd card slot on am437x-gp-evm
Signed-off-by: Balaji T K <balajitk@ti.com>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Kishon Vijay Abraham I [Mon, 3 Mar 2014 11:38:15 +0000 (17:08 +0530)]
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>
Imre Kaloz [Mon, 3 Mar 2014 09:02:56 +0000 (10:02 +0100)]
ARM: OMAP2+: Use pdata quirks for wl12xx on the AM335x EV-MSK
Enable the WiLink6 connected to mmc2.
Signed-off-by: Imre Kaloz <kaloz@openwrt.org
Signed-off-by: Tony Lindgren <tony@atomide.com>
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>
Roger Quadros [Thu, 27 Feb 2014 14:18:29 +0000 (16:18 +0200)]
ARM: OMAP2+: Remove legacy_init_ehci_clk()
The necessary clock phandle for the EHCI clock is now provided
via device tree so we no longer need this legacy method.
Update the omap4-panda and omap5-uevm board DTS to provide the
necessary EHCI PHY clock information.
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Florian Vaussard [Mon, 24 Feb 2014 17:07:48 +0000 (18:07 +0100)]
ARM: dts: Add support for OMAP4 Gumstix DuoVero/Parlor
Gumstix DuoVero is an OMAP4430-based Computer On Module.
Parlor is one of the available expansion board.
Tested features:
- GPMC ethernet
- HSUSB2 and OTG
- Audio out
- WiFi and Bluetooth (w2cbw0015 SDIO module)
- LED and button
Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Sebastian Hesselbarth [Sat, 1 Mar 2014 08:39:38 +0000 (09:39 +0100)]
ARM: mvebu: move DT Dove to MVEBU
With all the DT support preparation done, we are able to move Dove
to MVEBU easily. Legacy non-DT mach-dove is left untouched to rot
for a while before removal.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Sebastian Hesselbarth [Thu, 27 Feb 2014 21:28:02 +0000 (22:28 +0100)]
ARM: dove: add system controller node
This adds a DT node for the system-controller found on Marvell Dove
SoCs.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Andrew Lunn [Tue, 25 Feb 2014 17:34:02 +0000 (18:34 +0100)]
ARM: kirkwood: Add dts file describing HP T5325 thin client
Describe the T5325 using device tree properties, where possible. The
first version of this file was produced by Thomas Petazzoni.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Andrew Lunn [Tue, 25 Feb 2014 17:34:00 +0000 (18:34 +0100)]
ARM: kirkwood: Add i2c alias so setting bus number
When using platform_driver instantiation, the i2c bus was given bus
number 0. The kirkwood-t5325 audio driver has this bus number hard
coded for the address of the codec. However by default device tree i2c
busses are dynamically allocated a bus number, starting from 1. Thus
the kirkwood-t5325 cannot find its audio codec. By adding an alias in
the DT file we can control the bus number and set it to 0. The codec
can then be found.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Andrew Lunn [Tue, 25 Feb 2014 17:33:59 +0000 (18:33 +0100)]
ARM: kirkwood: Add audio node to kirkwood.dtsi
The binding has existed for a while, so add the missing node so it can
be used by devices.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Jason Cooper [Tue, 25 Feb 2014 17:00:10 +0000 (17:00 +0000)]
ARM: mvebu: select dtbs from MACH_ARMADA_*
With kirkwood migrating into mach-mvebu, mvebu_v5_defconfig needs to
select ARCH_MVEBU. Unfortunately, this means that when building a v5
kernel, we unnecessarily build dtbs for the armada v7 boards.
To fix this, we instead select based on MACH_ARMADA_* on a per SoC basis.
Reported-by: Kevin Hilman <khilman@linaro.org>
Acked-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Jason Cooper [Tue, 4 Mar 2014 02:17:23 +0000 (02:17 +0000)]
Merge branch 'mvebu/dt-3xx' into mvebu/dt
Sebastian Hesselbarth [Mon, 24 Feb 2014 08:42:56 +0000 (09:42 +0100)]
ARM: dove: add global-config register node
We share global config registers by syscon node, add it to dove.dtsi.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Sebastian Hesselbarth [Mon, 24 Feb 2014 08:42:55 +0000 (09:42 +0100)]
ARM: dove: add additional pinctrl registers
Dove pinctrl uses additional registers to control MPPs. This patch first
increases existing pinctrl reg property by one register, and then adds
two new ranges for MPP4 and PMU MPP registers.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Andrew Lunn [Sat, 22 Feb 2014 19:14:59 +0000 (20:14 +0100)]
ARM: mvebu: Instantiate system controller in kirkwood.dtsi
Make use of the mvebu system controller, by placing a node into the
dtsi file.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Andrew Lunn [Sat, 22 Feb 2014 19:14:53 +0000 (20:14 +0100)]
ARM: kirkwood: Instantiate L2 cache from DT.
Now that the Feroceon L2 cache has a DT binding, make use of it.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
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>
Linus Walleij [Mon, 3 Feb 2014 22:56:54 +0000 (23:56 +0100)]
ARM: ux500: drop a chunk of GPIO definitions
The Ux500 GPIOs are now assigned dynamically from the device tree.
Drop this table of static assignments.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Tony Lindgren [Sun, 2 Mar 2014 22:22:03 +0000 (14:22 -0800)]
Merge tag 'for_3.15/dts_signed' of git://git./linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.15/dt
Add craneboard devices
Add more N900 devices
Add am43x-epos-evm and am437x-gp-evm devices
Add OMAP4 DMM devices
Conflicts:
arch/arm/boot/dts/am43x-epos-evm.dts
arch/arm/boot/dts/dra7.dtsi
Archit Taneja [Tue, 17 Dec 2013 10:02:21 +0000 (15:32 +0530)]
ARM: dts: omap4+: Add DMM bindings
Add Dynamic Memory Manager (DMM) bindings for OMAP4 and OMAP5 and DRA7x devices.
DMM only requires address and irq information.
Add documentation for the DMM bindings.
Originally worked on by Andy Gross <andygro@gmail.com>
Cc: Andy Gross <andygro@gmail.com>
Signed-off-by: Archit Taneja <archit@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Sourav Poddar [Thu, 19 Dec 2013 12:33:41 +0000 (18:03 +0530)]
ARM: dts: am43x-gp-evm: Add matrix gpio keys.
Add gpio keys node for am43x gp evm.
Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
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>
Pekon Gupta [Wed, 5 Feb 2014 13:28:31 +0000 (18:58 +0530)]
ARM: dts: am335x-evm: NAND: update MTD partition table
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>
NeilBrown [Sat, 1 Mar 2014 13:58:54 +0000 (14:58 +0100)]
ARM: dts: omap3-gta04: Add bma180 accelerometer
Add node for bma180 driver.
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
NeilBrown [Sat, 1 Mar 2014 13:58:53 +0000 (14:58 +0100)]
ARM: dts: omap3-gta04: Enable mmc2 for wifi
This requires vaux4.
Reset line isn't used yet, so wifi isn't reliable.
But it does work once per boot.
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Marek Belisko <marek@goldelico.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
NeilBrown [Sat, 1 Mar 2014 13:58:52 +0000 (14:58 +0100)]
ARM: dts: omap3-gta04: Add basic sound support
This adds basic sound support for gta04 board.
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Marek Belisko <marek@goldelico.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
NeilBrown [Sat, 1 Mar 2014 13:58:51 +0000 (14:58 +0100)]
ARM: dts: omap3-gta04: Add twl4030 charger
Define twl4030 charger node used for charging.
Signed-off-by: Marek Belisko <marek@goldelico.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Marek Belisko [Sat, 1 Mar 2014 13:58:50 +0000 (14:58 +0100)]
ARM: dts: omap3-gta04: Add touchscreen properties
Gta04 using tcs2007 touchscreen. Add support for that.
Signed-off-by: Marek Belisko <marek@goldelico.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
NeilBrown [Sat, 1 Mar 2014 13:58:49 +0000 (14:58 +0100)]
ARM: dts: omap3-gta04: Add support for magnetometer
Add magnetometer hmc5843 node.
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Marek Belisko <marek@goldelico.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Sourav Poddar [Thu, 19 Dec 2013 12:33:40 +0000 (18:03 +0530)]
ARM: dts: am437x-gp-evm: Enable gpio.
Enable gpio3, gpio4, it will be used by gpio matrix keys. Also,
can be used by othe peripherals.
Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Sourav Poddar [Thu, 19 Dec 2013 12:33:39 +0000 (18:03 +0530)]
ARM: dts: am437x-gp-evm: Add pwm backlight support.
Add pwm backlight support for gp evm.
Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Lokesh Vutla [Thu, 19 Dec 2013 12:33:38 +0000 (18:03 +0530)]
ARM: dts: am437x-gp-evm: Add gp dts.
AM437x GP EVM DTS with pinmux information to make I2C on
EVM usable.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Signed-off-by: Afzal Mohammed <afzal@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Sourav Poddar [Thu, 19 Dec 2013 12:33:37 +0000 (18:03 +0530)]
ARM: dts: am43x-epos-evm: Add SPI data.
Add SPI dts data.
Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Sourav Poddar [Thu, 19 Dec 2013 12:33:36 +0000 (18:03 +0530)]
ARM: dts: am43x-epos-evm: Add I2C2 data.
Add I2C2 dts data.
Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Darren Etheridge [Thu, 19 Dec 2013 12:33:35 +0000 (18:03 +0530)]
pinctrl: am43xx: dt-bindings: add MUX_MODE8
AM43xx devices have an extra MUX_MODE for certain pins.
Updating dt include to have MUX_MODE8 which maps to 0x8.
Signed-off-by: Darren Etheridge <detheridge@ti.com>
Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Sourav Poddar [Thu, 19 Dec 2013 12:33:34 +0000 (18:03 +0530)]
ARM: dts: am43x-epos-evm: Add pwm backlight support.
Add pwm backlight support for am43x epos evm.
Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Sourav Poddar [Thu, 19 Dec 2013 12:33:33 +0000 (18:03 +0530)]
ARM: dts: am4372: Add pwm-cells property for ecap device.
Add "pwm-cells" node for all ecap, ehrpwm in am43x dtsi files.
Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Sebastian Reichel [Sat, 11 Jan 2014 21:17:03 +0000 (22:17 +0100)]
ARM: dts: OMAP3-N900: Add bq24150a support
This adds support for the bq24150a chip to the
Nokia N900 DTS file.
Signed-off-by: Sebastian Reichel <sre@debian.org>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Sebastian Reichel [Sat, 11 Jan 2014 21:17:02 +0000 (22:17 +0100)]
ARM: dts: OMAP3-N900: Add isp1704 support
This adds support for the isp1704 chip to the Nokia N900
DTS file.
Signed-off-by: Sebastian Reichel <sre@debian.org>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Sebastian Reichel [Sat, 11 Jan 2014 21:17:01 +0000 (22:17 +0100)]
ARM: dts: OMAP3-N900: Add tpa6130a2 support
This adds support for the N900's headphone
amplifier to the N900 DTS file.
Signed-off-by: Sebastian Reichel <sre@debian.org>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Sebastian Reichel [Sat, 11 Jan 2014 21:17:00 +0000 (22:17 +0100)]
ARM: dts: OMAP3-N900: Add support for tsl2563
Add support for tsl2563 light sensor to the Nokia N900.
Signed-off-by: Sebastian Reichel <sre@debian.org>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Sebastian Reichel [Sat, 11 Jan 2014 21:16:59 +0000 (22:16 +0100)]
ARM: dts: OMAP3-N900: Add TWL4030 Keypad Matrix
Add Keyboard Matrix information to N900's DTS file.
This patch maps the keys exactly as the original
board code.
Signed-off-by: Sebastian Reichel <sre@debian.org>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Sebastian Reichel [Sat, 11 Jan 2014 21:16:58 +0000 (22:16 +0100)]
ARM: dts: TWL4030: Add keypad node
Add keypad node to twl4030, so that board DTS
files can just add the keymap.
Signed-off-by: Sebastian Reichel <sre@debian.org>
Signed-off-by: Benoit Cousson <bcousson@baylibre.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.
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
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
[1] http://craneboard.org
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Jason Cooper [Sat, 1 Mar 2014 03:21:04 +0000 (03:21 +0000)]
Merge branch 'mvebu/soc-kw' into mvebu/soc
Jason Cooper [Sat, 1 Mar 2014 03:20:55 +0000 (03:20 +0000)]
Merge branch 'mvebu/soc-3xx' into mvebu/soc
Ivan Khoronzhuk [Sat, 1 Mar 2014 02:05:24 +0000 (21:05 -0500)]
ARM: dts: keystone: add AEMIF/NAND device entry
Add AEMIF/NAND device entry.
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Yegor Yefremov [Fri, 28 Feb 2014 07:19:04 +0000 (08:19 +0100)]
ARM: dts: am335x-evmsk: enable USB1
Enable second USB channel and set it into 'host' mode.
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Stefan Roese [Wed, 5 Feb 2014 12:12:39 +0000 (13:12 +0100)]
arm: dts: am33xx.dtsi: Add node name to rtc device node
Making it possible to reference and therefor change (disable) this
device node from other dts file which import this dtsi file.
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Lukas Stockmann <lukas.stockmann@siemens.com>
Cc: Benoit Cousson <bcousson@baylibre.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Matt Porter [Wed, 29 Jan 2014 20:59:59 +0000 (15:59 -0500)]
ARM: dts: AM33XX: Add ecap interrupt properties
Add missing interrupt properties to the ecap0, ecap1, and ecap2
nodes.
Signed-off-by: Matt Porter <mporter@linaro.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Nishanth Menon [Wed, 29 Jan 2014 18:19:17 +0000 (12:19 -0600)]
ARM: dts: OMAP3+: add clock nodes for CPU
OMAP34xx, AM3517 and OMAP36xx platforms use dpll1 clock.
OMAP443x, OMAP446x, OMAP447x, OMAP5, DRA7, AM43xx platforms use
dpll_mpu clock.
Latency used is the generic latency defined in omap-cpufreq
driver.
Signed-off-by: Nishanth Menon <nm@ti.com>
Acked-by: Acked-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Christoph Fritz [Fri, 14 Feb 2014 14:20:54 +0000 (15:20 +0100)]
ARM: dts: omap3: Add support for INCOstartec DBB056 baseboard
INCOstartec LILLY-DBB056 is a carrier board (baseboard) for
computer-on-module LILLY-A83X.
This patch adds device-tree support for most of its features.
Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Christoph Fritz [Fri, 14 Feb 2014 14:20:53 +0000 (15:20 +0100)]
ARM: dts: omap3: Add support for INCOstartec a83x module
INCOstartec LILLY-A83X module is a TI DM3730xx100 (OMAP3) SoC
computer-on-module.
This patch adds device tree support for most of its features.
Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Peter Ujfalusi [Fri, 24 Jan 2014 08:19:07 +0000 (10:19 +0200)]
ARM: dts: am335x-evmsk: Correct audio clock frequency
The clock for audio is sourced from virt_24000000_ck, so the correct
frequency is
24000000.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
CC: <stable@vger.kernel.org> # 3.13.x
Signed-off-by: Tony Lindgren <tony@atomide.com>
Peter Ujfalusi [Fri, 24 Jan 2014 08:19:06 +0000 (10:19 +0200)]
ARM: dts: omap2: Set disabled status for McBSP instances as default state
In omap2420.dtsi and omap2430.dtsi disable all mcbsp nodes and board dts
files can explicitly enable the mcbsp they are using.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
projects / linux.git / log