aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-05-15 17:21:10 +0200
committerArnd Bergmann <arnd@arndb.de>2015-05-15 17:21:10 +0200
commitbc2ad8ffd834eb9ba71e965907257998b8fea339 (patch)
tree4685ad6b5d2713554950bd22e2f43f602c7c3b15 /include
parent144ed9708e67d28b116f4cd9e3106c08341a8959 (diff)
parent7706993e2deb75022dbcfc3043890aa1a0020189 (diff)
downloadlinux-stericsson-bc2ad8ffd834eb9ba71e965907257998b8fea339.tar.gz
Merge tag 'renesas-dt-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
Merge "Renesas ARM Based SoC DT Updates for v4.2" from Simon Horman: * Enable DMA for HSUSB on r8a7790 and r8a7791 SoCs * Configure the HOME key as wake-up source on kzm9g board * Use generic names for device nodes on SH Mobile SoCs and boards * Add "nor-jedec" compatible value to SH Mobile boards * Add IRQC clock to r8a73a4, r8a779* SoCs * Remove MSIOF address from r8a7790 and r8a7791 SoCs * tag 'renesas-dt-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (31 commits) ARM: shmobile: r8a7791: Enable DMA for HSUSB ARM: shmobile: r8a7791: add USB-DMAC device nodes ARM: shmobile: r8a7790: Enable DMA for HSUSB ARM: shmobile: r8a7790: add USB-DMAC device nodes ARM: shmobile: kzm9g dts: Configure the HOME key as wake-up source ARM: shmobile: koelsch dts: Use generic names for device nodes ARM: shmobile: lager dts: Use generic names for device nodes ARM: shmobile: bockw dts: Use generic names for device nodes ARM: shmobile: koelsch dts: Add "nor-jedec" compatible value ARM: shmobile: bockw dts: Add "nor-jedec" compatible value ARM: shmobile: lager dts: Add "nor-jedec" compatible value ARM: shmobile: bockw-reference dts: Add "nor-jedec" compatible value ARM: shmobile: henninger dts: Add "nor-jedec" compatible value ARM: shmobile: armadillo800eva dts: Use generic names for device nodes ARM: shmobile: marzen dts: Use generic names for device nodes ARM: shmobile: kzm9d dts: Use generic names for device nodes ARM: shmobile: ape6evm dts: Use generic names for device nodes ARM: shmobile: sh73a0 dtsi: Use generic names for device nodes ARM: shmobile: r8a7791 dtsi: Use generic names for device nodes ARM: shmobile: r8a7790 dtsi: Use generic names for device nodes ...
Diffstat (limited to 'include')
-rw-r--r--include/dt-bindings/clock/r8a73a4-clock.h1
-rw-r--r--include/dt-bindings/clock/r8a7790-clock.h3
-rw-r--r--include/dt-bindings/clock/r8a7791-clock.h3
-rw-r--r--include/dt-bindings/clock/r8a7794-clock.h3
4 files changed, 10 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/r8a73a4-clock.h b/include/dt-bindings/clock/r8a73a4-clock.h
index 9a4b4c9ca44a..dd11ecdf837e 100644
--- a/include/dt-bindings/clock/r8a73a4-clock.h
+++ b/include/dt-bindings/clock/r8a73a4-clock.h
@@ -54,6 +54,7 @@
#define R8A73A4_CLK_IIC3 11
#define R8A73A4_CLK_IIC4 10
#define R8A73A4_CLK_IIC5 9
+#define R8A73A4_CLK_IRQC 7
/* MSTP5 */
#define R8A73A4_CLK_THERMAL 22
diff --git a/include/dt-bindings/clock/r8a7790-clock.h b/include/dt-bindings/clock/r8a7790-clock.h
index 3f2c6b198d4a..ff7ca3584e16 100644
--- a/include/dt-bindings/clock/r8a7790-clock.h
+++ b/include/dt-bindings/clock/r8a7790-clock.h
@@ -79,6 +79,9 @@
#define R8A7790_CLK_USBDMAC0 30
#define R8A7790_CLK_USBDMAC1 31
+/* MSTP4 */
+#define R8A7790_CLK_IRQC 7
+
/* MSTP5 */
#define R8A7790_CLK_AUDIO_DMAC1 1
#define R8A7790_CLK_AUDIO_DMAC0 2
diff --git a/include/dt-bindings/clock/r8a7791-clock.h b/include/dt-bindings/clock/r8a7791-clock.h
index 8fc5dc8faeea..402268384b99 100644
--- a/include/dt-bindings/clock/r8a7791-clock.h
+++ b/include/dt-bindings/clock/r8a7791-clock.h
@@ -70,6 +70,9 @@
#define R8A7791_CLK_USBDMAC0 30
#define R8A7791_CLK_USBDMAC1 31
+/* MSTP4 */
+#define R8A7791_CLK_IRQC 7
+
/* MSTP5 */
#define R8A7791_CLK_AUDIO_DMAC1 1
#define R8A7791_CLK_AUDIO_DMAC0 2
diff --git a/include/dt-bindings/clock/r8a7794-clock.h b/include/dt-bindings/clock/r8a7794-clock.h
index d63323032d6e..09da38a58776 100644
--- a/include/dt-bindings/clock/r8a7794-clock.h
+++ b/include/dt-bindings/clock/r8a7794-clock.h
@@ -60,6 +60,9 @@
#define R8A7794_CLK_USBDMAC0 30
#define R8A7794_CLK_USBDMAC1 31
+/* MSTP4 */
+#define R8A7794_CLK_IRQC 7
+
/* MSTP5 */
#define R8A7794_CLK_THERMAL 22
#define R8A7794_CLK_PWM 23