ARM: dts: Configure system timers for ti81xx

We can now init system timers using the dmtimer and 32k counter
based on only devicetree data and drivers/clocksource timers.
Let's configure the clocksource and clockevent, and drop the old
unused platform data.

As we're just dropping platform data, and the early platform data
init is based on the custom ti,hwmods property, we want to drop
both the platform data and ti,hwmods property in a single patch.

Since the dmtimer can use both 32k clock and system clock as the
source, let's also configure the SoC specific default values. The
board specific dts files can reconfigure these with assigned-clocks
and assigned-clock-parents as needed.

Note that for ti81xx, also timer1 is of type 2 unlike on am335x
where timer1 is type1 while the rest of the timers are type 2.

Cc: devicetree@vger.kernel.org
Cc: Brian Hutchinson <b.hutchman@gmail.com>
Cc: Graeme Smecher <gsmecher@threespeedlogic.com>
Cc: Grygorii Strashko <grygorii.strashko@ti.com>
Cc: Keerthy <j-keerthy@ti.com>
Cc: Lokesh Vutla <lokeshvutla@ti.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/dm814x.dtsi b/arch/arm/boot/dts/dm814x.dtsi
index 44ed5a79816453e81a47eeacdc13ec7b80bd666d..a172cf5cf29cb28bdba683e422503fab2fae20d8 100644 (file)
--- a/arch/arm/boot/dts/dm814x.dtsi
+++ b/arch/arm/boot/dts/dm814x.dtsi
@@ -308,14 +308,30 @@
                                ti,hwmods = "mcspi4";
                        };
 
