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

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

ARM: mx25: dynamically allocate imx2-wdt devices 



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

arch/arm/mach-mx25/Kconfig

+1 −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_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMXDI_RTC

	select IMX_HAVE_PLATFORM_IMX_FB

	select IMX_HAVE_PLATFORM_IMX_KEYPAD

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

+4 −0
Original line number Diff line number Diff line
@@ -27,6 +27,10 @@ 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_imx2_wdt_data imx25_imx2_wdt_data __initconst;

#define imx25_add_imx2_wdt(pdata)	\

	imx_add_imx2_wdt(&imx25_imx2_wdt_data)



extern const struct imx_imx_fb_data imx25_imx_fb_data __initconst;

#define imx25_add_imx_fb(pdata)	\

	imx_add_imx_fb(&imx25_imx_fb_data, pdata)

arch/arm/mach-mx25/devices.c

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

#include <mach/irqs.h>



static struct resource mxc_wdt_resources[] = {

	{

		.start = MX25_WDOG_BASE_ADDR,

		.end = MX25_WDOG_BASE_ADDR + SZ_16K - 1,

		.flags = IORESOURCE_MEM,

	},

};



struct platform_device mxc_wdt = {

	.name = "imx2-wdt",

	.id = 0,

	.num_resources = ARRAY_SIZE(mxc_wdt_resources),

	.resource = mxc_wdt_resources,

};



static struct resource mx25_csi_resources[] = {

	{

		.start	= MX25_CSI_BASE_ADDR,

arch/arm/mach-mx25/devices.h

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

extern struct platform_device mx25_csi_device;

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

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static void __init mx25pdk_init(void) 
	imx25_add_mxc_nand(&mx25pdk_nand_board_info);

	imx25_add_imxdi_rtc(NULL);

	imx25_add_imx_fb(&mx25pdk_fb_pdata);

	mxc_register_device(&mxc_wdt, NULL);

	imx25_add_imx2_wdt(NULL);



	mx25pdk_fec_reset();

	imx25_add_fec(&mx25_fec_pdata);