> Please, re-generate the affected V4L/DVB patches, without the PXA part. I'll

> keep those changes on hold, until I get a confirmation that the PXA side is
> committed on mainstream.
Reverted several changes on soc_camera

From: Mauro Carvalho Chehab <mchehab@infradead.org>

As asked by Guennadi:

Mauro, please, drop commits 2f4a87873f13924871d7bb82e27d02d0e16fbe02 and
9b7d577c508e7765860e599c0e98d4ac3fbaa2aa from your tree and replace
5f1e5244ee6b9f139a262d5e7a930a41488afbbe with the version below.

Due to that change, that happened on v4l-dvb -git tree, several patches broke.

This patch reverts all broken stuff, keeping this tree in sync with v4l-dvb
-git tree.

I'm waiting for Guennadi to fix the broken patches and ask me to pull them
again.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

2 files changed, 0 insertions, 118 deletions

diff --git a/linux/arch/arm/mach-pxa/devices.c b/linux/arch/arm/mach-pxa/devices.c
index 3838aabdf..bfccb80ac 100644
--- a/linux/arch/arm/mach-pxa/devices.c
+++ b/linux/arch/arm/mach-pxa/devices.c
@@ -11,7 +11,6 @@
 #include <asm/arch/irda.h>
 #include <asm/arch/i2c.h>
 #include <asm/arch/ohci.h>
-#include <asm/arch/camera.h>
 
 #include "devices.h"
 
@@ -541,37 +540,6 @@ struct platform_device pxa27x_device_ssp3 = {
 	.resource	= pxa27x_resource_ssp3,
 	.num_resources	= ARRAY_SIZE(pxa27x_resource_ssp3),
 };
-
-static struct resource pxa27x_resource_camera[] = {
-	[0] = {
-		.start	= 0x50000000,
-		.end	= 0x50000fff,
-		.flags	= IORESOURCE_MEM,
-	},
-	[1] = {
-		.start	= IRQ_CAMERA,
-		.end	= IRQ_CAMERA,
-		.flags	= IORESOURCE_IRQ,
-	},
-};
-
-static u64 pxa27x_dma_mask_camera = DMA_BIT_MASK(32);
-
-static struct platform_device pxa27x_device_camera = {
-	.name		= "pxa27x-camera",
-	.id		= 0, /* This is used to put cameras on this interface */
-	.dev		= {
-		.dma_mask      		= &pxa27x_dma_mask_camera,
-		.coherent_dma_mask	= 0xffffffff,
-	},
-	.num_resources	= ARRAY_SIZE(pxa27x_resource_camera),
-	.resource	= pxa27x_resource_camera,
-};
-
-void __init pxa_set_camera_info(struct pxacamera_platform_data *info)
-{
-	pxa_register_device(&pxa27x_device_camera, info);
-}
 #endif /* CONFIG_PXA27x || CONFIG_PXA3xx */
 
 #ifdef CONFIG_PXA3xx
diff --git a/linux/arch/arm/mach-pxa/pcm990-baseboard.c b/linux/arch/arm/mach-pxa/pcm990-baseboard.c
index 07ac050f2..3dda16a20 100644
--- a/linux/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/linux/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -23,13 +23,6 @@
 #include <linux/irq.h>
 #include <linux/platform_device.h>
 #include <linux/ide.h>
