Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83422671 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Sascha Hauer
Browse files

ARM: mx3: dynamically allocate "mxc_rtc" devices 



LAKML-Reference: 1299271882-2130-2-git-send-email-u.kleine-koenig@pengutronix.de
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 3da25cce

arch/arm/mach-mx3/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ config MACH_MX31LITE 
	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_MMC

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_MXC_RTC

	select IMX_HAVE_PLATFORM_SPI_IMX

	help

	  Include support for MX31 LITEKIT platform. This includes specific

arch/arm/mach-mx3/devices-imx31.h

+4 −0
Original line number Diff line number Diff line
@@ -56,6 +56,10 @@ extern const struct imx_mxc_nand_data imx31_mxc_nand_data; 
#define imx31_add_mxc_nand(pdata)	\

	imx_add_mxc_nand(&imx31_mxc_nand_data, pdata)



extern const struct imx_mxc_rtc_data imx31_mxc_rtc_data;

#define imx31_add_mxc_rtc(pdata)	\

	imx_add_mxc_rtc(&imx31_mxc_rtc_data)



extern const struct imx_mxc_w1_data imx31_mxc_w1_data;

#define imx31_add_mxc_w1(pdata)	\

	imx_add_mxc_w1(&imx31_mxc_w1_data)

arch/arm/mach-mx3/devices.c

+0 −19
Original line number Diff line number Diff line
@@ -94,22 +94,3 @@ struct platform_device mx3_camera = { 
		.coherent_dma_mask = DMA_BIT_MASK(32),

	},

};
 


static struct resource imx_rtc_resources[] = {

	{

		.start  = MX31_RTC_BASE_ADDR,

		.end    = MX31_RTC_BASE_ADDR + 0x3fff,

		.flags  = IORESOURCE_MEM,

	},

	{

		.start  = MX31_INT_RTC,

		.flags  = IORESOURCE_IRQ,

	},

};



struct platform_device imx_rtc_device0 = {

	.name           = "mxc_rtc",

	.id             = -1,

	.num_resources  = ARRAY_SIZE(imx_rtc_resources),

	.resource       = imx_rtc_resources,

};

arch/arm/mach-mx3/devices.h

+0 −1
Original line number Diff line number Diff line 
extern struct platform_device mx3_ipu;

extern struct platform_device mx3_fb;

extern struct platform_device mx3_camera;
 
extern struct platform_device imx_rtc_device0;

arch/arm/mach-mx3/mx31lite-db.c

+1 −1
Original line number Diff line number Diff line
@@ -200,5 +200,5 @@ void __init mx31lite_db_init(void) 
	imx31_add_spi_imx0(&spi0_pdata);

	platform_device_register(&litekit_led_device);

	imx31_add_imx2_wdt(NULL);

	mxc_register_device(&imx_rtc_device0, NULL);

	imx31_add_mxc_rtc(NULL);

}