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

Commit 9bfe99a8 authored by Russell King's avatar Russell King
Browse files

Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable

parents f72caf7e 54c1f636

arch/arm/configs/mx51_defconfig

+16 −1
Original line number Diff line number Diff line
@@ -809,7 +809,22 @@ CONFIG_SSB_POSSIBLE=y 
CONFIG_DUMMY_CONSOLE=y

# CONFIG_SOUND is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_USB_SUPPORT=y

CONFIG_USB_ARCH_HAS_HCD=y

# CONFIG_USB_ARCH_HAS_OHCI is not set

CONFIG_USB_ARCH_HAS_EHCI=y

CONFIG_USB=y



#

# USB Host Controller Drivers

#

# CONFIG_USB_C67X00_HCD is not set

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_ROOT_HUB_TT=y

# CONFIG_USB_EHCI_TT_NEWSCHED is not set

CONFIG_USB_EHCI_MXC=y





CONFIG_MMC=y

# CONFIG_MMC_DEBUG is not set

# CONFIG_MMC_UNSAFE_RESUME is not set

arch/arm/mach-mx2/devices.c

+2 −7
Original line number Diff line number Diff line
@@ -109,12 +109,7 @@ DEFINE_IMX_GPT_DEVICE(4, MX27_GPT5_BASE_ADDR, MX27_INT_GPT5); 
DEFINE_IMX_GPT_DEVICE(5, MX27_GPT6_BASE_ADDR, MX27_INT_GPT6);

#endif



/*

 * Watchdog:

 * - i.MX1

 * - i.MX21

 * - i.MX27

 */

/* Watchdog: i.MX1 has seperate driver, i.MX21 and i.MX27 are equal */

static struct resource mxc_wdt_resources[] = {

	{

		.start = MX2x_WDOG_BASE_ADDR,
@@ -124,7 +119,7 @@ static struct resource mxc_wdt_resources[] = { 
};



struct platform_device mxc_wdt = {

	.name = "mxc_wdt",

	.name = "imx2-wdt",

	.id = 0,

	.num_resources = ARRAY_SIZE(mxc_wdt_resources),

	.resource = mxc_wdt_resources,

arch/arm/mach-mx2/mach-pca100.c

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ static struct mxc_nand_platform_data pca100_nand_board_info = { 
static struct platform_device *platform_devices[] __initdata = {

	&mxc_w1_master_device,

	&mxc_fec_device,

	&mxc_wdt,

};



static struct imxi2c_platform_data pca100_i2c_1_data = {

arch/arm/mach-mx2/mach-pcm038.c

+1 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ static struct platform_device *platform_devices[] __initdata = { 
	&mxc_w1_master_device,

	&mxc_fec_device,

	&pcm038_sram_mtd_device,

	&mxc_wdt,

};



/* On pcm038 there's a sram attached to CS1, we enable the chipselect here and

arch/arm/mach-mx25/devices.c

+15 −0
Original line number Diff line number Diff line
@@ -500,3 +500,18 @@ struct platform_device mx25_fb_device = { 
		.coherent_dma_mask = 0xFFFFFFFF,

	},

};



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,

};