summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-03-17Merge tag 'omap-for-v3.15/dt-part3' of ↵Arnd Bergmann11-15/+197
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt Pull "omap device tree changes for v3.15, part 3" from Tony Lindgren: Device tree related changes to the omap iommu driver as that is finally getting updated. Also few trivial board related .dts updates to add more devices. * tag 'omap-for-v3.15/dt-part3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: Add MMC2/SDIO/WLAN support for cm-t3530 ARM: dts: am335x-evmsk: enable DMA controller for USB ARM: dts: OMAP5: Add IOMMU nodes ARM: dts: OMAP4: Add IOMMU nodes ARM: dts: OMAP3: Add IVA IOMMU node ARM: dts: OMAP3: Update ISP IOMMU node ARM: OMAP2+: extend iommu pdata-quirks to OMAP5 ARM: OMAP5: hwmod data: add mmu data for ipu & dsp ARM: OMAP2+: use pdata quirks for iommu reset lines ARM: OMAP2+: change the ISP device archdata MMU name for DT ARM: OMAP3: fix iva mmu programming issues ARM: OMAP3: remove deprecated CONFIG_OMAP_IOMMU_IVA2 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17Merge tag 'sunxi-dt-for-3.15-2' of https://github.com/mripard/linux into next/dtArnd Bergmann21-5/+912
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 Bergmann11-60/+52
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 Bergmann2-0/+46
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 Bergmann8-21/+144
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 Bergmann35-156/+834
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 Bergmann30-25/+3185
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 Bergmann2-3/+3
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 Bergmann77-742/+153
Dependency for efm32/dt branch. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17Merge tag 'renesas-dt4-for-v3.15' of ↵Olof Johansson4-5/+227
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 Johansson7-103/+315
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önig1-1/+1
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önig1-2/+2
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 Garcia1-0/+21
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 Garcia1-0/+10
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 Garcia1-0/+8
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 Garcia1-0/+7
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 Ripard5-5/+5
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 Belloni2-2/+0
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 Belloni2-7/+7
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 Belloni1-6/+7
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 Belloni1-5/+6
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 Belloni1-5/+6
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 Belloni1-1/+0
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 Belloni1-0/+0
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 Belloni1-16/+17
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: dts: Add MMC2/SDIO/WLAN support for cm-t3530Stefan Roese1-0/+36
Add support for the MMC2/SDIO WiFi Libertas (Marvell) module available on the CM-T3530 SOM. Cc: Dmitry Lifshitz <lifshitz@compulab.co.il> Cc: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Stefan Roese <sr@denx.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12ARM: dts: am335x-evmsk: enable DMA controller for USBYegor Yefremov1-0/+4
Enable DMA controller for USB Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12ARM: dts: OMAP5: Add IOMMU nodesSuman Anna1-0/+15
The IOMMU DT nodes have been added for the DSP and IPU subsystems. The MMUs in OMAP5 are identical to those in OMAP4, including the bus error back capability on IPU. Signed-off-by: Suman Anna <s-anna@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12ARM: dts: OMAP4: Add IOMMU nodesFlorian Vaussard1-0/+15
Add the IOMMU nodes for the DSP and IPU subsystems. The MMU within the IPU sub-system also supports a bus error back capability, not available on the DSP MMU. Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch> [s-anna@ti.com: IPU bus error back addition] Signed-off-by: Suman Anna <s-anna@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12ARM: dts: OMAP3: Add IVA IOMMU nodeFlorian Vaussard1-0/+8
Add the DT node for the IOMMU within the DSP subsystem. The entry is disabled to keep in line with the hwmod usage as intended by the deprecated CONFIG_OMAP_IOMMU_IVA2 flag. Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch> [s-anna@ti.com: split the entry and disable the node] Signed-off-by: Suman Anna <s-anna@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12ARM: dts: OMAP3: Update ISP IOMMU nodeFlorian Vaussard1-3/+4
Update the IOMMU node for the camera subsystem as per the OMAP IOMMU bindings. Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch> [s-anna@ti.com: corrected interrupt number] Signed-off-by: Suman Anna <s-anna@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12ARM: OMAP2+: extend iommu pdata-quirks to OMAP5Suman Anna1-0/+4
OMAP5 has the same iommus as OMAP4, so extend the OMAP4 iommu pdata quirks for OMAP5 as well. Signed-off-by: Suman Anna <s-anna@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12ARM: OMAP5: hwmod data: add mmu data for ipu & dspSuman Anna1-0/+83
A new MMU hwmod class and data structures are created to represent the MMUs within the IPU and DSP processor subsystems in OMAP5. The MMUs in OMAP5 are identical to those in OMAP4. Cc: Benoit Cousson <bcousson@baylibre.com> Signed-off-by: Suman Anna <s-anna@ti.com> Acked-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12ARM: OMAP2+: use pdata quirks for iommu reset linesSuman Anna1-0/+20
The OMAP iommu driver performs the reset management for the iommu instances in processor sub-systems using the omap_device API which are currently supplied as platform data ops. Use pdata quirks to maintain the functionality as the OMAP iommu driver gets converted to use DT nodes, until the reset portions are decoupled from omap_hwmod/omap_device into a separate reset driver. This patch adds the pdata quirks for the reset management of iommus within the DSP (OMAP3 & OMAP4) and IPU subsystems (OMAP4). Signed-off-by: Suman Anna <s-anna@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12ARM: OMAP2+: change the ISP device archdata MMU name for DTSuman Anna1-0/+3
The IOMMU DT adaptation support uses the device name instead of an iommu object name. Fixup the ISP device archdata MMU name at runtime if using DT-boot. This allows the OMAP3 camera to be functional in both legacy and DT boots. The iommu object names should eventually vanish when all the IOMMU users have been converted to DT nodes. Signed-off-by: Suman Anna <s-anna@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12ARM: OMAP3: fix iva mmu programming issuesSuman Anna2-1/+5
The IVA MMU is not functional when used through the hwmod and omap_device layers. Add fixes to clockdomain and hwmod data to have it functional. The hwmod changes are needed to enable the clock, and the SWSUP change is needed to wakeup the domain because the power domain is programmed to be in RET, and there is no automatic power domain switching to ON. Signed-off-by: Suman Anna <s-anna@ti.com> Acked-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12ARM: OMAP3: remove deprecated CONFIG_OMAP_IOMMU_IVA2Florian Vaussard2-11/+0
CONFIG_OMAP_IOMMU_IVA2 was defined originally to avoid conflicting usage by tidspbridge and other iommu users. The same can be achieved by marking the DT node disabled, so remove this obsolete flag and the corresponding hwmod data can be enabled. Cc: Paul Walmsley <paul@pwsan.com> Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch> [s-anna@ti.com: revise commit log] Signed-off-by: Suman Anna <s-anna@ti.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Tony Lindgren <tony@atomide.com> Acked-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12ARM: at91: sama5d3: get rid of atmel_tsadcc driverLudovic Desroches2-17/+4
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 Belloni1-2/+2
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 Johansson1-0/+1
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 Johansson21-37/+758
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 Johansson1-27/+65
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 Johansson7-113/+306
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 Johansson13-450/+1224
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 Ferre4-0/+4
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 Johansson14-21/+407
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 Johansson7-3/+456
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 Johansson14-357/+43
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 Johansson12-210/+711
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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-17 15:20:06 +0000