---

yaml --- r: 226070 b: refs/heads/master c: bb4c853 h: refs/heads/master v: v3
git-mirror · Nov 19, 2010 · b540b50 · b540b50
1 parent 77128e4
commit b540b50
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 54 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00871505dcf15418aebc402db9f124dd2738fa2d
+refs/heads/master: bb4c853ff18fe3b0e2aec45053c318479e0c55e3
diff --git a/trunk/arch/arm/mach-mx25/Makefile b/trunk/arch/arm/mach-mx25/Makefile
@@ -1,4 +1,4 @@
-obj-y				:= mm.o devices.o
+obj-y				:= mm.o
 obj-$(CONFIG_ARCH_MX25)		+= clock.o
 obj-$(CONFIG_MACH_MX25_3DS)	+= mach-mx25_3ds.o
 obj-$(CONFIG_MACH_EUKREA_CPUIMX25)		+= mach-cpuimx25.o

diff --git a/trunk/arch/arm/mach-mx25/devices-imx25.h b/trunk/arch/arm/mach-mx25/devices-imx25.h
@@ -59,6 +59,10 @@ extern const struct imx_imx_uart_1irq_data imx25_imx_uart_data[] __initconst;
 #define imx25_add_imx_uart3(pdata)	imx25_add_imx_uart(3, pdata)
 #define imx25_add_imx_uart4(pdata)	imx25_add_imx_uart(4, pdata)
 
+extern const struct imx_mx2_camera_data imx25_mx2_camera_data __initconst;
+#define imx25_add_mx2_camera(pdata)	\
+	imx_add_mx2_camera(&imx25_mx2_camera_data, pdata)
+
 extern const struct imx_mxc_ehci_data imx25_mxc_ehci_otg_data __initconst;
 #define imx25_add_mxc_ehci_otg(pdata)	\
 	imx_add_mxc_ehci(&imx25_mxc_ehci_otg_data, pdata)

diff --git a/trunk/arch/arm/mach-mx25/devices.c b/trunk/arch/arm/mach-mx25/devices.c
diff --git a/trunk/arch/arm/mach-mx25/devices.h b/trunk/arch/arm/mach-mx25/devices.h
@@ -1 +0,0 @@
-extern struct platform_device mx25_csi_device;

diff --git a/trunk/arch/arm/plat-mxc/devices/platform-mx2-camera.c b/trunk/arch/arm/plat-mxc/devices/platform-mx2-camera.c
@@ -10,6 +10,12 @@
 #include <mach/devices-common.h>
 
 #define imx_mx2_camera_data_entry_single(soc)				\
+	{								\
+		.iobasecsi = soc ## _CSI_BASE_ADDR,			\
+		.iosizecsi = SZ_4K,					\
+		.irqcsi = soc ## _INT_CSI,				\
+	}
+#define imx_mx2_camera_data_entry_single_emma(soc)			\
 	{								\
 		.iobasecsi = soc ## _CSI_BASE_ADDR,			\
 		.iosizecsi = SZ_32,					\
@@ -19,9 +25,14 @@
 		.irqemmaprp = soc ## _INT_EMMAPRP,			\
 	}
 
+#ifdef CONFIG_SOC_IMX25
+const struct imx_mx2_camera_data imx25_mx2_camera_data __initconst =
+	imx_mx2_camera_data_entry_single(MX25);
+#endif /* ifdef CONFIG_SOC_IMX25 */
+
 #ifdef CONFIG_SOC_IMX27
 const struct imx_mx2_camera_data imx27_mx2_camera_data __initconst =
-	imx_mx2_camera_data_entry_single(MX27);
+	imx_mx2_camera_data_entry_single_emma(MX27);
 #endif /* ifdef CONFIG_SOC_IMX27 */
 
 struct platform_device *__init imx_add_mx2_camera(
@@ -33,21 +44,21 @@ struct platform_device *__init imx_add_mx2_camera(
 			.start = data->iobasecsi,
 			.end = data->iobasecsi + data->iosizecsi - 1,
 			.flags = IORESOURCE_MEM,
-		}, {
-			.start = data->iobaseemmaprp,
-			.end = data->iobaseemmaprp + data->iosizeemmaprp - 1,
-			.flags = IORESOURCE_MEM,
 		}, {
 			.start = data->irqcsi,
 			.end = data->irqcsi,
 			.flags = IORESOURCE_IRQ,
+		}, {
+			.start = data->iobaseemmaprp,
+			.end = data->iobaseemmaprp + data->iosizeemmaprp - 1,
+			.flags = IORESOURCE_MEM,
 		}, {
 			.start = data->irqemmaprp,
 			.end = data->irqemmaprp,
 			.flags = IORESOURCE_IRQ,
 		},
 	};
 	return imx_add_platform_device_dmamask("mx2-camera", 0,
-			res, ARRAY_SIZE(res),
+			res, data->iobaseemmaprp ? 4 : 2,
 			pdata, sizeof(*pdata), DMA_BIT_MASK(32));
 }