summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-06-10Merge tag 'keystone-dts-for-4.2' of ↵Kevin Hilman9-0/+609
git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/dt Keystone DTS update for 4.2 - Includes NETCP related EVM updates * tag 'keystone-dts-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: ARM: dts: k2l: fix the netcp range size ARM: dts: k2e: fix the netcp range size ARM: dts: k2hk: fix the netcp range size ARM: dts: k2l-evm: Add device bindings for netcp driver ARM: dts: k2e-evm: Add device bindings for netcp driver ARM: dts: k2hk-evm: Add device bindings for netcp driver
2015-06-10Merge tag 'arm-soc/for-4.2/dts-part3' of ↵Kevin Hilman16-6/+140
https://github.com/Broadcom/stblinux into next/dt This pull request contains Broadcom BCM5301x related changes: - Hauke adds the interrupt mapping for the BCM5301x PCIe controller - Haule adds support for NAND flash using the standard Broadcom NAND controller iProc specific binding on BCM4708/5301x - Rafal adds support for the Asus RT-AC87U router * tag 'arm-soc/for-4.2/dts-part3' of https://github.com/Broadcom/stblinux: ARM: BCM5301X: Add DT for Asus RT-AC87U ARM: BCM5301X: add IRQ numbers for PCIe controller ARM: BCM5301X: add NAND flash chip description
2015-06-10ARM: dts: Introduce STM32F429 MCUMaxime Coquelin3-0/+286
The STMicrolectornics's STM32F429 MCU has the following main features: - Cortex-M4 core running up to @180MHz - 2MB internal flash, 256KBytes internal RAM - FMC controller to connect SDRAM, NOR and NAND memories - SD/MMC/SDIO support - Ethernet controller - USB OTFG FS & HS controllers - I2C, SPI, CAN busses support - Several 16 & 32 bits general purpose timers - Serial Audio interface - LCD controller Tested-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Maxime Coquelin <mcoquelin.stm32@gmail.com> Signed-off-by: Kevin Hilman <khilman@linaro.org>
2015-06-10Merge tag 'sunxi-dt-for-4.2-2' of ↵Kevin Hilman25-661/+1522
https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt Allwinner DT changes for 4.2, take 2 A bunch of new DT changes for the 4.2 merge window, among which: - Enable the SRAM controller on the A10/A10s/A13/A20 - A33 support - New boards: A23 EVB, SinA33, GA10H-A33, Mele A1000G * tag 'sunxi-dt-for-4.2-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: ARM: dts: sun6i: Add a dts file for the Mele A1000G quad top set box ARM: dts: sun8i: Add dts file for the GA10H-A33 tablet ARM: dts: sun8i-a33: Add dts for Sinlinx SinA33 development board. ARM: dts: sun8i-a33: Add pinmux setting for uart0 on PB pins ARM: dts: sun8i: Add pinmux setting for 8bit mmc2 ARM: dts: sun8i: Add usb_clk node for a23/a33 ARM: dts: sun8i: Add ET-Q8 A33 support ARM: dts: sun8i: Add sun8i-a33 dtsi ARM: dts: sun8i: Add sun8i-a23-a33 dtsi ARM: dts: sun7i: Add A20 SRAM and SRAM controller ARM: dts: sun5i: Add A10s and A13 SRAM and SRAM controller ARM: dts: sun4i: Add A10 SRAM and SRAM controller ARM: dts: sunxi: Revert SRAM controller drivers patches ARM: dts: sun9i: Add device node for watchdog ARM: dts: sun7i: Add uart4 support for BananaPro, disable uart2 ARM: dts: sun7i: Add uart4_pins_b definition ARM: sun8i: Introduce A23 Evaluation Board Support
2015-06-10ARM: socfpga: dts: enable ethernet for Arria10 devkitDinh Nguyen2-0/+39
Update the arria10 gmac nodes with all the necessary properties for ethernet to function on the Arria10 devkit. Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> Signed-off-by: Kevin Hilman <khilman@linaro.org>
2015-06-10ARM: dts: k2l: fix the netcp range sizeMurali Karicheri1-2/+2
k2l netcp range size is 16M (0x1000000) and not 0xffffff. This patch fixes this. Similarly fix the size of switch module register space to 0x20000. Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
2015-06-10ARM: dts: k2e: fix the netcp range sizeMurali Karicheri1-2/+2
k2e netcp range size is 16M (0x1000000) and not 0xffffff. This patch fixes this. Similarly fix the size of switch module register space to 0x20000. Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
2015-06-10ARM: dts: k2hk: fix the netcp range sizeMurali Karicheri1-1/+1
k2hk netcp range size is 1M (0x100000) and not 0xfffff. This patch fixes this. Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
2015-06-10ARM: dts: k2l-evm: Add device bindings for netcp driverMurali Karicheri3-0/+191
This patch enables networking on k2l evm by providing device bindings for netcp, knav, and qmss. See device binding documentation at Documentation/devicetree/bindings/net/keystone-netcp.txt Signed-off-by: WingMan Kwok <w-kwok2@ti.com> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
2015-06-10ARM: dts: k2e-evm: Add device bindings for netcp driverMurali Karicheri3-0/+208
This patch enables networking on k2e evm by adding device bindings for netcp, knav and qmss. See device binding documentation below for details. Documentation/devicetree/bindings/net/keystone-netcp.txt Signed-off-by: WingMan Kwok <w-kwok2@ti.com> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
2015-06-10ARM: dts: k2hk-evm: Add device bindings for netcp driverMurali Karicheri3-0/+210
This patch enables networking on k2hk evm by adding device bindings for netcp, knav and qmss. See device binding documentation below for details. Documentation/devicetree/bindings/net/keystone-netcp.txt Signed-off-by: WingMan Kwok <w-kwok2@ti.com> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
2015-06-10Merge tag 'socfpga_dts_for_v4.2_part_3' of ↵Kevin Hilman4-0/+50
git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/dt SoCFPGA updates for v4.2 part 3 - Add SCU node for Arria 10 - Add enable-method for cpu nodes - Add SDRAM controller binding doc - Enable gpio-leds on SoCFPGA Socrates board * tag 'socfpga_dts_for_v4.2_part_3' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux: ARM: socfpga: socrates: add gpio-leds ARM: socfpga: socrates: enable gpio0/1 ARM: socfpga: dts: add sdram controller dt binding doc ARM: socfpga: dts: add enable-method property for cpu nodes ARM: socfpga: dts: add the a9-scu node for arria10
2015-06-06ARM: BCM5301X: Add DT for Asus RT-AC87URafał Miłecki2-0/+66
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2015-06-06ARM: BCM5301X: add IRQ numbers for PCIe controllerHauke Mehrtens1-0/+24
The driver for the PCIe controller was just added, this adds the missing definition of the IRQ numbers to device tree. The driver itself will be automatically detected by bcma. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2015-06-06ARM: BCM5301X: add NAND flash chip descriptionHauke Mehrtens14-6/+50
This adds the NAND flash chip description for a standard chip found connected to this SoC. This makes use of generic Broadcom NAND driver with the iProc interface. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2015-06-02ARM: dts: sun6i: Add a dts file for the Mele A1000G quad top set boxHans de Goede3-1/+151
The Mele A1000G-quad and the Mele M9 have the same PCB, sofar we've been using the same dts for both models. Unfortunately this does not work for the otg controller, on the M9 this is routed to a micro-usb connector on the outside, while as on the A1000G-quad it is connected to an usb to sata bridge (which is not populated on the M9 pcb). This commit adds a new dts for the Mele-A1000G-quad to allow using different otg controller settings on the 2 boards. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-06-02ARM: dts: sun8i: Add dts file for the GA10H-A33 tabletHans de Goede2-0/+126
The ga10h is an 10" tablet with an A33 or A23 soc, 1G RAM, 8G or 16G nand, sdio wifi, 2 micro usb ports, 1 otg and 1 host and 1 micro sd slot. This commit adds a dts file for the v1.1 pcb with an a33 soc. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-06-02ARM: dts: sun8i-a33: Add dts for Sinlinx SinA33 development board.Chen-Yu Tsai2-1/+131
The SinA33 is a core/SDK development board by Sinlinx. The core board does not have any connectors or pads, other than the pads used to connect it to the SDK board. The core board only has the A33 SoC, 2 RAM chips, an eMMC flash chip, the AXP223 PMIC, and supporting discrete components. eMMC is optional. The SDK board has a USB host, USB OTG, volume control and home buttons, audio input/output jacks, a micro-SD slot, camera and SDIO expansion headers, an LCD connector, and a GPIO expansion header, which has UARTs, MIPI DSI and I2C available. Only UART0 is enabled though. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-06-02ARM: dts: sun8i-a33: Add pinmux setting for uart0 on PB pinsChen-Yu Tsai1-0/+8
The A33 adds an additional pinmux option for uart0 on the PB pins. This was not present on the A23. Nor is it available on the H3, which does not have the PB pingroup. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-06-02ARM: dts: sun8i: Add pinmux setting for 8bit mmc2Chen-Yu Tsai1-0/+10
mmc2 is mostly used with eMMC flash chips, as an alternative to raw NAND flash chips. 8 bit mmc is commonly used. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-06-02ARM: socfpga: socrates: add gpio-ledsSteffen Trumtrar1-0/+23
The SOCrates has three HPS LEDs that can be turned on/off via gpio. Use the first one has heartbeat and add the other two as free LEDs. Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
2015-06-02ARM: socfpga: socrates: enable gpio0/1Steffen Trumtrar1-0/+8
Enable the gpio0+1 controller. Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de> Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
2015-06-02ARM: socfpga: dts: add sdram controller dt binding docAlan Tull1-0/+12
Add binding doc for Altera SOCFPGA SDRAM controller. Signed-off-by: Alan Tull <atull@opensource.altera.com> Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
2015-06-02ARM: socfpga: dts: add enable-method property for cpu nodesDinh Nguyen2-0/+2
Add the enable-method property for the cpu node on socfpga.dtsi and socfpga_arria10.dtsi. This is for CPU_METHOD_OF_DECLARE to use to enable the secondary core. Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
2015-06-02ARM: socfpga: dts: add the a9-scu node for arria10Dinh Nguyen1-0/+5
Add a dts node for the A9 SCU on the Arria10 platform. Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
2015-06-02ARM: dts: sun8i: Add usb_clk node for a23/a33Hans de Goede1-0/+10
Add an usb_clk node for a23/a33. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Reviewed-by: Chen-Yu Tsai <wens@csie.org>
2015-06-02ARM: dts: sun8i: Add ET-Q8 A33 supportVishnu Patekar2-1/+90
ET-Q8_A33 is A33 based cheap tablet in common Q8 format. It has 512MB RAM, 4GB Nand, 7" Display, RDA5900P wifi, GSL1680 touch, etc. Signed-off-by: Vishnu Patekar <vishnupatekar0510@gmail.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Tested-by: Chen-Yu Tsai <wens@csie.org>
2015-06-02ARM: dts: sun8i: Add sun8i-a33 dtsiVishnu Patekar1-0/+89
Add a dtsi file for use with a33 based boards based on the new sun8i-a23-a33.dtsi file. Signed-off-by: Vishnu Patekar <vishnupatekar0510@gmail.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Tested-by: Chen-Yu Tsai <wens@csie.org>
2015-06-02ARM: dts: sun8i: Add sun8i-a23-a33 dtsiVishnu Patekar2-569/+623
Rename sun8i-a23.dtsi to sun8i-a23-a33.dtsi as the base dtsi for the A33 is 99% the same and add a new sun8i-a23.dtsi including sun8i-a23-a33.dtsi and setting the few things not shared with the A33 (mbus-clk, pio compatible and interrupts). Signed-off-by: Vishnu Patekar <vishnupatekar0510@gmail.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Tested-by: Chen-Yu Tsai <wens@csie.org>
2015-06-01Merge tag 'dt-for-armsoc' of ↵Arnd Bergmann3-0/+117
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt Merge "Device Tree changes for Ux500 and ARM SOC" from Linus Walleij: - Document Snoop Control Unit (SCU) bindings - Document Ux500 board bindings - Define the backup RAM in the DBx500 device tree * tag 'dt-for-armsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: ARM: ux500: define the backupram in the device tree ARM: ux500: add board documentation ARM: scu: document Snoop Control Unit DT bindings
2015-06-01Merge tag 'v4.1-next-arm64' of https://github.com/mbgg/linux-mediatek into ↵Arnd Bergmann1-19/+22
next/dt Merge "ARM: mediatek: arm64 updates for v4.2" from Matthias Brugger: - dts: mt8173: fix style convention for pinctrl node - dts: mt8173: fix indentation for some nodes * tag 'v4.1-next-arm64' of https://github.com/mbgg/linux-mediatek: arm64: dts: mt8173: fix some indentation arm64: dts: mt8173: Fixup pinctrl nodes
2015-06-01Merge tag 'arm-soc/for-4.2/dts-fixes' of http://github.com/broadcom/stblinux ↵Arnd Bergmann1-11/+11
into next/dt Merge "This pull request contains a single change" from Florian Fainelli: - fix the NAND controller node on bcm63138, the original change was a mis-merge that did not properly parent it to the "ubus" node * tag 'arm-soc/for-4.2/dts-fixes' of http://github.com/broadcom/stblinux: ARM: dts: BCM63xx: re-parent NAND controller node
2015-06-01Merge tag 'mvebu-dt-4.2-2' of git://git.infradead.org/linux-mvebu into next/dtArnd Bergmann35-32/+968
Merge "mvebu dt changes for v4.2 (part #2)" from Gregory CLEMENT: Add 2 new set boards: - Armada 385 based Linksys boards - DLink DNS-327L Update the spi-nor flash compatible strings Use improved armada spi device tree compatible name for each mvebu SoC * tag 'mvebu-dt-4.2-2' of git://git.infradead.org/linux-mvebu: ARM: mvebu: use improved armada spi device tree compatible name for each SoC ARM: mvebu: dts: Add dts file for DLink DNS-327L ARM: mvebu: add "jedec,spi-nor" flash compatible binding ARM: kirkwood: add "jedec,spi-nor" flash compatible binding ARM: mvebu: add support for the new Armada 385 based Linksys boards
2015-06-01ARM: dts: sun7i: Add A20 SRAM and SRAM controllerMaxime Ripard1-0/+37
The A20 has a few SRAM that can be mapped either to a device or to the CPU, with the mapping being controlled by a SRAM controller. Add the SRAM controller, the SRAM that it drives and the section that can be used by the various devices. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Hans de Goede <hdegoede@redhat.com> Tested-by: Hans de Goede <hdegoede@redhat.com>
2015-06-01ARM: dts: sun5i: Add A10s and A13 SRAM and SRAM controllerMaxime Ripard3-0/+43
The A10s and A13 have a few SRAM that can be mapped either to a device or to the CPU, with the mapping being controlled by a SRAM controller. Add the SRAM controller, the SRAM that it drives and the section that can be used by the various devices. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Hans de Goede <hdegoede@redhat.com> Tested-by: Hans de Goede <hdegoede@redhat.com>
2015-06-01ARM: dts: sun4i: Add A10 SRAM and SRAM controllerMaxime Ripard9-0/+69
The A10 has a few SRAM that can be mapped either to a device or to the CPU, with the mapping being controlled by a SRAM controller. Add the SRAM controller, the SRAM that it drives and the section that can be used by the various devices. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Hans de Goede <hdegoede@redhat.com> Tested-by: Hans de Goede <hdegoede@redhat.com>
2015-06-01ARM: dts: sunxi: Revert SRAM controller drivers patchesMaxime Ripard3-102/+0
This patch reverts commit ccb4ada2f193 ("ARM: dts: sun7i: Add A20 SRAM and SRAM controller"), commit e6f51e4bd2a5 ("ARM: dts: sun5i: Add A13 and A10s SRAM and SRAM controller") and commit 6d92b80f356f ("ARM: dts: sun4i: Add A10 SRAM and SRAM controller"). The bindings have been changed in the SRAM driver, and we need to change the DT accordingly. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-06-01ARM: dts: sun9i: Add device node for watchdogChen-Yu Tsai1-0/+6
On A80 there are 2 watchdogs, one in the main block, and one in the R (special) block. We do not have information on the R block watchdog, other than the register layout is the same, and the interrupt number. Both are able to reset the whole system. Add the main watchdog, in case the R block is used for special purposes like running an RTOS. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-06-01ARM: dts: sun7i: Add uart4 support for BananaPro, disable uart2Michael Ring1-3/+3
The BananaPro uses uart4 for the default rx/tx pins on the 40 pins connector, so enable uart4. Uart2 is also available at the bananapro io-pins, but like on the bananapi the primary function of the pins is to act as gpios, see: http://forum.lemaker.org/forum.php?mod=viewthread&tid=10852 Remove the uart2 node, people who want to use uart2 can do so with a devicetree-overlay. Signed-off-by: Michael Ring <mail@michael-ring.org> [hdegoede@redhat.com: Remove uart2 node] Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-06-01ARM: dts: sun7i: Add uart4_pins_b definitionMichael Ring1-0/+7
Some boards (e.g. the BananaPro) use alternative pins for uart4, add a pinmux entry for these. Signed-off-by: Michael Ring <mail@michael-ring.org> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-06-01ARM: sun8i: Introduce A23 Evaluation Board SupportMaxime Ripard2-0/+135
The A23 Evaluation Board has an MMC slot, two UARTs, NAND, a few display connectors (RGB, MIPI, LVDS), a mini-PCIE slot, USB host and OTG and a bunch of embedded sensors. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2015-06-01arm64: dts: mt8173: fix some indentationDaniel Kurtz1-10/+9
Fix indentation nits to make mt8173.dtsi more consistent. Signed-off-by: Eddie Huang <eddie.huang@mediatek.com> Signed-off-by: Daniel Kurtz <djkurtz@chromium.org> Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
2015-05-29Merge branch 'for-upstream/juno-dts' of git://linux-arm.org/linux-ld into ↵Arnd Bergmann6-131/+340
next/dt Merge "Documentation: bindings: Add DT bindings for ARM Juno boards" from Liviu Dudau: * 'for-upstream/juno-dts' of git://linux-arm.org/linux-ld: Documentation: bindings: Add DT bindings for ARM Juno boards. arm64: Add DT support for Juno r1 board. arm64: Juno: Add GICv2m support in device tree. arm64: Juno: Add memory mapped timer node arm64: Juno: Split juno.dts into juno-base.dtsi and juno.dts. arm64: Juno: Fix the GIC node address label and the frequency of FAXI clock.
2015-05-29Merge tag 'qcom-arm64-for-4.2' of ↵Arnd Bergmann6-1/+178
git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/dt Merge "Qualcomm ARM64 Updates for v4.2" Kumar Gala: * Added SPMI PMIC Arbiter device tree node for MSM8916 * Added 8x16 chipset SPMI PMIC's nodes * Added MSM8916 restart device node * Added initial set of PMIC and SoC pins for APQ8016 SBC board * tag 'qcom-arm64-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom: arm64: dts: qcom: Add initial set of PMIC and SoC pins for APQ8016 SBC board arm64: dts: qcom: Add MSM8916 restart device node arm64: dts: qcom: Add 8x16 chipset SPMI PMIC's nodes arm64: dts: qcom: Add SPMI PMIC Arbiter node for MSM8916
2015-05-29Merge tag 'renesas-dt2-for-v4.2' of ↵Arnd Bergmann8-5/+100
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt Merge "Second Round of Renesas ARM Based SoC DT Updates for v4.2" from Simon Horman: * Describe DMA for the serial ports of R-Car Gen2 SoCs * Add MMCIF max-frequency to R-Car Gen2 SoCs * Use "nor-jedec" instead of "jedec,spi-nor" * tag 'renesas-dt2-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r8a7790 dtsi: Describe DMA for the serial ports ARM: shmobile: r8a7791 dtsi: Describe DMA for the serial ports ARM: shmobile: r8a7794 dtsi: Describe DMA for the serial ports ARM: shmobile: r8a7791: add MMCIF max-frequency ARM: shmobile: r8a7790: add MMCIF max-frequency ARM: shmobile: bockw dts: Replace "nor-jedec" by "jedec,spi-nor" ARM: shmobile: henninger dts: Replace "nor-jedec" by "jedec,spi-nor" ARM: shmobile: bockw-reference dts: Replace "nor-jedec" by "jedec,spi-nor" ARM: shmobile: koelsch dts: Replace "nor-jedec" by "jedec,spi-nor" ARM: shmobile: lager dts: Replace "nor-jedec" by "jedec,spi-nor"
2015-05-29Merge tag 'zynq-dt-for-4.2' of https://github.com/Xilinx/linux-xlnx into next/dtArnd Bergmann9-9/+28
Merge "arm: Xilinx Zynq dt patches for v4.2" from Michal Simek: - Fix aliases and stdout properties - Document current TTC binding - Add Ceva to prefixes - Use new compatible string for MACB * tag 'zynq-dt-for-4.2' of https://github.com/Xilinx/linux-xlnx: ARM: zynq: DT: Use the zynq binding with macb of: Add vendor prefix for Ceva PCI: xilinx: Trivial fix in DT example devicetree: cadence_ttc: Document binding for timer width ARM: dts: zynq: Fix stdout-path and bootargs ARM: dts: zynq: Add missing alias node for zybo and parallella
2015-05-29Merge tag 'v4.1-next-dts' of https://github.com/mbgg/linux-mediatek into next/dtArnd Bergmann3-4/+1335
Merge "ARM: mediatek: dts updates for v4.2" from Matthias Brugger: - dts: add pinctrl/GPIO/EINT to mt8135 - dts: fix uart address for mt8127 * tag 'v4.1-next-dts' of https://github.com/mbgg/linux-mediatek: ARM: dts: mt8127: correct uart instance address ARM: dts: mt8135: Add pinctrl/GPIO/EINT node for mt8135.
2015-05-29Merge tag 'qcom-dt-for-4.2' of ↵Arnd Bergmann7-10/+649
git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/dt Merge "Qualcomm ARM Based Device Tree Updates for v4.2" from Kumar Gala: * Added support for regulators, USB Host & OTG, SATA, and i2c controllers on APQ8064 based platforms * Added PM8841/PM8941/PMA8084 device nodes * Added PMU support on MSM8660 * tag 'qcom-dt-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom: ARM: dts: qcom: Add msm8660 PMU node ARM: dts: qcom: Add PMA8084 functions device nodes ARM: dts: qcom: Add PM8941 functions device nodes ARM: dts: qcom: Add PM8841 functions device nodes ARM: dts: qcom: apq8064 - add i2c3 node for panel. ARM: dts: qcom: apq8064 - Move i2c1 pinctrl to apq8064.dtsi ARM: dts: qcom: apq8064-ifc6410 - Add DT alias for serial port ARM: dts: qcom: apq8064 - Add USB OTG support for CM QS-600 ARM: dts: qcom: apq8064 - Add usb host support to CM QS-600 ARM: dts: qcom: apq8064-cm-qs600 - Add basic regulators ARM: dts: qcom: apq8064 - Add SATA controller support ARM: dts: qcom: apq8064 - Add USB OTG support ARM: dts: qcom: apq8064 - Add usb host support. ARM: dts: qcom: apq8064-ifc6410 - Add basic regulators ARM: dts: qcom: apq8064 - add RPM regulators support
2015-05-28Merge tag 'omap-for-v4.2/dt-pt1' of ↵Arnd Bergmann16-17/+1237
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt Merge "Device tree related changes for omaps" from Tony Lindgren: - Configure MMC data lines 4..8 for 1.8V IO on boards that are using them as GPIOs instead of MMC data lines - Add support for Baltos IR5221 - Add device tree support for LogicPD Torpedo devkit - Add 3717 core pinctrl region - Add gta04 1w and GSM audio support - Add wilink and ov2659 support for am437x-gp-evm - Add am335x-evm bluetooth and mmc3 support - Enable omap5-uevm uart wakeup interrupt - Enable I2C2 on BeagleBone as it's used for the capes - Use defines for LDP GPIO keys * tag 'omap-for-v4.2/dt-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: am335x-evm: add mmc3 and wlan definitions to dts ARM: dts: Enable SDIO card interrupt for 37xx-evm ARM: dts: Fix ldp gpio keys to use defines ARM: dts: Beaglebone i2c definitions ARM: dts: am437x-gp-evm: add DT nodes for ov2659 sensor ARM: dts: add DTS for Baltos IR5221 ARM: dts: omap5-uevm: Add Uart wakeup interrupt ARM: dts: omap3-gta04: Add GSM audio support ARM: dts: am335x-evm: add bluetooth support ARM: dts: am437x-gp-evm: add wilink8 support ARM: dts: omap3-gta04: Add hdqw1 support ARM: dts: add core2 padconf region for am3517 ARM: dts: Add minimal support for LogicPD Torpedo DM3730 devkit ARM: OMAP3: Add support for configuring MMC pins as GPIO pins
2015-05-28ARM: zynq: DT: Use the zynq binding with macbNathan Sullivan1-2/+2
Use the new zynq binding for macb ethernet, since it will disable half duplex gigabit like the Zynq TRM says to do. Also allow the compatible cadence gem binding that won't disable half duplex but works otherwise. Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com> Acked-by: Sören Brinkmann <soren.brinkmann@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>