diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-03-11 22:54:57 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-03-11 22:54:57 +0100 |
| commit | 05e6d23296ee46f4d25e9eec78141d45f2703410 (patch) | |
| tree | 3d47c72601e978eace3c216155bbed01a752f1dd /arch/arm/boot/dts/r8a7790.dtsi | |
| parent | 094a29d023b9ef0947bdc98e8cfeafe6219eb00a (diff) | |
| parent | 90ca409a1e6b9b72d1b6ae716cd7a63335fd0e87 (diff) | |
Merge tag 'renesas-dt2-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
Pull "Second Round of Renesas ARM Based SoC DT Updates for v4.1" from Simon Horman:
* ape6evm board
- Configure GPIO keys as wake-up source
- Enable pull-up for GPIO switches
- Correct polarity of LEDs
* r8a7791 SoC
- Correct IPMMU-GP clock to device tree
* r8a7794 SoC
- Correct ethernet controller PHY IRQ
* lager, koelsch and marzen boards
- Add DU external pixel clock to DT
* lager board
- Add HDMI output support to DT
* r8a7791 and r8a7790 SoCs
- Tidy up SDHI register size in DT
- Reference DMA channels for SDHI in DT
* tag 'renesas-dt2-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: ape6evm dts: Configure the custom switch as wake-up source
ARM: shmobile: ape6evm dts: Enable pull-up for GPIO switches
ARM: shmobile: r8a7791: Fix IPMMU-GP clock to device tree
ARM: shmobile: r8a7794: alt: Fix ethernet controller PHY IRQ line
ARM: shmobile: lager: Add DU external pixel clocks to DT
ARM: shmobile: koelsch: Add DU external pixel clocks to DT
ARM: shmobile: marzen: Add DU external pixel clock to DT
ARM: shmobile: ape6evm dts: Fix polarity of LEDs
ARM: shmobile: lager: Add DU HDMI output support
ARM: shmobile: r8a7791: Fix HSUSB clock to hp_clk from mp_clk
ARM: shmobile: r8a7790: Fix HSUSB clock to hp_clk from mp_clk
ARM: shmobile: r8a7791: tidyup SDHI register size on DTSI
ARM: shmobile: r8a7790: tidyup SDHI register size on DTSI
ARM: shmobile: r8a7791: Reference DMA channels in SDHI DT nodes
ARM: shmobile: r8a7790: Reference DMA channels in SDHI DT nodes
Diffstat (limited to 'arch/arm/boot/dts/r8a7790.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/r8a7790.dtsi | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi index c6c0a0c8f1be..b3202526b62c 100644 --- a/arch/arm/boot/dts/r8a7790.dtsi +++ b/arch/arm/boot/dts/r8a7790.dtsi @@ -1,6 +1,7 @@ /* * Device Tree Source for the r8a7790 SoC * + * Copyright (C) 2015 Renesas Electronics Corporation * Copyright (C) 2013-2014 Renesas Solutions Corp. * Copyright (C) 2014 Cogent Embedded Inc. * @@ -493,17 +494,21 @@ sdhi0: sd@ee100000 { compatible = "renesas,sdhi-r8a7790"; - reg = <0 0xee100000 0 0x200>; + reg = <0 0xee100000 0 0x328>; interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks R8A7790_CLK_SDHI0>; + dmas = <&dmac1 0xcd>, <&dmac1 0xce>; + dma-names = "tx", "rx"; status = "disabled"; }; sdhi1: sd@ee120000 { compatible = "renesas,sdhi-r8a7790"; - reg = <0 0xee120000 0 0x200>; + reg = <0 0xee120000 0 0x328>; interrupts = <0 166 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks R8A7790_CLK_SDHI1>; + dmas = <&dmac1 0xc9>, <&dmac1 0xca>; + dma-names = "tx", "rx"; status = "disabled"; }; @@ -512,6 +517,8 @@ reg = <0 0xee140000 0 0x100>; interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks R8A7790_CLK_SDHI2>; + dmas = <&dmac1 0xc1>, <&dmac1 0xc2>; + dma-names = "tx", "rx"; status = "disabled"; }; @@ -520,6 +527,8 @@ reg = <0 0xee160000 0 0x100>; interrupts = <0 168 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks R8A7790_CLK_SDHI3>; + dmas = <&dmac1 0xd3>, <&dmac1 0xd4>; + dma-names = "tx", "rx"; status = "disabled"; }; @@ -1173,7 +1182,7 @@ mstp7_clks: mstp7_clks@e615014c { compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks"; reg = <0 0xe615014c 0 4>, <0 0xe61501c4 0 4>; - clocks = <&mp_clk>, <&mp_clk>, <&zs_clk>, <&zs_clk>, <&p_clk>, + clocks = <&mp_clk>, <&hp_clk>, <&zs_clk>, <&zs_clk>, <&p_clk>, <&p_clk>, <&zx_clk>, <&zx_clk>, <&zx_clk>, <&zx_clk>, <&zx_clk>; #clock-cells = <1>; |