diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-11-21 07:02:08 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-21 07:02:08 -0500 |
commit | 5ba3c24ca069738b8d12ac90e2ab03eef9bfb293 (patch) | |
tree | 5a40363fe298bb6cfcd99caf4839451d1affcc1b /include/dt-bindings | |
parent | 1bc7f27deeb1ea7773ebf45b5d09e87ad8034f83 (diff) | |
parent | b9473d9f621b68327776b66d4b9a8ba5e0b8b4cb (diff) |
Merge tag 'renesas-dt2-for-v3.19' 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 v3.19" from Simon Horman:
* Add labels for LEDs on kzm9g-reference and koelsch
* Add Sound support to r8a7790/lager and r8a7791/koelsch
* Add IIC DMA nodes to r8a7790 and r8a7791
* Use SoC-specific IIC compatible properties on sh73a0 and r8a73a4
* Add SGX, MMP and VSP1 clocks to r8a7794
* Add USBDMAC{0,1} clocks to r8a7790 and r8a7791
* tag 'renesas-dt2-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (29 commits)
ARM: shmobile: r8a7791: add USBDMAC{0,1} clocks to device tree
ARM: shmobile: r8a7790: add USBDMAC{0,1} clocks to device tree
ARM: shmobile: r8a7794: Add MMP and VSP1 clocks to device tree
ARM: shmobile: r8a7794: Add SGX clock to device tree
ARM: shmobile: koelsch: add Volume Ramp usage on comment
ARM: shmobile: lager: add Volume Ramp usage on comment
ARM: shmobile: r8a7791: add DMA nodes for IIC
ARM: shmobile: r8a7790: add DMA nodes for IIC
ARM: shmobile: kzm9g-reference dts: Add labels for the LEDs
ARM: shmobile: koelsch dts: Add labels for the LEDs
ARM: shmobile: sh73a0 dtsi: Add SoC-specific IIC compatible properties
ARM: shmobile: r8a73a4 dtsi: Add SoC-specific IIC compatible properties
ARM: shmobile: koelsch: Sound DMA support via DVC on DTS
ARM: shmobile: koelsch: Sound DMA support via SRC on DTS
ARM: shmobile: koelsch: Sound DMA support via BUSIF on DTS
ARM: shmobile: koelsch: Sound DMA support on DTS
ARM: shmobile: koelsch: Sound PIO support on DTS
ARM: shmobile: koelsch: fixup I2C2 clock frequency
ARM: shmobile: lager: Sound DMA support via DVC on DTS
ARM: shmobile: lager: Sound DMA support via SRC on DTS
...
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/dt-bindings')
-rw-r--r-- | include/dt-bindings/clock/r8a7790-clock.h | 2 | ||||
-rw-r--r-- | include/dt-bindings/clock/r8a7791-clock.h | 2 | ||||
-rw-r--r-- | include/dt-bindings/clock/r8a7794-clock.h | 9 |
3 files changed, 13 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/r8a7790-clock.h b/include/dt-bindings/clock/r8a7790-clock.h index e3a3fb80feb6..c27b3b5133b9 100644 --- a/include/dt-bindings/clock/r8a7790-clock.h +++ b/include/dt-bindings/clock/r8a7790-clock.h | |||
@@ -78,6 +78,8 @@ | |||
78 | #define R8A7790_CLK_USBDMAC1 31 | 78 | #define R8A7790_CLK_USBDMAC1 31 |
79 | 79 | ||
80 | /* MSTP5 */ | 80 | /* MSTP5 */ |
81 | #define R8A7790_CLK_AUDIO_DMAC1 1 | ||
82 | #define R8A7790_CLK_AUDIO_DMAC0 2 | ||
81 | #define R8A7790_CLK_THERMAL 22 | 83 | #define R8A7790_CLK_THERMAL 22 |
82 | #define R8A7790_CLK_PWM 23 | 84 | #define R8A7790_CLK_PWM 23 |
83 | 85 | ||
diff --git a/include/dt-bindings/clock/r8a7791-clock.h b/include/dt-bindings/clock/r8a7791-clock.h index dcececd9f4d0..3ea2bbc0da3f 100644 --- a/include/dt-bindings/clock/r8a7791-clock.h +++ b/include/dt-bindings/clock/r8a7791-clock.h | |||
@@ -69,6 +69,8 @@ | |||
69 | #define R8A7791_CLK_USBDMAC1 31 | 69 | #define R8A7791_CLK_USBDMAC1 31 |
70 | 70 | ||
71 | /* MSTP5 */ | 71 | /* MSTP5 */ |
72 | #define R8A7791_CLK_AUDIO_DMAC1 1 | ||
73 | #define R8A7791_CLK_AUDIO_DMAC0 2 | ||
72 | #define R8A7791_CLK_THERMAL 22 | 74 | #define R8A7791_CLK_THERMAL 22 |
73 | #define R8A7791_CLK_PWM 23 | 75 | #define R8A7791_CLK_PWM 23 |
74 | 76 | ||
diff --git a/include/dt-bindings/clock/r8a7794-clock.h b/include/dt-bindings/clock/r8a7794-clock.h index 9ac1043e25bc..aa9c286e60c0 100644 --- a/include/dt-bindings/clock/r8a7794-clock.h +++ b/include/dt-bindings/clock/r8a7794-clock.h | |||
@@ -26,11 +26,18 @@ | |||
26 | #define R8A7794_CLK_MSIOF0 0 | 26 | #define R8A7794_CLK_MSIOF0 0 |
27 | 27 | ||
28 | /* MSTP1 */ | 28 | /* MSTP1 */ |
29 | #define R8A7794_CLK_VCP0 1 | ||
30 | #define R8A7794_CLK_VPC0 3 | ||
29 | #define R8A7794_CLK_TMU1 11 | 31 | #define R8A7794_CLK_TMU1 11 |
32 | #define R8A7794_CLK_3DG 12 | ||
33 | #define R8A7794_CLK_2DDMAC 15 | ||
34 | #define R8A7794_CLK_FDP1_0 19 | ||
30 | #define R8A7794_CLK_TMU3 21 | 35 | #define R8A7794_CLK_TMU3 21 |
31 | #define R8A7794_CLK_TMU2 22 | 36 | #define R8A7794_CLK_TMU2 22 |
32 | #define R8A7794_CLK_CMT0 24 | 37 | #define R8A7794_CLK_CMT0 24 |
33 | #define R8A7794_CLK_TMU0 25 | 38 | #define R8A7794_CLK_TMU0 25 |
39 | #define R8A7794_CLK_VSP1_DU0 28 | ||
40 | #define R8A7794_CLK_VSP1_S 31 | ||
34 | 41 | ||
35 | /* MSTP2 */ | 42 | /* MSTP2 */ |
36 | #define R8A7794_CLK_SCIFA2 2 | 43 | #define R8A7794_CLK_SCIFA2 2 |
@@ -61,6 +68,8 @@ | |||
61 | #define R8A7794_CLK_SCIF0 21 | 68 | #define R8A7794_CLK_SCIF0 21 |
62 | 69 | ||
63 | /* MSTP8 */ | 70 | /* MSTP8 */ |
71 | #define R8A7794_CLK_VIN1 10 | ||
72 | #define R8A7794_CLK_VIN0 11 | ||
64 | #define R8A7794_CLK_ETHER 13 | 73 | #define R8A7794_CLK_ETHER 13 |
65 | 74 | ||
66 | /* MSTP9 */ | 75 | /* MSTP9 */ |