summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-03-17Merge tag 'sunxi-dt-for-3.15-2' of https://github.com/mripard/linux into next/dtArnd Bergmann
Pull "Allwinner DT additions for 3.15, take 2" from Maxime Ripard: - Two new boards: INet 97F Rev 02 and A10-OLinuXino-LIME - Addition of the I2C for the A31 - Addition USB Host mode for the A10, A10s, A13 and A20 - Addition of SATA support for the A10 and A20 - Change of compatible for the watchdog * tag 'sunxi-dt-for-3.15-2' of https://github.com/mripard/linux: (23 commits) ARM: sunxi: dt: Update the watchdog compatibles ARM: sun6i: colombus: Enable the I2C controllers ARM: sun6i: Enable the I2C muxing options ARM: sun6i: Enable the I2C controllers ARM: sun4i: dt: Add support for the INet-97F_Rev_02 board ARM: sun4i: dt: Add support for the A10-OLinuXino-LIME board ARM: sun7i: dt: Add USB host nodes to a20-olinuxino-micro dts ARM: sun7i: dt: Add USB host nodes to cubieboard2 dts ARM: sun7i: dt: Add USB host nodes to cubietruck dts ARM: sun5i: dt: Add USB host nodes to a13-olinuxino-micro ARM: sun5i: dt: Add USB host nodes to a10s-olinuxino-micro ARM: sun5i: dt: Add USB host nodes to A13-Olinuxino ARM: sun4i: dt: Add USB host nodes to pcduino.dts ARM: sun4i: dt: Add USB host nodes to mini-xplus dts ARM: sun4i: dt: Add USB host nodes to hackberry dts ARM: sun4i: dt: Add USB host nodes to cubieboard dts ARM: sun4i: dt: Add USB host nodes to Mele A1000 dts ARM: sun7i: dt: Add USB host bindings ARM: sun5i: dt: Add USB host bindings ARM: sun4i: dt: Add USB host bindings ... Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dtArnd Bergmann
Merge "First batch of AT91 DT material for 3.15" from Nicolas Ferre: - activate DMA for NAND flash controller - some binding documentation update for usba and ADC (iio) drivers - removal of some deprecated ADC (iio) properties * tag 'at91-dt' of git://github.com/at91linux/linux-at91: ARM: at91/dt: at91-cosino: remove useless adc properties ARM: at91/dt: sama5d3: remove useless adc properties ARM: at91/dt: at91sam9x5: remove useless adc properties ARM: at91/dt: at91sam9g45: remove useless adc properties ARM: at91/dt: at91sam9260: remove useless adc properties ARM: at91/dt: at91-ariag25: remove useless adc properties Documentation: dt: iio: move arm/atmel-adc.txt to iio/adc/at91_adc.txt Documentation: dt: iio: improve atmel-adc documentation ARM: at91: sama5d3: get rid of atmel_tsadcc driver ARM: at91/DT: atmel_usba correct atmel,vbus-gpio meaning ARM: at91/DT: add NAND + DMA property Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17Merge tag 'mvebu-dt-3.15-5' of git://git.infradead.org/linux-mvebu into next/dtArnd Bergmann
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>
2014-03-17Merge tag 'mvebu-dt-3.15-4' of git://git.infradead.org/linux-mvebu into next/dtArnd Bergmann
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>
2014-03-17Merge branch 'mvebu/soc3' into next/dtArnd Bergmann
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>
2014-03-17Merge tag 'mvebu-dt-3.15-3' of git://git.infradead.org/linux-mvebu into next/dtArnd Bergmann
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>
2014-03-17Merge tag 'efm32-next' of git://git.pengutronix.de/git/ukl/linux into next/dtArnd Bergmann
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>
2014-03-17Merge branch 'efm32/cleanup' into next/dtArnd Bergmann
Dependency for efm32/dt branch. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17Merge tag 'renesas-dt4-for-v3.15' of ↵Olof Johansson
git://git.kernel.org/pub/scm/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>
2014-03-17Merge tag 'renesas-dt3-for-v3.15' of ↵Olof Johansson
git://git.kernel.org/pub/scm/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>
2014-03-14ARM: efm32: properly namespace i2c location propertyUwe Kleine-König
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>
2014-03-14ARM: efm32: fix unit address part in USART2 device nodes' namesUwe Kleine-König
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>
2014-03-13ARM: mvebu: Enable NAND controller in Armada 385-DBEzequiel Garcia
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>
2014-03-13ARM: mvebu: Add support for NAND controller in Armada 38x SoCEzequiel Garcia
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>
2014-03-13ARM: mvebu: Add the Core Divider clock to Armada 38x SoCsEzequiel Garcia
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>
2014-03-13ARM: mvebu: Add a 2 GHz fixed-clock on Armada 38x SoCsEzequiel Garcia
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>
2014-03-13ARM: sunxi: dt: Update the watchdog compatiblesMaxime Ripard
The watchdog compatibles were following a different pattern than the one found in the other devices. Now that the driver supports the right pattern, switch to it in the DT. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-03-12ARM: at91/dt: at91-cosino: remove useless adc propertiesAlexandre Belloni
Remove the properties that are not used anymore by the at91_adc driver. Cc: Rodolfo Giometti <giometti@linux.it> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12ARM: at91/dt: sama5d3: remove useless adc propertiesAlexandre Belloni
Remove the properties that are not used anymore by the at91_adc driver and fix the atmel,adc-use-external-triggers property name. Also, add #address-cells, #size-cells and a reg for each trigger to comply to the ePAPR. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12ARM: at91/dt: at91sam9x5: remove useless adc propertiesAlexandre Belloni
Remove the properties that are not used anymore by the at91_adc driver and fix the atmel,adc-use-external-triggers property name. Also, add #address-cells, #size-cells and a reg for each trigger to comply to the ePAPR. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12ARM: at91/dt: at91sam9g45: remove useless adc propertiesAlexandre Belloni
Remove the properties that are not used anymore by the at91_adc driver. Also, add #address-cells, #size-cells and a reg for each trigger to comply to the ePAPR. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12ARM: at91/dt: at91sam9260: remove useless adc propertiesAlexandre Belloni
Remove the properties that are not used anymore by the at91_adc driver. Also, add #address-cells, #size-cells and a reg for each trigger to comply to the ePAPR. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12ARM: at91/dt: at91-ariag25: remove useless adc propertiesAlexandre Belloni
Remove the properties that are not used anymore by the at91_adc driver. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Cc: Douglas Gilbert <dgilbert@interlog.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12Documentation: dt: iio: move arm/atmel-adc.txt to iio/adc/at91_adc.txtAlexandre Belloni
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12Documentation: dt: iio: improve atmel-adc documentationAlexandre Belloni
This corrects the example by adding #address-cells, #size-cells and a reg for each trigger to comply to the ePAPR, as suggested by Mark Rutland in http://lists.infradead.org/pipermail/linux-arm-kernel/2014-February/234184.html Also, it removes the properties that are not used anymore, to stop propagating them. Also fixes atmel,adc-use-external-triggers property name. Finally, fixes a few typos. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12ARM: at91: sama5d3: get rid of atmel_tsadcc driverLudovic Desroches
Touchscreen support for at91_adc has been introduced so we can get rid of atmel_tsadcc. Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12ARM: at91/DT: atmel_usba correct atmel,vbus-gpio meaningAlexandre Belloni
atmel,at91sam9rl-udc is a USB gadget, it has no means to control vbus. atmel,vbus-gpio is in fact used to detect the presence of vbus. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> [nicolas.ferre@atmel.com: modify the commit message] Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-11Merge tag 'zynq-dt-for-3.15' of git://git.xilinx.com/linux-xlnx into next/dtOlof Johansson
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>
2014-03-11Merge tag 'omap-for-v3.15/dt-part2' of ↵Olof Johansson
git://git.kernel.org/pub/scm/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>
2014-03-11Merge tag 'bcm2835-for-3.15-dt' of ↵Olof Johansson
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 Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-11Merge tag 'armsoc/for-3.15/dt' of git://github.com/broadcom/mach-bcm into ↵Olof Johansson
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>
2014-03-11Merge tag 'keystone-dts' of ↵Olof Johansson
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 Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-10ARM: at91/DT: add NAND + DMA propertyNicolas Ferre
Add the "atmel,nand-has-dma" property to NAND node for SoC that can use the DMA to perform NAND accesses. Use of this property was added in 1b7192658a08f70df0f290634fd7cd2ecb629fc9 (mtd: atmel_nand: add a new dt binding item for nand dma support). Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: Boris BREZILLON <b.brezillon@overkiz.com>
2014-03-09Merge tag 'imx-dt-3.15-2' of git://git.linaro.org/people/shawnguo/linux-2.6 ↵Olof Johansson
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>
2014-03-09Merge tag 'imx6-dt-3.15-2' of git://git.linaro.org/people/shawnguo/linux-2.6 ↵Olof Johansson
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>
2014-03-09Merge tag 'ux500-dt-v3.15-2' of ↵Olof Johansson
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" Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-09Merge tag 'sunxi-dt-for-3.15' of https://github.com/mripard/linux into next/dtOlof Johansson
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>
2014-03-09Merge tag 'exynos-clk' of ↵Olof Johansson
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
2014-03-09Merge tag 'samsung-dt' of ↵Olof Johansson
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 Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-08Merge tag 'omap-for-v3.15/dt-signed' of ↵Olof Johansson
git://git.kernel.org/pub/scm/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. ...
2014-03-07ARM: sun6i: colombus: Enable the I2C controllersMaxime Ripard
The A31 Colombus board has 3 I2C controllers that should be usable. However, the first one is not working for some reason on the hardware I have been able to test it on, while it should really be the same controller. Enable the i2c1 and i2c2 busses, and mark i2c0 as in failure in the DT. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-03-07ARM: sun6i: Enable the I2C muxing optionsMaxime Ripard
The i2c controllers have a few muxing options on the A31. Enable the ones found in the A31 Colombus board. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-03-07ARM: sun6i: Enable the I2C controllersMaxime Ripard
The A31 has 4 I2C controllers that are the same than the one in the other Allwinner SoCs, except for the fact that they are asserted in reset by the reset unit. Add these i2c controllers to the DTSI. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-03-06ARM: dove: drop pinctrl PMU reg propertySebastian Hesselbarth
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>
2014-03-06ARM: mvebu: add Device Tree for the Armada 385 RD boardGregory CLEMENT
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>
2014-03-06ARM: mvebu: use the correct phy connection mode on Armada 385 DBThomas Petazzoni
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>
2014-03-06ARM: mvebu: the Armada XP Matrix board has 4 GBThomas Petazzoni
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>
2014-03-06ARM: mvebu: switch the Armada XP GP to use internal registers at 0xf1000000Thomas Petazzoni
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>
2014-03-06ARM: mvebu: switch the Armada XP DB to use internal registers at 0xf1000000Thomas Petazzoni
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>
2014-03-06ARM: mvebu: change the default PCIe apertures for Armada 370/XPThomas Petazzoni
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>