-#include <linux/i2c.h>
-
-#include <media/soc_camera.h>
-
-#include <asm/gpio.h>
-#include <asm/arch/i2c.h>
-#include <asm/arch/camera.h>
 #include <asm/mach/map.h>
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/mmc.h>
@@ -265,76 +258,6 @@ static struct pxaohci_platform_data pcm990_ohci_platform_data = {
 };
 
 /*
- * PXA27x Camera specific stuff
- */
-#if defined(CONFIG_VIDEO_PXA27x) || defined(CONFIG_VIDEO_PXA27x_MODULE)
-static int pcm990_pxacamera_init(struct device *dev)
-{
-	pxa_gpio_mode(GPIO98_CIF_DD0_MD);
-	pxa_gpio_mode(GPIO105_CIF_DD1_MD);
-	pxa_gpio_mode(GPIO104_CIF_DD2_MD);
-	pxa_gpio_mode(GPIO103_CIF_DD3_MD);
-	pxa_gpio_mode(GPIO95_CIF_DD4_MD);
-	pxa_gpio_mode(GPIO94_CIF_DD5_MD);
-	pxa_gpio_mode(GPIO93_CIF_DD6_MD);
-	pxa_gpio_mode(GPIO108_CIF_DD7_MD);
-	pxa_gpio_mode(GPIO107_CIF_DD8_MD);
-	pxa_gpio_mode(GPIO106_CIF_DD9_MD);
-	pxa_gpio_mode(GPIO42_CIF_MCLK_MD);
-	pxa_gpio_mode(GPIO45_CIF_PCLK_MD);
-	pxa_gpio_mode(GPIO43_CIF_FV_MD);
-	pxa_gpio_mode(GPIO44_CIF_LV_MD);
-
-	return 0;
-}
-
-/*
- * CICR4: PCLK_EN:	Pixel clock is supplied by the sensor
- *	MCLK_EN:	Master clock is generated by PXA
- *	PCP:		Data sampled on the falling edge of pixel clock
- */
-struct pxacamera_platform_data pcm990_pxacamera_platform_data = {
-	.init	= pcm990_pxacamera_init,
-	.flags  = PXA_CAMERA_MASTER | PXA_CAMERA_DATAWIDTH_8 | PXA_CAMERA_DATAWIDTH_10 |
-		PXA_CAMERA_PCLK_EN | PXA_CAMERA_MCLK_EN/* | PXA_CAMERA_PCP*/,
-	.mclk_10khz = 1000,
-};
-
-#include <linux/i2c/pca953x.h>
-
-static struct pca953x_platform_data pca9536_data = {
-	.gpio_base	= NR_BUILTIN_GPIO + 1,
-};
-
-static struct soc_camera_link iclink[] = {
-	{
-		.bus_id	= 0, /* Must match with the camera ID above */
-		.gpio	= NR_BUILTIN_GPIO + 1,
-	}, {
-		.bus_id	= 0, /* Must match with the camera ID above */
-	}
-};
-
-/* Board I2C devices. */
-static struct i2c_board_info __initdata pcm990_i2c_devices[] = {
-	{
-		/* Must initialize before the camera(s) */
-		I2C_BOARD_INFO("pca953x", 0x41),
-		.type = "pca9536",
-		.platform_data = &pca9536_data,
-	}, {
-		I2C_BOARD_INFO("mt9v022", 0x48),
-		.type = "mt9v022",
-		.platform_data = &iclink[0], /* With extender */
-	}, {
-		I2C_BOARD_INFO("mt9m001", 0x5d),
-		.type = "mt9m001",
-		.platform_data = &iclink[0], /* With extender */
-	},
-};
-#endif /* CONFIG_VIDEO_PXA27x ||CONFIG_VIDEO_PXA27x_MODULE */
-
-/*
  * AC97 support
  * Note: The connected AC97 mixer also reports interrupts at PCM990_AC97_IRQ
  */
@@ -403,14 +326,5 @@ void __init pcm990_baseboard_init(void)
 	/* USB host */
 	pxa_set_ohci_info(&pcm990_ohci_platform_data);
 
-	pxa_set_i2c_info(NULL);
-
-#if defined(CONFIG_VIDEO_PXA27x) || defined(CONFIG_VIDEO_PXA27x_MODULE)
-	pxa_set_camera_info(&pcm990_pxacamera_platform_data);
-
-	i2c_register_board_info(0, pcm990_i2c_devices,
-		ARRAY_SIZE(pcm990_i2c_devices));
-#endif
-
 	printk(KERN_INFO"PCM-990 Evaluation baseboard initialized\n");
 }