Merge tag 'renesas-dt-timers2-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

Pull "Second Round of Renesas ARM Based SoC DT Timers Updates for v3.18" from Simon Horman:

* kzm9g-reference: Enable CMT1 in device tree
* Use SoC-specific timer compat strings

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

* tag 'renesas-dt-timers2-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: kzm9g-reference: Enable CMT1 in device tree
  ARM: shmobile: sh73a0: Add CMT1 device to DT
  ARM: shmobile: r8a7740: Use SoC-specific 48-bit CMT compat string
  ARM: shmobile: r8a7779: Use SoC-specific TMU compat string
  ARM: shmobile: r8a7791: Use SoC-specific 48-bit CMT compat string
  ARM: shmobile: r7s72100: Use SoC-specific MTU2 compat string
  ARM: shmobile: r8a7790: Use SoC-specific 48-bit CMT compat string

8 files changed, 24 insertions, 19 deletions

diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi
index 1d28d01c163c..801a556e264b 100644
--- a/arch/arm/boot/dts/r7s72100.dtsi
+++ b/arch/arm/boot/dts/r7s72100.dtsi
@@ -230,7 +230,7 @@
         };
 
         mtu2: timer@fcff0000 {
-                compatible = "renesas,mtu2";
+                compatible = "renesas,mtu2-r7s72100", "renesas,mtu2";
                 reg = <0xfcff0000 0x400>;
                 interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;
                 interrupt-names = "tgi0a";
diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi
index 1067a96c8425..d46c213a17ad 100644
--- a/arch/arm/boot/dts/r8a7740.dtsi
+++ b/arch/arm/boot/dts/r8a7740.dtsi
@@ -42,7 +42,7 @@
         };
 
         cmt1: timer@e6138000 {
-                compatible = "renesas,cmt-48";
+                compatible = "renesas,cmt-48-r8a7740", "renesas,cmt-48";
                 reg = <0xe6138000 0x170>;
                 interrupts = <0 58 IRQ_TYPE_LEVEL_HIGH>;
                 clocks = <&mstp3_clks R8A7740_CLK_CMT1>;
diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index 463e3fd569b6..72891e5f0f1b 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -267,7 +267,7 @@
         };
 
         tmu0: timer@ffd80000 {
-                compatible = "renesas,tmu";
+                compatible = "renesas,tmu-r8a7779", "renesas,tmu";
                 reg = <0xffd80000 0x30>;
                 interrupts = <0 32 IRQ_TYPE_LEVEL_HIGH>,
                              <0 33 IRQ_TYPE_LEVEL_HIGH>,
@@ -281,7 +281,7 @@
         };
 
         tmu1: timer@ffd81000 {
-                compatible = "renesas,tmu";
+                compatible = "renesas,tmu-r8a7779", "renesas,tmu";
                 reg = <0xffd81000 0x30>;
                 interrupts = <0 36 IRQ_TYPE_LEVEL_HIGH>,
                              <0 37 IRQ_TYPE_LEVEL_HIGH>,
@@ -295,7 +295,7 @@
         };
 
         tmu2: timer@ffd82000 {
-                compatible = "renesas,tmu";
+                compatible = "renesas,tmu-r8a7779", "renesas,tmu";
                 reg = <0xffd82000 0x30>;
                 interrupts = <0 40 IRQ_TYPE_LEVEL_HIGH>,
                              <0 41 IRQ_TYPE_LEVEL_HIGH>,
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 7218bfff0bca..aa146d2d1022 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -207,7 +207,7 @@
         };
 
         cmt0: timer@ffca0000 {
-                compatible = "renesas,cmt-48-gen2";
+                compatible = "renesas,cmt-48-r8a7790", "renesas,cmt-48-gen2";
                 reg = <0 0xffca0000 0 0x1004>;
                 interrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>,
                              <0 143 IRQ_TYPE_LEVEL_HIGH>;
@@ -220,7 +220,7 @@
         };
 
         cmt1: timer@e6130000 {
-                compatible = "renesas,cmt-48-gen2";
+                compatible = "renesas,cmt-48-r8a7790", "renesas,cmt-48-gen2";
                 reg = <0 0xe6130000 0 0x1004>;
                 interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>,
                              <0 121 IRQ_TYPE_LEVEL_HIGH>,
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index bdb9ac1509f8..e270f38d827f 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -190,7 +190,7 @@
         };
 
         cmt0: timer@ffca0000 {
-                compatible = "renesas,cmt-48-gen2";
+                compatible = "renesas,cmt-48-r8a7791", "renesas,cmt-48-gen2";
                 reg = <0 0xffca0000 0 0x1004>;
                 interrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>,
                              <0 143 IRQ_TYPE_LEVEL_HIGH>;
@@ -203,7 +203,7 @@
         };
 
         cmt1: timer@e6130000 {
-                compatible = "renesas,cmt-48-gen2";
+                compatible = "renesas,cmt-48-r8a7791", "renesas,cmt-48-gen2";
                 reg = <0 0xe6130000 0 0x1004>;
                 interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>,
                              <0 121 IRQ_TYPE_LEVEL_HIGH>,
diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
index 18662aec2ec4..99659db97e89 100644
--- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
@@ -173,6 +173,10 @@
         };
 };
 
