OMAP2PLUS: WDT: Implement WDT in HWMOD way
Subsystems (5)
v2 cover OMAP2PLUS: WDT: Implement WDT in HWMOD way
This patch series makes OMAP2PLUS Watchdog Timer Module implemented in HWMOD FW way. It also implements OMAP2/3 Watchdog timer driver to use the runtime PM layer.
This patch series is created on "origin/pm-wip/hwmods-omap4".
This patch series is tested on OMAP3430 SDP and OMAP4430 SDP. It would be of great help if someone could test the same on OMAP1 and OMAP2 boards.
Version History:
---------------
Version v2:
Rebase to latest kernel
Version v1:
Some of the v1 links:
http://www.spinics.net/lists/linux-omap/msg30628.html
http://www.spinics.net/lists/linux-omap/msg30625.html
Charulatha V (6):
OMAP2PLUS: WDT: Add ICLKEN, FCLKEN, WKEN shared bits for WDT
OMAP3: WDT: Add watchdog timer HWMOD data for OMAP3
OMAP2420: WDT: Add watchdog timer HWMOD data for OMAP2420
OMAP2430: WDT: Add watchdog timer HWMOD data for OMAP2430
OMAP4: WDT: Enable watchdog timer2 hwmod structure
OMAP2PLUS: WDT: Conversion to runtime PM
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 59 +++++++++++++++++++++++++++ arch/arm/mach-omap2/omap_hwmod_2430_data.c | 59 +++++++++++++++++++++++++++ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 61 ++++++++++++++++++++++++++++ arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +- arch/arm/mach-omap2/prcm-common.h | 4 ++ arch/arm/plat-omap/devices.c | 52 +++++++++++++++++------ drivers/watchdog/omap_wdt.c | 43 ++++---------------- 7 files changed, 230 insertions(+), 50 deletions(-)
PATCH v2 1/6 OMAP2PLUS: WDT: Add ICLKEN, FCLKEN, WKEN shared bits for WDT
This patch adds the CM_FCLKEN_WKUP, CM_ICLKEN_WKUP, PM_WKEN_WKUP shared bits for OMAP2PLUS watchdog timer module
--- arch/arm/mach-omap2/prcm-common.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/prcm-common.h +4 -0
@@ -237,6 +237,8 @@#define OMAP24XX_ST_USB_MASK (1 << 0)/* CM_FCLKEN_WKUP, CM_ICLKEN_WKUP, PM_WKEN_WKUP shared bits */ +#define OMAP24XX_EN_WDT2_SHIFT 3 +#define OMAP24XX_EN_WDT2_MASK (1 << 3)#define OMAP24XX_EN_GPIOS_SHIFT 2#define OMAP24XX_EN_GPIOS_MASK (1 << 2)#define OMAP24XX_EN_GPT1_SHIFT 0
@@ -344,6 +346,8 @@#define OMAP3430_ST_D2D_MASK (1 << 3)/* CM_FCLKEN_WKUP, CM_ICLKEN_WKUP, PM_WKEN_WKUP shared bits */ +#define OMAP3430_EN_WDT2_SHIFT 5 +#define OMAP3430_EN_WDT2_MASK (1 << 5)#define OMAP3430_EN_GPIO1_MASK (1 << 3)#define OMAP3430_EN_GPIO1_SHIFT 3#define OMAP3430_EN_GPT12_MASK (1 << 1)
Signature · 1 line
1.6.3.3
PATCH v2 2/6 OMAP3: WDT: Add watchdog timer HWMOD data for OMAP3
Add hwmod structures for Watchdog module on OMAP3
--- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 61 ++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +61 -0
@@ -36,6 +36,7 @@ static struct omap_hwmod omap3xxx_iva_hwmod;static struct omap_hwmod omap3xxx_l3_main_hwmod;static struct omap_hwmod omap3xxx_l4_core_hwmod;static struct omap_hwmod omap3xxx_l4_per_hwmod; +static struct omap_hwmod omap3xxx_wd_timer2_hwmod;/* L3 -> L4_CORE interface */ static struct omap_hwmod_ocp_if omap3xxx_l3_main__l4_core = {
@@ -197,6 +198,65 @@ static struct omap_hwmod omap3xxx_iva_hwmod = { .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430) }; +/* WDTIMER2 <- L4_WKUP interface */ +static struct omap_hwmod_addr_space omap3xxx_wd_timer2_addrs[] = { + { + .pa_start =0x48314000 , + .pa_end =0x48314000 +SZ_4K -1 , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap3xxx_l4_wkup__wd_timer2 = { + .master = &omap3xxx_l4_wkup_hwmod, + .slave = &omap3xxx_wd_timer2_hwmod, + .clk ="wdt2_ick" , + .addr = omap3xxx_wd_timer2_addrs, + .addr_cnt =ARRAY_SIZE (omap3xxx_wd_timer2_addrs), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* WDTIMER common */ + +static struct omap_hwmod_class_sysconfig omap3xxx_wd_timer_sysc = { + .rev_offs =0x0000 , + .sysc_offs =0x0010 , + .syss_offs =0x0014 , + .sysc_flags = (SYSC_HAS_SIDLEMODE |SYSC_HAS_EMUFREE | +SYSC_HAS_ENAWAKEUP |SYSC_HAS_SOFTRESET | +SYSC_HAS_AUTOIDLE |SYSC_HAS_CLOCKACTIVITY ), + .idlemodes = (SIDLE_FORCE |SIDLE_NO |SIDLE_SMART ), + .sysc_fields = &omap_hwmod_sysc_type1, +}; + +static struct omap_hwmod_class omap3xxx_wd_timer_hwmod_class = { + .name ="wd_timer" , + .sysc = &omap3xxx_wd_timer_sysc, +}; + +/* WDTIMER2 */ +static struct omap_hwmod_ocp_if *omap3xxx_wd_timer2_slaves[] = { + &omap3xxx_l4_wkup__wd_timer2, +}; + +static struct omap_hwmod omap3xxx_wd_timer2_hwmod = { + .name ="wd_timer2" , + .class = &omap3xxx_wd_timer_hwmod_class, + .main_clk ="wdt2_fck" , + .prcm = { + .omap2 = { + .prcm_reg_id =1 , + .module_bit =OMAP3430_EN_WDT2_SHIFT , + .module_offs =WKUP_MOD , + .idlest_reg_id =1 , + .idlest_idle_bit =OMAP3430_EN_WDT2_SHIFT , + }, + }, + .slaves = omap3xxx_wd_timer2_slaves, + .slaves_cnt =ARRAY_SIZE (omap3xxx_wd_timer2_slaves), + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP3430 ), +}; +static __initdata struct omap_hwmod *omap3xxx_hwmods[] = { &omap3xxx_l3_main_hwmod, &omap3xxx_l4_core_hwmod,
@@ -204,6 +264,7 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = { &omap3xxx_l4_wkup_hwmod, &omap3xxx_mpu_hwmod, &omap3xxx_iva_hwmod, + &omap3xxx_wd_timer2_hwmod, NULL, };
Signature · 1 line
1.6.3.3
PATCH v2 3/6 OMAP2420: WDT: Add watchdog timer HWMOD data for OMAP2420
Add hwmod structures for Watchdog module on OMAP2420
--- arch/arm/mach-omap2/omap_hwmod_2420_data.c | 59 ++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/omap_hwmod_2420_data.c +59 -0
@@ -33,6 +33,7 @@ static struct omap_hwmod omap2420_mpu_hwmod;static struct omap_hwmod omap2420_iva_hwmod;static struct omap_hwmod omap2420_l3_main_hwmod;static struct omap_hwmod omap2420_l4_core_hwmod; +static struct omap_hwmod omap2420_wd_timer2_hwmod;/* L3 -> L4_CORE interface */ static struct omap_hwmod_ocp_if omap2420_l3_main__l4_core = {
@@ -165,12 +166,70 @@ static struct omap_hwmod omap2420_iva_hwmod = { .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) }; +/* WDTIMER2 <- L4_WKUP interface */ +static struct omap_hwmod_addr_space omap2420_wd_timer2_addrs[] = { + { + .pa_start =0x48022000 , + .pa_end =0x48022000 +SZ_4K -1 , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap2420_l4_wkup__wd_timer2 = { + .master = &omap2420_l4_wkup_hwmod, + .slave = &omap2420_wd_timer2_hwmod, + .clk ="mpu_wdt_ick" , + .addr = omap2420_wd_timer2_addrs, + .addr_cnt =ARRAY_SIZE (omap2420_wd_timer2_addrs), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* WDTIMER common */ + +static struct omap_hwmod_class_sysconfig omap2420_wd_timer_sysc = { + .rev_offs =0x0000 , + .sysc_offs =0x0010 , + .syss_offs =0x0014 , + .sysc_flags = (SYSC_HAS_EMUFREE |SYSC_HAS_SOFTRESET | +SYSC_HAS_AUTOIDLE ), + .sysc_fields = &omap_hwmod_sysc_type1, +}; + +static struct omap_hwmod_class omap2420_wd_timer_hwmod_class = { + .name ="wd_timer" , + .sysc = &omap2420_wd_timer_sysc, +}; + +/* WDTIMER2 */ +static struct omap_hwmod_ocp_if *omap2420_wd_timer2_slaves[] = { + &omap2420_l4_wkup__wd_timer2, +}; + +static struct omap_hwmod omap2420_wd_timer2_hwmod = { + .name ="wd_timer2" , + .class = &omap2420_wd_timer_hwmod_class, + .main_clk ="mpu_wdt_fck" , + .prcm = { + .omap2 = { + .prcm_reg_id =1 , + .module_bit =OMAP24XX_EN_WDT2_SHIFT , + .module_offs =WKUP_MOD , + .idlest_reg_id =1 , + .idlest_idle_bit =OMAP24XX_EN_WDT2_SHIFT , + }, + }, + .slaves = omap2420_wd_timer2_slaves, + .slaves_cnt =ARRAY_SIZE (omap2420_wd_timer2_slaves), + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP2420 ), +}; +static __initdata struct omap_hwmod *omap2420_hwmods[] = { &omap2420_l3_main_hwmod, &omap2420_l4_core_hwmod, &omap2420_l4_wkup_hwmod, &omap2420_mpu_hwmod, &omap2420_iva_hwmod, + &omap2420_wd_timer2_hwmod,NULL , };
Signature · 1 line
1.6.3.3
PATCH v2 4/6 OMAP2430: WDT: Add watchdog timer HWMOD data for OMAP2430
Add hwmod structures for Watchdog module on OMAP2430
--- arch/arm/mach-omap2/omap_hwmod_2430_data.c | 59 ++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/omap_hwmod_2430_data.c +59 -0
@@ -33,6 +33,7 @@ static struct omap_hwmod omap2430_mpu_hwmod;static struct omap_hwmod omap2430_iva_hwmod;static struct omap_hwmod omap2430_l3_main_hwmod;static struct omap_hwmod omap2430_l4_core_hwmod; +static struct omap_hwmod omap2430_wd_timer2_hwmod;/* L3 -> L4_CORE interface */ static struct omap_hwmod_ocp_if omap2430_l3_main__l4_core = {
@@ -165,12 +166,70 @@ static struct omap_hwmod omap2430_iva_hwmod = { .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430) }; +/* WDTIMER2 <- L4_WKUP interface */ +static struct omap_hwmod_addr_space omap2430_wd_timer2_addrs[] = { + { + .pa_start =0x49016000 , + .pa_end =0x49016000 +SZ_4K -1 , + .flags =ADDR_TYPE_RT + }, +}; + +static struct omap_hwmod_ocp_if omap2430_l4_wkup__wd_timer2 = { + .master = &omap2430_l4_wkup_hwmod, + .slave = &omap2430_wd_timer2_hwmod, + .clk ="mpu_wdt_ick" , + .addr = omap2430_wd_timer2_addrs, + .addr_cnt =ARRAY_SIZE (omap2430_wd_timer2_addrs), + .user =OCP_USER_MPU |OCP_USER_SDMA , +}; + +/* WDTIMER common */ + +static struct omap_hwmod_class_sysconfig omap2430_wd_timer_sysc = { + .rev_offs =0x0 , + .sysc_offs =0x0010 , + .syss_offs =0x0014 , + .sysc_flags = (SYSC_HAS_EMUFREE |SYSC_HAS_SOFTRESET | +SYSC_HAS_AUTOIDLE ), + .sysc_fields = &omap_hwmod_sysc_type1, +}; + +static struct omap_hwmod_class omap2430_wd_timer_hwmod_class = { + .name ="wd_timer" , + .sysc = &omap2430_wd_timer_sysc, +}; + +/* WDTIMER2 */ +static struct omap_hwmod_ocp_if *omap2430_wd_timer2_slaves[] = { + &omap2430_l4_wkup__wd_timer2, +}; + +static struct omap_hwmod omap2430_wd_timer2_hwmod = { + .name ="wd_timer2" , + .class = &omap2430_wd_timer_hwmod_class, + .main_clk ="mpu_wdt_fck" , + .prcm = { + .omap2 = { + .prcm_reg_id =1 , + .module_bit =OMAP24XX_EN_WDT2_SHIFT , + .module_offs =WKUP_MOD , + .idlest_reg_id =1 , + .idlest_idle_bit =OMAP24XX_EN_WDT2_SHIFT , + }, + }, + .slaves = omap2430_wd_timer2_slaves, + .slaves_cnt =ARRAY_SIZE (omap2430_wd_timer2_slaves), + .omap_chip =OMAP_CHIP_INIT (CHIP_IS_OMAP2430 ), +}; +static __initdata struct omap_hwmod *omap2430_hwmods[] = { &omap2430_l3_main_hwmod, &omap2430_l4_core_hwmod, &omap2430_l4_wkup_hwmod, &omap2430_mpu_hwmod, &omap2430_iva_hwmod, + &omap2430_wd_timer2_hwmod,NULL , };
Signature · 1 line
1.6.3.3
PATCH v2 5/6 OMAP4: WDT: Enable watchdog timer2 hwmod structure
This patch enables the watchdog timer2 hwmod structure
--- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +1 -1
@@ -5789,7 +5789,7 @@ static __initdata struct omap_hwmod *omap44xx_hwmods[] = {/* usb_tll_hs class */ /* &omap44xx_usb_tll_hs_hwmod, */ /* wd_timer class */ -/* &omap44xx_wd_timer2_hwmod, */ + &omap44xx_wd_timer2_hwmod,/* &omap44xx_wd_timer3_hwmod, */ NULL, };
Signature · 1 line
1.6.3.3
PATCH v2 6/6 OMAP2PLUS: WDT: Conversion to runtime PM
This patch converts the OMAP Watchdog timer driver to get adapted to HWMOD FW and to use the runtime PM APIs.
--- arch/arm/plat-omap/devices.c | 52 ++++++++++++++++++++++++++++++----------- drivers/watchdog/omap_wdt.c | 43 ++++++---------------------------- 2 files changed, 46 insertions(+), 49 deletions(-)
arch/arm/plat-omap/devices.c +38 -14
@@ -15,6 +15,7 @@#include <linux/platform_device.h> #include <linux/io.h> #include <linux/slab.h> +#include <linux/err.h> #include <mach/hardware.h> #include <asm/mach-types.h>
@@ -28,6 +29,8 @@#include <plat/menelaus.h> #include <plat/mcbsp.h> #include <plat/omap44xx.h> +#include <plat/omap_hwmod.h> +#include <plat/omap_device.h> /*-------------------------------------------------------------------------*/
@@ -238,6 +241,8 @@ static inline void omap_init_uwire(void) {}static struct resource wdt_resources[] = { { + .start =0xfffeb000 , + .end =0xfffeb07F , .flags =IORESOURCE_MEM , }, };
@@ -249,24 +254,43 @@ static struct platform_device omap_wdt_device = { .resource = wdt_resources, }; -static void omap_init_wdt (void ) +struct omap_device_pm_latency omap_wdt_latency[] = { + [0 ] = { + .deactivate_func = omap_device_idle_hwmods, + .activate_func = omap_device_enable_hwmods, + .flags =OMAP_DEVICE_LATENCY_AUTO_ADJUST , + }, +}; + +static void omap2_init_wdt () { -if (cpu_is_omap16xx ()) - wdt_resources[0 ].start =0xfffeb000 ; -else if (cpu_is_omap2420 ()) - wdt_resources[0 ].start =0x48022000 ;/* WDT2 */ -else if (cpu_is_omap2430 ()) - wdt_resources[0 ].start =0x49016000 ;/* WDT2 */ -else if (cpu_is_omap343x ()) - wdt_resources[0 ].start =0x48314000 ;/* WDT2 */ -else if (cpu_is_omap44xx ()) - wdt_resources[0 ].start =0x4a314000 ; -else +int id =-1 ; +struct omap_device *od; +struct omap_hwmod *oh; +char *oh_name ="wd_timer2" ; +char *name ="omap_wdt" ; + + oh =omap_hwmod_lookup (oh_name); +if (!oh) { +pr_err ("Could not look up %s\n" , oh_name);return ; + } - wdt_resources[0 ].end = wdt_resources[0 ].start +0x4f ; + od =omap_device_build (name, id, oh,NULL ,0 , + omap_wdt_latency, +ARRAY_SIZE (omap_wdt_latency),0 ); +WARN (IS_ERR (od),"Cant build omap_device for %s:%s.\n" , + name, oh->name); +return 0 ; +} - (void )platform_device_register (&omap_wdt_device); +static void omap_init_wdt (void ) +{ +if (cpu_class_is_omap2 ()) +omap2_init_wdt (); +else if (cpu_is_omap16xx ()) + (void )platform_device_register (&omap_wdt_device); +return ; }#else static inline void omap_init_wdt (void ) {}
drivers/watchdog/omap_wdt.c +8 -35
103 lines not on this page · raw message
Signature · 1 line
1.6.3.3
Re: [PATCH 6/6 v2] OMAP2PLUS: WDT: Conversion to runtime PM
Quoted 5 lines · Charulatha V
This patch converts the OMAP Watchdog timer driver to get adapted to HWMOD FW and to use the runtime PM APIs.
Signed-off-by Charulatha V <[email protected]>Signed-off-by Basak, Partha <[email protected]>
This series looks good. One minor comment below...
Quoted 27 lines
--- arch/arm/plat-omap/devices.c | 52 ++++++++++++++++++++++++++++++----------- drivers/watchdog/omap_wdt.c | 43 ++++++---------------------------- 2 files changed, 46 insertions(+), 49 deletions(-)arch/arm/plat-omap/devices.c +3
-0@@ -15,6 +15,7 @@#include <linux/platform_device.h> #include <linux/io.h> #include <linux/slab.h> +#include <linux/err.h> #include <mach/hardware.h> #include <asm/mach-types.h> @@ -28,6 +29,8 @@#include <plat/menelaus.h> #include <plat/mcbsp.h> #include <plat/omap44xx.h> +#include <plat/omap_hwmod.h> +#include <plat/omap_device.h> /*-------------------------------------------------------------------------*/
arch/arm/plat-omap/devices.c static inline void omap_init_uwire(void) {} · line 248
Quoted 8 lines
arch/arm/plat-omap/devices.c +2
-0@@ -238,6 +241,8 @@ static inline void omap_init_uwire(void) {}static struct resource wdt_resources[] = { { + .start =0xfffeb000 , + .end =0xfffeb07F , .flags =IORESOURCE_MEM , }, };
This struct should probably be renamed with an omap1_ prefix.
arch/arm/plat-omap/devices.c static struct platform_device omap_wdt_device = { · line 255
Quoted 3 lines
arch/arm/plat-omap/devices.c +0
-0@@ -249,24 +254,43 @@ static struct platform_device omap_wdt_device = { .resource = wdt_resources, };
ditto
and they should be moved down just above omap_init_wdt()
Quoted 23 lines
arch/arm/plat-omap/devices.c +10
-12-static void omap_init_wdt (void ) +struct omap_device_pm_latency omap_wdt_latency[] = { + [0 ] = { + .deactivate_func = omap_device_idle_hwmods, + .activate_func = omap_device_enable_hwmods, + .flags =OMAP_DEVICE_LATENCY_AUTO_ADJUST , + }, +}; + +static void omap2_init_wdt () { -if (cpu_is_omap16xx ()) - wdt_resources[0 ].start =0xfffeb000 ; -else if (cpu_is_omap2420 ()) - wdt_resources[0 ].start =0x48022000 ;/* WDT2 */ -else if (cpu_is_omap2430 ()) - wdt_resources[0 ].start =0x49016000 ;/* WDT2 */ -else if (cpu_is_omap343x ()) - wdt_resources[0 ].start =0x48314000 ;/* WDT2 */ -else if (cpu_is_omap44xx ()) - wdt_resources[0 ].start =0x4a314000 ; -else +int id =-1 ;
arch/arm/plat-omap/devices.c static struct platform_device omap_wdt_device = { · line 277
Quoted 10 lines
arch/arm/plat-omap/devices.c +9
-0+struct omap_device *od; +struct omap_hwmod *oh; +char *oh_name ="wd_timer2" ; +char *name ="omap_wdt" ; + + oh =omap_hwmod_lookup (oh_name); +if (!oh) { +pr_err ("Could not look up %s\n" , oh_name);return ; + }
Kevin
RE: [PATCH 6/6 v2] OMAP2PLUS: WDT: Conversion to runtime PM
Quoted 60 lines
-----Original Message-----
From: Kevin Hilman [mailto:[email protected]]
Sent: Thursday, August 12, 2010 12:15 AM
To: Varadarajan, Charulatha
Cc: [email protected]; [email protected]; [email protected]; Cousson, Benoit; Nayak, Rajendra; Basak, Partha
Subject: Re: [PATCH 6/6 v2] OMAP2PLUS: WDT: Conversion to runtime PMQuoted 5 lines · Charulatha V
This patch converts the OMAP Watchdog timer driver to get adapted to HWMOD FW and to use the runtime PM APIs.
Signed-off-by Charulatha V <[email protected]>Signed-off-by Basak, Partha <[email protected]>This series looks good. One minor comment below...
Quoted 2 lines
--- arch/arm/plat-omap/devices.c | 52 ++++++++++++++++++++++++++++++-----------
Quoted 16 lines
drivers/watchdog/omap_wdt.c | 43 ++++++---------------------------- 2 files changed, 46 insertions(+), 49 deletions(-)arch/arm/plat-omap/devices.c +1
-0@@ -15,6 +15,7 @@#include <linux/platform_device.h> #include <linux/io.h> #include <linux/slab.h> +#include <linux/err.h> #include <mach/hardware.h> #include <asm/mach-types.h> arch/arm/plat-omap/devices.c line 35
Quoted 7 lines
arch/arm/plat-omap/devices.c +2
-0@@ -28,6 +29,8 @@#include <plat/menelaus.h> #include <plat/mcbsp.h> #include <plat/omap44xx.h> +#include <plat/omap_hwmod.h> +#include <plat/omap_device.h> /*--------------------------------------------------------------------- ----*/
arch/arm/plat-omap/devices.c static inline void omap_init_uwire(void) {} · line 248
Quoted 10 lines
arch/arm/plat-omap/devices.c +2
-0@@ -238,6 +241,8 @@ static inline void omap_init_uwire(void) {}static struct resource wdt_resources[] = { { + .start =0xfffeb000 , + .end =0xfffeb07F , .flags =IORESOURCE_MEM , }, };This struct should probably be renamed with an
omap1_prefix.
Quoted 6 lines
arch/arm/plat-omap/devices.c static struct platform_device omap_wdt_device = { · line 255
Quoted 3 lines
arch/arm/plat-omap/devices.c +0
-0@@ -249,24 +254,43 @@ static struct platform_device omap_wdt_device = { .resource = wdt_resources, };ditto
Okay
Quoted 1 line
and they should be moved down just above
omap_init_wdt()
Okay. Will send you the updated patch series soon.
Quoted 36 lines
Quoted 24 lines
arch/arm/plat-omap/devices.c +10
-12-static void omap_init_wdt (void ) +struct omap_device_pm_latency omap_wdt_latency[] = { + [0 ] = { + .deactivate_func = omap_device_idle_hwmods, + .activate_func = omap_device_enable_hwmods, + .flags =OMAP_DEVICE_LATENCY_AUTO_ADJUST , + }, +}; + +static void omap2_init_wdt () { -if (cpu_is_omap16xx ()) - wdt_resources[0 ].start =0xfffeb000 ; -else if (cpu_is_omap2420 ()) - wdt_resources[0 ].start =0x48022000 ;/* WDT2 */ -else if (cpu_is_omap2430 ()) - wdt_resources[0 ].start =0x49016000 ;/* WDT2 */ -else if (cpu_is_omap343x ()) - wdt_resources[0 ].start =0x48314000 ;/* WDT2 */ -else if (cpu_is_omap44xx ()) - wdt_resources[0 ].start =0x4a314000 ; -else +int id =-1 ;arch/arm/plat-omap/devices.c static struct platform_device omap_wdt_device = { · line 277
Quoted 10 lines
arch/arm/plat-omap/devices.c +9
-0+struct omap_device *od; +struct omap_hwmod *oh; +char *oh_name ="wd_timer2" ; +char *name ="omap_wdt" ; + + oh =omap_hwmod_lookup (oh_name); +if (!oh) { +pr_err ("Could not look up %s\n" , oh_name);return ; + }Kevin