-                       timer1: timer@2e000 {
-                               compatible = "ti,dm814-timer";
-                               reg = <0x2e000 0x2000>;
-                               interrupts = <67>;
-                               ti,hwmods = "timer1";
-                               ti,timer-alwon;
+                       timer1_target: target-module@2e000 {
+                               compatible = "ti,sysc-omap4-timer", "ti,sysc";
+                               reg = <0x2e000 0x4>,
+                                     <0x2e010 0x4>;
+                               reg-names = "rev", "sysc";
+                               ti,sysc-mask = <SYSC_OMAP4_SOFTRESET>;
+                               ti,sysc-sidle = <SYSC_IDLE_FORCE>,
+                                               <SYSC_IDLE_NO>,
+                                               <SYSC_IDLE_SMART>,
+                                               <SYSC_IDLE_SMART_WKUP>;
                                clocks = <&timer1_fck>;
                                clock-names = "fck";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+                               ranges = <0x0 0x2e000 0x1000>;
+
+                               timer1: timer@0 {
+                                       compatible = "ti,am335x-timer-1ms";
+                                       reg = <0x0 0x400>;
+                                       interrupts = <67>;
+                                       ti,timer-alwon;
+                                       clocks = <&timer1_fck>;
+                                       clock-names = "fck";
+                               };
                        };
 
                        uart1: uart@20000 {
@@ -348,13 +364,29 @@
                                dma-names = "tx", "rx";
                        };
 
-                       timer2: timer@40000 {
-                               compatible = "ti,dm814-timer";
-                               reg = <0x40000 0x2000>;
-                               interrupts = <68>;
-                               ti,hwmods = "timer2";
+                       timer2_target: target-module@40000 {
+                               compatible = "ti,sysc-omap4-timer", "ti,sysc";
+                               reg = <0x40000 0x4>,
+                                     <0x40010 0x4>;
+                               reg-names = "rev", "sysc";
+                               ti,sysc-mask = <SYSC_OMAP4_SOFTRESET>;
+                               ti,sysc-sidle = <SYSC_IDLE_FORCE>,
+                                               <SYSC_IDLE_NO>,
+                                               <SYSC_IDLE_SMART>,
+                                               <SYSC_IDLE_SMART_WKUP>;
                                clocks = <&timer2_fck>;
                                clock-names = "fck";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+                               ranges = <0x0 0x40000 0x1000>;
+
+                               timer2: timer@0 {
+                                       compatible = "ti,dm814-timer";
+                                       reg = <0 0x1000>;
+                                       interrupts = <68>;
+                                       clocks = <&timer2_fck>;
+                                       clock-names = "fck";
+                               };
                        };
 
                        timer3: timer@42000 {
@@ -735,3 +767,23 @@
 };
 
 #include "dm814x-clocks.dtsi"
+
+/* Preferred always-on timer for clocksource */
+&timer1_target {
+       ti,no-reset-on-init;
+       ti,no-idle;
+       timer@0 {
+               assigned-clocks = <&timer1_fck>;
+               assigned-clock-parents = <&devosc_ck>;
+       };
+};
+
+/* Preferred timer for clockevent */
+&timer2_target {
+       ti,no-reset-on-init;
+       ti,no-idle;
+       timer@0 {
+               assigned-clocks = <&timer2_fck>;
+               assigned-clock-parents = <&devosc_ck>;
+       };
+};

diff --git a/arch/arm/boot/dts/dm816x.dtsi b/arch/arm/boot/dts/dm816x.dtsi
index 2a4934b60ded20b79774b7b5232a9938e4d54844..3551a64963f8d456541724213c00a821464cbad8 100644 (file)
--- a/arch/arm/boot/dts/dm816x.dtsi
+++ b/arch/arm/boot/dts/dm816x.dtsi
@@ -440,23 +440,55 @@
                        dma-names = "tx", "rx";
                };
 
-               timer1: timer@4802e000 {
-                       compatible = "ti,dm816-timer";
-                       reg = <0x4802e000 0x2000>;
-                       interrupts = <67>;
-                       ti,hwmods = "timer1";
-                       ti,timer-alwon;
-                       clocks = <&timer1_fck>;
+               timer1_target: target-module@4802e000 {
+                       compatible = "ti,sysc-omap4-timer", "ti,sysc";
+                       reg = <0x4802e000 0x4>,
+                             <0x4802e010 0x4>;
+                       reg-names = "rev", "sysc";
+                       ti,sysc-mask = <SYSC_OMAP4_SOFTRESET>;
+                       ti,sysc-sidle = <SYSC_IDLE_FORCE>,
+                                       <SYSC_IDLE_NO>,
+                                       <SYSC_IDLE_SMART>,
+                                       <SYSC_IDLE_SMART_WKUP>;
+                       clocks = <&alwon_clkctrl DM816_TIMER1_CLKCTRL 0>;
                        clock-names = "fck";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0x0 0x4802e000 0x1000>;
+
+                       timer1: timer@0 {
+                               compatible = "ti,dm816-timer";
+                               reg = <0 0x1000>;
+                               interrupts = <67>;
+                               ti,timer-alwon;
+                               clocks = <&alwon_clkctrl DM816_TIMER1_CLKCTRL 0>;
+                               clock-names = "fck";
+                       };
                };
 
-               timer2: timer@48040000 {
-                       compatible = "ti,dm816-timer";
-                       reg = <0x48040000 0x2000>;
-                       interrupts = <68>;
-                       ti,hwmods = "timer2";
-                       clocks = <&timer2_fck>;
+               timer2_target: target-module@48040000 {
+                       compatible = "ti,sysc-omap4-timer", "ti,sysc";
+                       reg = <0x48040000 0x4>,
+                             <0x48040010 0x4>;
+                       reg-names = "rev", "sysc";
+                       ti,sysc-mask = <SYSC_OMAP4_SOFTRESET>;
+                       ti,sysc-sidle = <SYSC_IDLE_FORCE>,
+                                       <SYSC_IDLE_NO>,
+                                       <SYSC_IDLE_SMART>,
+                                       <SYSC_IDLE_SMART_WKUP>;
+                       clocks = <&alwon_clkctrl DM816_TIMER2_CLKCTRL 0>;
                        clock-names = "fck";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0x0 0x48040000 0x1000>;
+
+                       timer2: timer@0 {
+                               compatible = "ti,dm816-timer";
+                               reg = <0 0x1000>;
+                               interrupts = <68>;
+                               clocks = <&alwon_clkctrl DM816_TIMER2_CLKCTRL 0>;
+                               clock-names = "fck";
+                       };
                };
 
                timer3: timer@48042000 {
@@ -642,3 +674,23 @@
 };
 
 #include "dm816x-clocks.dtsi"
+
+/* Preferred always-on timer for clocksource */
+&timer1_target {
+       ti,no-reset-on-init;
+       ti,no-idle;
+       timer@0 {
+               assigned-clocks = <&timer1_fck>;
+               assigned-clock-parents = <&sys_clkin_ck>;
+       };
+};
+
+/* Preferred timer for clockevent */
+&timer2_target {
+       ti,no-reset-on-init;
+       ti,no-idle;
+       timer@0 {
+               assigned-clocks = <&timer2_fck>;
+               assigned-clock-parents = <&sys_clkin_ck>;
+       };
+};

diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index a10a74e95385888bc65f663ba95facac904a064a..eeb3f97af5209f0fa73e6d36a10058d80ebb5f96 100644 (file)
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -201,7 +201,7 @@ DT_MACHINE_START(TI814X_DT, "Generic ti814x (Flattened Device Tree)")
        .init_early     = ti814x_init_early,
        .init_machine   = omap_generic_init,
        .init_late      = ti81xx_init_late,
-       .init_time      = omap3_gptimer_timer_init,
+       .init_time      = omap_init_time_of,
        .dt_compat      = ti814x_boards_compat,
        .restart        = ti81xx_restart,
 MACHINE_END
@@ -218,7 +218,7 @@ DT_MACHINE_START(TI816X_DT, "Generic ti816x (Flattened Device Tree)")
        .init_early     = ti816x_init_early,
        .init_machine   = omap_generic_init,
        .init_late      = ti81xx_init_late,
-       .init_time      = omap3_gptimer_timer_init,
+       .init_time      = omap_init_time_of,
        .dt_compat      = ti816x_boards_compat,
        .restart        = ti81xx_restart,
 MACHINE_END

diff --git a/arch/arm/mach-omap2/omap_hwmod_81xx_data.c b/arch/arm/mach-omap2/omap_hwmod_81xx_data.c
index 6a9f1ad9d413050ebd4630c699e13803ece3abbf..50fb699b163ff1df5e1aaa4577134df4818e40cd 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_81xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_81xx_data.c
@@ -690,76 +690,6 @@ static struct omap_hwmod_class dm816x_timer_hwmod_class = {
        .sysc = &dm816x_timer_sysc,
 };
 
-static struct omap_hwmod dm814x_timer1_hwmod = {
-       .name           = "timer1",
-       .clkdm_name     = "alwon_l3s_clkdm",
-       .main_clk       = "timer1_fck",
-       .class          = &dm816x_timer_hwmod_class,
-       .flags          = HWMOD_NO_IDLEST,
-};
-
-static struct omap_hwmod_ocp_if dm814x_l4_ls__timer1 = {
-       .master         = &dm81xx_l4_ls_hwmod,
-       .slave          = &dm814x_timer1_hwmod,
-       .clk            = "sysclk6_ck",
-       .user           = OCP_USER_MPU,
-};
-
-static struct omap_hwmod dm816x_timer1_hwmod = {
-       .name           = "timer1",
-       .clkdm_name     = "alwon_l3s_clkdm",
-       .main_clk       = "timer1_fck",
-       .prcm           = {
-               .omap4 = {
-                       .clkctrl_offs = DM816X_CM_ALWON_TIMER_1_CLKCTRL,
-                       .modulemode = MODULEMODE_SWCTRL,
-               },
-       },
-       .class          = &dm816x_timer_hwmod_class,
-};
-
-static struct omap_hwmod_ocp_if dm816x_l4_ls__timer1 = {
-       .master         = &dm81xx_l4_ls_hwmod,
-       .slave          = &dm816x_timer1_hwmod,
-       .clk            = "sysclk6_ck",
-       .user           = OCP_USER_MPU,
-};
-
-static struct omap_hwmod dm814x_timer2_hwmod = {
-       .name           = "timer2",
-       .clkdm_name     = "alwon_l3s_clkdm",
-       .main_clk       = "timer2_fck",
-       .class          = &dm816x_timer_hwmod_class,
-       .flags          = HWMOD_NO_IDLEST,
-};
-
-static struct omap_hwmod_ocp_if dm814x_l4_ls__timer2 = {
-       .master         = &dm81xx_l4_ls_hwmod,
-       .slave          = &dm814x_timer2_hwmod,
-       .clk            = "sysclk6_ck",
-       .user           = OCP_USER_MPU,
-};
-
-static struct omap_hwmod dm816x_timer2_hwmod = {
-       .name           = "timer2",
-       .clkdm_name     = "alwon_l3s_clkdm",
-       .main_clk       = "timer2_fck",
-       .prcm           = {
-               .omap4 = {
-                       .clkctrl_offs = DM816X_CM_ALWON_TIMER_2_CLKCTRL,
-                       .modulemode = MODULEMODE_SWCTRL,
-               },
-       },
-       .class          = &dm816x_timer_hwmod_class,
-};
-
-static struct omap_hwmod_ocp_if dm816x_l4_ls__timer2 = {
-       .master         = &dm81xx_l4_ls_hwmod,
-       .slave          = &dm816x_timer2_hwmod,
-       .clk            = "sysclk6_ck",
-       .user           = OCP_USER_MPU,
-};
-
 static struct omap_hwmod dm816x_timer3_hwmod = {
        .name           = "timer3",
        .clkdm_name     = "alwon_l3s_clkdm",
@@ -1288,8 +1218,6 @@ static struct omap_hwmod_ocp_if *dm814x_hwmod_ocp_ifs[] __initdata = {
        &dm814x_l4_ls__mmc1,
        &dm814x_l4_ls__mmc2,
        &ti81xx_l4_ls__rtc,
-       &dm814x_l4_ls__timer1,
-       &dm814x_l4_ls__timer2,
        &dm81xx_alwon_l3_slow__gpmc,
        &dm814x_default_l3_slow__usbss,
        &dm814x_alwon_l3_med__mmc3,
@@ -1318,8 +1246,6 @@ static struct omap_hwmod_ocp_if *dm816x_hwmod_ocp_ifs[] __initdata = {
        &dm81xx_l4_ls__elm,
        &ti81xx_l4_ls__rtc,
        &dm816x_l4_ls__mmc1,
-       &dm816x_l4_ls__timer1,
-       &dm816x_l4_ls__timer2,
        &dm816x_l4_ls__timer3,
        &dm816x_l4_ls__timer4,
        &dm816x_l4_ls__timer5,