+&cmt1 {
+        status = "ok";
+};
+
 &i2c0 {
         status = "okay";
         as3711@40 {
diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi
index 175729e59170..d7f52cf31350 100644
--- a/arch/arm/boot/dts/sh73a0.dtsi
+++ b/arch/arm/boot/dts/sh73a0.dtsi
@@ -47,6 +47,16 @@
                              <0 56 IRQ_TYPE_LEVEL_HIGH>;
         };
 
+        cmt1: timer@e6138000 {
+                compatible = "renesas,cmt-48-sh73a0", "renesas,cmt-48";
+                reg = <0xe6138000 0x200>;
+                interrupts = <0 65 IRQ_TYPE_LEVEL_HIGH>;
+
+                renesas,channels-mask = <0x3f>;
+
+                status = "disabled";
+        };
+
         irqpin0: irqpin@e6900000 {
                 compatible = "renesas,intc-irqpin-sh73a0", "renesas,intc-irqpin";
                 #interrupt-cells = <2>;
diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index 00853053f5b6..b7bd8e509668 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -697,10 +697,6 @@ static struct platform_device irqpin3_device = {
         },
 };
 
-static struct platform_device *sh73a0_devices_dt[] __initdata = {
-        &cmt1_device,
-};
-
 static struct platform_device *sh73a0_early_devices[] __initdata = {
         &scif0_device,
         &scif1_device,
@@ -713,6 +709,7 @@ static struct platform_device *sh73a0_early_devices[] __initdata = {
         &scif8_device,
         &tmu0_device,
         &ipmmu_device,
+        &cmt1_device,
 };
 
 static struct platform_device *sh73a0_late_devices[] __initdata = {
@@ -737,8 +734,6 @@ void __init sh73a0_add_standard_devices(void)
         /* Clear software reset bit on SY-DMAC module */
         __raw_writel(__raw_readl(SRCR2) & ~(1 << 18), SRCR2);
 
-        platform_add_devices(sh73a0_devices_dt,
-                            ARRAY_SIZE(sh73a0_devices_dt));
         platform_add_devices(sh73a0_early_devices,
                             ARRAY_SIZE(sh73a0_early_devices));
         platform_add_devices(sh73a0_late_devices,
@@ -763,8 +758,6 @@ void __init sh73a0_earlytimer_init(void)
 
 void __init sh73a0_add_early_devices(void)
 {
-        early_platform_add_devices(sh73a0_devices_dt,
-                                   ARRAY_SIZE(sh73a0_devices_dt));
         early_platform_add_devices(sh73a0_early_devices,
                                    ARRAY_SIZE(sh73a0_early_devices));
 
@@ -779,8 +772,6 @@ void __init sh73a0_add_standard_devices_dt(void)
         /* clocks are setup late during boot in the case of DT */
         sh73a0_clock_init();
 
-        platform_add_devices(sh73a0_devices_dt,
-                             ARRAY_SIZE(sh73a0_devices_dt));
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }