diff options
| author | Jeremiah Lott <jeremiah.lott@timesys.com> | 2009-09-18 17:05:24 -0400 |
|---|---|---|
| committer | Andy Voltz <andy.voltz@timesys.com> | 2010-11-19 12:27:29 -0500 |
| commit | 1badd79b0825feb5bb210998157c5189e7969525 (patch) | |
| tree | 9f9e83b3f8c3d83685249c8eef0a070a7a2dda05 | |
| parent | bfa6df23f45417fa1418672410ea55d4923ad454 (diff) | |
RTC driver for mx27 chip and board registration for mx27lite.
| -rw-r--r-- | arch/arm/mach-mx2/clock_imx27.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-mx2/mx27lite.c | 31 | ||||
| -rw-r--r-- | drivers/rtc/Makefile | 3 |
3 files changed, 29 insertions, 6 deletions
diff --git a/arch/arm/mach-mx2/clock_imx27.c b/arch/arm/mach-mx2/clock_imx27.c index 208dc83ff0c2..b88a2c308499 100644 --- a/arch/arm/mach-mx2/clock_imx27.c +++ b/arch/arm/mach-mx2/clock_imx27.c @@ -635,6 +635,7 @@ DEFINE_CLOCK1(csi_clk, 0, 0, 0, parent, &csi_clk1, &per4_clk); }, static struct clk_lookup lookups[] = { + _REGISTER_CLOCK(NULL, "ckil", ckil_clk) _REGISTER_CLOCK("imx-uart.0", NULL, uart1_clk) _REGISTER_CLOCK("imx-uart.1", NULL, uart2_clk) _REGISTER_CLOCK("imx-uart.2", NULL, uart3_clk) diff --git a/arch/arm/mach-mx2/mx27lite.c b/arch/arm/mach-mx2/mx27lite.c index ddd412d2b16e..26cc4a81ac03 100644 --- a/arch/arm/mach-mx2/mx27lite.c +++ b/arch/arm/mach-mx2/mx27lite.c @@ -278,12 +278,6 @@ static struct platform_device mxc_keypad_device = { }, }; -static struct platform_device *platform_devices[] __initdata = { - &mx27lite_nor_mtd_device, - &mxc_fec_device, - &mxc_keypad_device, -}; - static int mx27ads_sdhc2_init(struct device *dev, irq_handler_t detect_irq, void *data) { @@ -315,6 +309,31 @@ static struct imxi2c_platform_data mx27lite_i2c_data_1 = { static struct i2c_board_info mx27lite_i2c_devices_1[] = { }; +static struct resource rtc_resources[] = { + { + .start = RTC_BASE_ADDR, + .end = RTC_BASE_ADDR + 0x30, + .flags = IORESOURCE_MEM, + }, + { + .start = MXC_INT_RTC, + .flags = IORESOURCE_IRQ, + }, + }; +static struct platform_device mxc_rtc_device = { + .name = "mxc_rtc", + .id = 0, + .num_resources = ARRAY_SIZE(rtc_resources), + .resource = rtc_resources, +}; + +static struct platform_device *platform_devices[] __initdata = { + &mx27lite_nor_mtd_device, + &mxc_fec_device, + &mxc_keypad_device, + &mxc_rtc_device, +}; + static void __init mx27lite_init(void) { mxc_gpio_setup_multiple_pins(mx27lite_pins, ARRAY_SIZE(mx27lite_pins), diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index aa3fbd5517a1..0674ee163bad 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -50,6 +50,9 @@ obj-$(CONFIG_RTC_DRV_M48T35) += rtc-m48t35.o obj-$(CONFIG_RTC_DRV_M48T59) += rtc-m48t59.o obj-$(CONFIG_RTC_DRV_M48T86) += rtc-m48t86.o obj-$(CONFIG_RTC_MXC) += rtc-mxc.o +obj-$(CONFIG_RTC_DRV_BQ4802) += rtc-bq4802.o +obj-$(CONFIG_RTC_DRV_SUN4V) += rtc-sun4v.o +obj-$(CONFIG_RTC_DRV_STARFIRE) += rtc-starfire.o obj-$(CONFIG_RTC_DRV_MAX6900) += rtc-max6900.o obj-$(CONFIG_RTC_DRV_MAX6902) += rtc-max6902.o obj-$(CONFIG_RTC_DRV_MV) += rtc-mv.o |