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

Commit e7c74b34 authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

ARM: mx25: dynamically allocate imxdi_rtc devices 



Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent ab9cee4b

arch/arm/mach-mx25/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ comment "MX25 platforms:" 
config MACH_MX25_3DS

	bool "Support MX25PDK (3DS) Platform"

	select IMX_HAVE_PLATFORM_ESDHC

	select IMX_HAVE_PLATFORM_IMXDI_RTC

	select IMX_HAVE_PLATFORM_IMX_KEYPAD

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_EHCI
@@ -15,6 +16,7 @@ config MACH_EUKREA_CPUIMX25 
	select IMX_HAVE_PLATFORM_ESDHC

	select IMX_HAVE_PLATFORM_FLEXCAN

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_IMXDI_RTC

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_EHCI

arch/arm/mach-mx25/devices-imx25.h

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,10 @@ extern const struct imx_fsl_usb2_udc_data imx25_fsl_usb2_udc_data __initconst; 
#define imx25_add_fsl_usb2_udc(pdata)	\

	imx_add_fsl_usb2_udc(&imx25_fsl_usb2_udc_data, pdata)



extern struct imx_imxdi_rtc_data imx25_imxdi_rtc_data __initconst;

#define imx25_add_imxdi_rtc(pdata)	\

	imx_add_imxdi_rtc(&imx25_imxdi_rtc_data)



extern const struct imx_imx_i2c_data imx25_imx_i2c_data[] __initconst;

#define imx25_add_imx_i2c(id, pdata)	\

	imx_add_imx_i2c(&imx25_imx_i2c_data[id], pdata)

arch/arm/mach-mx25/devices.c

+0 −19
Original line number Diff line number Diff line
@@ -22,25 +22,6 @@ 
#include <mach/mx25.h>

#include <mach/irqs.h>



static struct resource mx25_rtc_resources[] = {

	{

		.start	= MX25_DRYICE_BASE_ADDR,

		.end	= MX25_DRYICE_BASE_ADDR + 0x40,

		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= MX25_INT_DRYICE,

		.flags	= IORESOURCE_IRQ

	},

};



struct platform_device mx25_rtc_device = {

	.name	= "imxdi_rtc",

	.id	= 0,

	.num_resources	= ARRAY_SIZE(mx25_rtc_resources),

	.resource	= mx25_rtc_resources,

};



static struct resource mx25_fb_resources[] = {

	{

		.start	= MX25_LCDC_BASE_ADDR,

arch/arm/mach-mx25/devices.h

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

extern struct platform_device mx25_fb_device;

extern struct platform_device mxc_wdt;

extern struct platform_device mx25_csi_device;

arch/arm/mach-mx25/mach-cpuimx25.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static void __init eukrea_cpuimx25_init(void) 


	imx25_add_imx_uart0(&uart_pdata);

	imx25_add_mxc_nand(&eukrea_cpuimx25_nand_board_info);

	mxc_register_device(&mx25_rtc_device, NULL);

	imx25_add_imxdi_rtc(NULL);

	imx25_add_fec(&mx25_fec_pdata);



	i2c_register_board_info(0, eukrea_cpuimx25_i2c_devices,