arm: omap1/2/3/4: convert 32k-sync driver to a platform_driver
Subsystems (5)
PATCH 1/1 arm: omap1/2/3/4: convert 32k-sync driver to a platform_driver
Convert the omap32k clocksource driver into a platform_driver and while at that, also remove the ifdeferry around the code.
Signed-off-by Felipe Balbi <[email protected]>
--- arch/arm/mach-omap1/devices.c | 24 ++++ arch/arm/mach-omap2/clock2420_data.c | 2 +- arch/arm/mach-omap2/clock2430_data.c | 2 +- arch/arm/mach-omap2/clock3xxx_data.c | 2 +- arch/arm/mach-omap2/devices.c | 35 +++++ arch/arm/plat-omap/Makefile | 4 +- arch/arm/plat-omap/common.c | 158 --------------------- arch/arm/plat-omap/counter-32k.c | 253 ++++++++++++++++++++++++++++++++++ 8 files changed, 317 insertions(+), 163 deletions(-) create mode 100644 arch/arm/plat-omap/counter-32k.c
arch/arm/mach-omap1/devices.c +24 -0
@@ -28,6 +28,29 @@/*-------------------------------------------------------------------------*/ +#define OMAP16XX_TIMER_32K_BASE 0xfffbc400 + +static struct resource omap_32k_resources[] = { + { + .start =OMAP16XX_TIMER_32K_BASE , + .end =SZ_4K , + .flags =IORESOURCE_MEM , + }, +}; + +static struct platform_device omap_32k_device = { + .name ="omap-counter-32k" , + .id =-1 , + .num_resources =ARRAY_SIZE (omap_32k_resources), + .resource = omap_32k_resources, +}; + +static void omap_init_32k (void ) +{ +if (cpu_is_omap16xx ()) + (void )platform_device_register (&omap_32k_device); +}; +#if defined(CONFIG_RTC_DRV_OMAP ) || defined(CONFIG_RTC_DRV_OMAP_MODULE )#define OMAP_RTC_BASE 0xfffb4800
@@ -223,6 +246,7 @@ static int __init omap1_init_devices(void)* in alphabetical order so they're easier to sort through. */ +omap_init_32k ();omap_init_mbox ();omap_init_rtc ();omap_init_spi100k ();
arch/arm/mach-omap2/clock2420_data.c +1 -1
@@ -1806,7 +1806,7 @@ static struct omap_clk omap2420_clks[] = {CLK (NULL ,"gpios_fck" , &gpios_fck,CK_242X ),CLK ("omap_wdt" ,"ick" , &mpu_wdt_ick,CK_242X ),CLK ("omap_wdt" ,"fck" , &mpu_wdt_fck,CK_242X ), -CLK (NULL ,"sync_32k_ick" , &sync_32k_ick,CK_242X ), +CLK ("omap-counter-32k" ,"ick" , &sync_32k_ick,CK_242X ),CLK (NULL ,"wdt1_ick" , &wdt1_ick,CK_242X ),CLK (NULL ,"omapctrl_ick" , &omapctrl_ick,CK_242X ), CLK("omap24xxcam", "fck", &cam_fck, CK_242X),
arch/arm/mach-omap2/clock2430_data.c +1 -1
@@ -1900,7 +1900,7 @@ static struct omap_clk omap2430_clks[] = {CLK (NULL ,"gpios_fck" , &gpios_fck,CK_243X ),CLK ("omap_wdt" ,"ick" , &mpu_wdt_ick,CK_243X ),CLK ("omap_wdt" ,"fck" , &mpu_wdt_fck,CK_243X ), -CLK (NULL ,"sync_32k_ick" , &sync_32k_ick,CK_243X ), +CLK ("omap-counter-32k" ,"ick" , &sync_32k_ick,CK_243X ),CLK (NULL ,"wdt1_ick" , &wdt1_ick,CK_243X ),CLK (NULL ,"omapctrl_ick" , &omapctrl_ick,CK_243X ), CLK(NULL, "icr_ick", &icr_ick, CK_243X),
arch/arm/mach-omap2/clock3xxx_data.c +1 -1
@@ -3343,7 +3343,7 @@ static struct omap_clk omap3xxx_clks[] = {CLK ("omap_wdt" ,"ick" , &wdt2_ick,CK_3XXX ),CLK (NULL ,"wdt1_ick" , &wdt1_ick,CK_3XXX ),CLK (NULL ,"gpio1_ick" , &gpio1_ick,CK_3XXX ), -CLK (NULL ,"omap_32ksync_ick" , &omap_32ksync_ick,CK_3XXX ), +CLK ("omap-counter-32k" ,"ick" , &omap_32ksync_ick,CK_3XXX ),CLK (NULL ,"gpt12_ick" , &gpt12_ick,CK_3XXX ),CLK (NULL ,"gpt1_ick" , &gpt1_ick,CK_3XXX ), CLK(NULL, "per_96m_fck", &per_96m_fck, CK_3XXX),
arch/arm/mach-omap2/devices.c +35 -0
@@ -31,6 +31,40 @@#include "mux.h" +static struct resource omap_32k_resources[] = { + { + .flags =IORESOURCE_MEM , + }, +}; + +static struct platform_device omap_32k_device = { + .name ="omap-counter-32k" , + .id =-1 , + .num_resources =ARRAY_SIZE (omap_32k_resources), + .resource = omap_32k_resources, +}; + +static void omap_init_32k (void ) +{ +if (cpu_is_omap2420 ()) { + omap_32k_resources[0 ].start =OMAP2420_32KSYNCT_BASE ; + omap_32k_resources[0 ].end =OMAP2420_32KSYNCT_BASE +SZ_4K ; + }else if (cpu_is_omap2430 ()) { + omap_32k_resources[0 ].start =OMAP2430_32KSYNCT_BASE ; + omap_32k_resources[0 ].end =OMAP2430_32KSYNCT_BASE +SZ_4K ; + }else if (cpu_is_omap34xx ()) { + omap_32k_resources[0 ].start =OMAP3430_32KSYNCT_BASE ; + omap_32k_resources[0 ].end =OMAP3430_32KSYNCT_BASE +SZ_4K ; + }else if (cpu_is_omap44xx ()) { + omap_32k_resources[0 ].start =OMAP4430_32KSYNCT_BASE ; + omap_32k_resources[0 ].end =OMAP4430_32KSYNCT_BASE +SZ_4K ; + }else {/* not supported */ +return ; + } + + (void )platform_device_register (&omap_32k_device); +}; +#if defined(CONFIG_VIDEO_OMAP2 ) || defined(CONFIG_VIDEO_OMAP2_MODULE ) static struct resource cam_resources[] = {
@@ -847,6 +881,7 @@ static int __init omap2_init_devices(void)* in alphabetical order so they're easier to sort through. */ omap_hsmmc_reset (); +omap_init_32k ();omap_init_camera ();omap_init_mbox ();omap_init_mcspi ();
arch/arm/plat-omap/Makefile +2 -2
@@ -4,7 +4,7 @@ # Common support obj-y := common.o sram.o clock.o devices.o dma.o mux.o gpio.o \ - usb.o fb.o io.o + usb.o fb.o io.o counter-32k.o obj-m := obj-n := obj- :=
@@ -31,4 +31,4 @@ obj-y += $(i2c-omap-m) $(i2c-omap-y) # OMAP mailbox framework obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox.o -obj-$(CONFIG_OMAP_PM_NOOP) += omap-pm-noop.o +obj-$(CONFIG_OMAP_PM_NOOP) += omap-pm-noop.o
arch/arm/plat-omap/common.c +0 -158
164 lines not on this page · raw message
arch/arm/plat-omap/counter-32k.c new file +253 -0
253 lines not on this page · raw message
Signature · 4 lines
1.7.3.rc0.35.g8ac8c --EeQfGwPcQSOJBaQU--