Digi Release Code from del-5.6/main2.6.31-digi-201102141643

3 files changed, 4 insertions, 43 deletions

diff --git a/arch/arm/mach-mx35/devices.c b/arch/arm/mach-mx35/devices.c
index 02c971659bd4..9d030e1ecfeb 100644
--- a/arch/arm/mach-mx35/devices.c
+++ b/arch/arm/mach-mx35/devices.c
@@ -902,22 +902,6 @@ static inline void mxc_init_ssi(void)
 }
 #endif /* CONFIG_SND_MXC_SOC_SSI */
 
-static struct platform_device mxc_v4l2_device = {
-	.name = "mxc_v4l2_capture",
-	.id = 0,
-};
-
-static struct platform_device mxc_v4l2out_device = {
-	.name = "mxc_v4l2_output",
-	.id = 0,
-};
-
-static inline void mxc_init_v4l2()
-{
-	platform_device_register(&mxc_v4l2_device);
-	platform_device_register(&mxc_v4l2out_device);
-}
-
 int __init mxc_init_devices(void)
 {
 	mxc_init_wdt();
@@ -937,7 +921,6 @@ int __init mxc_init_devices(void)
 	mxc_init_gpu();
 	mxc_init_ssi();
 	mxc_init_esai();
-	mxc_init_v4l2();
 
 	return 0;
 }
diff --git a/arch/arm/mach-mx35/mx35_3stack.c b/arch/arm/mach-mx35/mx35_3stack.c
index 868cf12ca2e6..35d639b5a534 100644
--- a/arch/arm/mach-mx35/mx35_3stack.c
+++ b/arch/arm/mach-mx35/mx35_3stack.c
@@ -605,13 +605,6 @@ static struct mxc_mmc_platform_data mmc1_data = {
 #endif
 	.min_clk = 150000,
 	.max_clk = 52000000,
-	/* Do not disable the eSDHC clk on MX35 3DS board,
-	* since SYSTEM can't boot up after the reset key
-	* is pressed when the SD/MMC boot mode is used.
-	* The root cause is that the ROM code don't ensure
-	* the SD/MMC clk is running when boot system.
-	* */
-	.clk_always_on = 1,
 	.card_inserted_state = 0,
 	.status = sdhc_get_card_det_status,
 	.wp_status = sdhc_write_protect,
@@ -658,7 +651,6 @@ static struct mxc_mmc_platform_data mmc2_data = {
 	.caps = MMC_CAP_4_BIT_DATA,
 	.min_clk = 150000,
 	.max_clk = 50000000,
-	.clk_always_on = 1,
 	.card_inserted_state = 0,
 	.status = sdhc_get_card_det_status,
 	.wp_status = sdhc_write_protect,
diff --git a/arch/arm/mach-mx35/usb_dr.c b/arch/arm/mach-mx35/usb_dr.c
index 4ebb27c5342b..18f76b90907a 100644
--- a/arch/arm/mach-mx35/usb_dr.c
+++ b/arch/arm/mach-mx35/usb_dr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2005-2009 Freescale Semiconductor, Inc. All Rights Reserved.
  */
 
 /*
@@ -37,7 +37,7 @@ static struct fsl_usb2_platform_data __maybe_unused dr_utmi_config = {
 
 
 /*
- * OTG resources
+ * resources
  */
 static struct resource otg_resources[] = {
 	[0] = {
@@ -51,20 +51,6 @@ static struct resource otg_resources[] = {
 	},
 };
 
-/*
- * UDC resources (same as OTG resource)
- */
-static struct resource udc_resources[] = {
-	[0] = {
-		.start = (u32)(USB_OTGREGS_BASE),
-		.end   = (u32)(USB_OTGREGS_BASE + 0x1ff),
-		.flags = IORESOURCE_MEM,
-	},
-	[1] = {
-		.start = MXC_INT_USBOTG,
-		.flags = IORESOURCE_IRQ,
-	},
-};
 
 static u64 dr_udc_dmamask = ~(u32) 0;
 static void dr_udc_release(struct device *dev)
@@ -88,8 +74,8 @@ static struct platform_device __maybe_unused dr_udc_device = {
 		.dma_mask          = &dr_udc_dmamask,
 		.coherent_dma_mask = 0xffffffff,
 	},
-	.resource      = udc_resources,
-	.num_resources = ARRAY_SIZE(udc_resources),
+	.resource      = otg_resources,
+	.num_resources = ARRAY_SIZE(otg_resources),
 };
 
 static struct platform_device __maybe_unused dr_otg_device = {