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

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

ARM: mx3: dynamically allocate imx2-wdt devices 



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

arch/arm/mach-mx3/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ config MACH_PCM037 
	bool "Support Phytec pcm037 (i.MX31) platforms"

	select SOC_IMX31

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_EHCI
@@ -75,6 +76,7 @@ config MACH_MX31LITE 
	bool "Support MX31 LITEKIT (LogicPD)"

	select SOC_IMX31

	select MXC_ULPI if USB_ULPI

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_MMC
@@ -143,6 +145,7 @@ config MACH_PCM043 
	bool "Support Phytec pcm043 (i.MX35) platforms"

	select SOC_IMX35

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_SSI

	select IMX_HAVE_PLATFORM_IMX_UART
@@ -193,6 +196,7 @@ config MACH_EUKREA_CPUIMX35 
	bool "Support Eukrea CPUIMX35 Platform"

	select SOC_IMX35

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_MXC_EHCI

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

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

	imx_add_fsl_usb2_udc(&imx31_fsl_usb2_udc_data, pdata)



extern const struct imx_imx2_wdt_data imx31_imx2_wdt_data __initconst;

#define imx31_add_imx2_wdt(pdata)       \

	imx_add_imx2_wdt(&imx31_imx2_wdt_data)



extern const struct imx_imx_i2c_data imx31_imx_i2c_data[] __initconst;

#define imx31_add_imx_i2c(id, pdata)	\

	imx_add_imx_i2c(&imx31_imx_i2c_data[id], pdata)

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

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,10 @@ extern const struct imx_flexcan_data imx35_flexcan_data[] __initconst; 
#define imx35_add_flexcan0(pdata)	imx35_add_flexcan(0, pdata)

#define imx35_add_flexcan1(pdata)	imx35_add_flexcan(1, pdata)



extern const struct imx_imx2_wdt_data imx35_imx2_wdt_data __initconst;

#define imx35_add_imx2_wdt(pdata)       \

	imx_add_imx2_wdt(&imx35_imx2_wdt_data)



extern const struct imx_imx_i2c_data imx35_imx_i2c_data[] __initconst;

#define imx35_add_imx_i2c(id, pdata)	\

	imx_add_imx_i2c(&imx35_imx_i2c_data[id], pdata)

arch/arm/mach-mx3/devices.c

+0 −33
Original line number Diff line number Diff line
@@ -95,19 +95,6 @@ struct platform_device mx3_camera = { 
	},

};



static struct resource imx_wdt_resources[] = {

	{

		.flags = IORESOURCE_MEM,

	},

};



struct platform_device imx_wdt_device0 = {

	.name           = "imx2-wdt",

	.id             = 0,

	.num_resources  = ARRAY_SIZE(imx_wdt_resources),

	.resource       = imx_wdt_resources,

};



static struct resource imx_rtc_resources[] = {

	{

		.start  = MX31_RTC_BASE_ADDR,
@@ -145,23 +132,3 @@ struct platform_device imx_kpp_device = { 
	.num_resources = ARRAY_SIZE(imx_kpp_resources),

	.resource = imx_kpp_resources,

};
 


static int __init mx3_devices_init(void)

{

#if defined(CONFIG_ARCH_MX31)

	if (cpu_is_mx31()) {

		imx_wdt_resources[0].start = MX31_WDOG_BASE_ADDR;

		imx_wdt_resources[0].end = MX31_WDOG_BASE_ADDR + 0x3fff;

	}

#endif

#if defined(CONFIG_ARCH_MX35)

	if (cpu_is_mx35()) {

		imx_wdt_resources[0].start = MX35_WDOG_BASE_ADDR;

		imx_wdt_resources[0].end = MX35_WDOG_BASE_ADDR + 0x3fff;

	}

#endif



	return 0;

}



subsys_initcall(mx3_devices_init);

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_wdt_device0;

extern struct platform_device imx_rtc_device0;

extern struct platform_device imx_kpp_device;