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

Commit a329b0ca authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-cleanup-4.11' of... 

Merge tag 'imx-cleanup-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc

i.MX cleanup for 4.11:
 - Remove unused flexcan and esdhc device definitions for i.MX25.
 - A series from Fabio to remove camera device initialization code from
   i.MX platform support, since the corresponding media driver has been
   deprecated and removed from kernel tree.

* tag 'imx-cleanup-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

:
  ARM: mach-mx27_3ds: Remove camera support
  ARM: mach-pcm037: Remove camera support
  ARM: mach-mx35_3ds: Remove camera support
  ARM: mx31moboard-smartbot: Remove camera support
  ARM: mx31moboard-marxbot: Remove camera support
  ARM: mach-mx31_3ds: Remove camera support
  ARM: imx: remove unused device definitions

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 0cc7d0a6 5fdb98dc

arch/arm/mach-imx/devices/platform-flexcan.c

+0 −9
Original line number Diff line number Diff line
@@ -19,15 +19,6 @@ 
#define imx_flexcan_data_entry(soc, _id, _hwid, _size)			\

	[_id] = imx_flexcan_data_entry_single(soc, _id, _hwid, _size)



#ifdef CONFIG_SOC_IMX25

const struct imx_flexcan_data imx25_flexcan_data[] __initconst = {

#define imx25_flexcan_data_entry(_id, _hwid)				\

	imx_flexcan_data_entry(MX25, _id, _hwid, SZ_16K)

	imx25_flexcan_data_entry(0, 1),

	imx25_flexcan_data_entry(1, 2),

};

#endif /* ifdef CONFIG_SOC_IMX25 */



#ifdef CONFIG_SOC_IMX35

const struct imx_flexcan_data imx35_flexcan_data[] __initconst = {

#define imx35_flexcan_data_entry(_id, _hwid)				\

arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c

+0 −10
Original line number Diff line number Diff line
@@ -22,16 +22,6 @@ 
#define imx_sdhci_esdhc_imx_data_entry(soc, devid, id, hwid)	\

	[id] = imx_sdhci_esdhc_imx_data_entry_single(soc, devid, id, hwid)



#ifdef CONFIG_SOC_IMX25

const struct imx_sdhci_esdhc_imx_data

imx25_sdhci_esdhc_imx_data[] __initconst = {

#define imx25_sdhci_esdhc_imx_data_entry(_id, _hwid)			\

	imx_sdhci_esdhc_imx_data_entry(MX25, "sdhci-esdhc-imx25", _id, _hwid)

	imx25_sdhci_esdhc_imx_data_entry(0, 1),

	imx25_sdhci_esdhc_imx_data_entry(1, 2),

};

#endif /* ifdef CONFIG_SOC_IMX25 */



#ifdef CONFIG_SOC_IMX35

const struct imx_sdhci_esdhc_imx_data

imx35_sdhci_esdhc_imx_data[] __initconst = {

arch/arm/mach-imx/mach-mx27_3ds.c

+0 −107
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <linux/regulator/machine.h>

#include <linux/spi/l4f00242t03.h>



#include <media/soc_camera.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>
@@ -53,8 +52,6 @@ 
#define SD1_CD			IMX_GPIO_NR(2, 26)

#define LCD_RESET		IMX_GPIO_NR(1, 3)

#define LCD_ENABLE		IMX_GPIO_NR(1, 31)

#define CSI_PWRDWN		IMX_GPIO_NR(4, 19)

#define CSI_RESET		IMX_GPIO_NR(3, 6)



static const int mx27pdk_pins[] __initconst = {

	/* UART1 */
@@ -144,21 +141,6 @@ static const int mx27pdk_pins[] __initconst = { 
	PA30_PF_CONTRAST,

	LCD_ENABLE | GPIO_GPIO | GPIO_OUT,

	LCD_RESET | GPIO_GPIO | GPIO_OUT,

	/* CSI */

	PB10_PF_CSI_D0,

	PB11_PF_CSI_D1,

	PB12_PF_CSI_D2,

	PB13_PF_CSI_D3,

	PB14_PF_CSI_D4,

	PB15_PF_CSI_MCLK,

	PB16_PF_CSI_PIXCLK,

	PB17_PF_CSI_D5,

	PB18_PF_CSI_D6,

	PB19_PF_CSI_D7,

	PB20_PF_CSI_VSYNC,

	PB21_PF_CSI_HSYNC,

	CSI_PWRDWN | GPIO_GPIO | GPIO_OUT,

	CSI_RESET | GPIO_GPIO | GPIO_OUT,

	/* SSI4 */

	PC16_PF_SSI4_FS,

	PC17_PF_SSI4_RXD,
@@ -166,11 +148,6 @@ static const int mx27pdk_pins[] __initconst = { 
	PC19_PF_SSI4_CLK,

};



static struct gpio mx27_3ds_camera_gpios[] = {

	{ CSI_PWRDWN, GPIOF_OUT_INIT_HIGH, "camera-power" },

	{ CSI_RESET, GPIOF_OUT_INIT_HIGH, "camera-reset" },

};



static const struct imxuart_platform_data uart_pdata __initconst = {

	.flags = IMXUART_HAVE_RTSCTS,

};
@@ -270,7 +247,6 @@ static struct regulator_init_data gpo_init = { 


static struct regulator_consumer_supply vmmc1_consumers[] = {

	REGULATOR_SUPPLY("vcore", "spi0.0"),

	REGULATOR_SUPPLY("cmos_2v8", "soc-camera-pdrv.0"),

};



static struct regulator_init_data vmmc1_init = {
@@ -299,22 +275,6 @@ static struct regulator_init_data vgen_init = { 
	.consumer_supplies = vgen_consumers,

};



static struct regulator_consumer_supply vvib_consumers[] = {

	REGULATOR_SUPPLY("cmos_vcore", "soc-camera-pdrv.0"),

};



static struct regulator_init_data vvib_init = {

	.constraints = {

		.min_uV = 1300000,

		.max_uV = 1300000,

		.apply_uV = 1,

		.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |

				  REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies = ARRAY_SIZE(vvib_consumers),

	.consumer_supplies = vvib_consumers,

};



static struct mc13xxx_regulator_init_data mx27_3ds_regulators[] = {

	{

		.id = MC13783_REG_VMMC1,
@@ -328,9 +288,6 @@ static struct mc13xxx_regulator_init_data mx27_3ds_regulators[] = { 
	}, {

		.id = MC13783_REG_GPO3, /* Turn on 3.3V */

		.init_data = &gpo_init,

	}, {

		.id = MC13783_REG_VVIB,  /* Power OV2640 */

		.init_data = &vvib_init,

	},

};
@@ -370,51 +327,6 @@ static const struct spi_imx_master spi2_pdata __initconst = { 
	.num_chipselect	= ARRAY_SIZE(spi2_chipselect),

};



static int mx27_3ds_camera_power(struct device *dev, int on)

{

	/* enable or disable the camera */

	pr_debug("%s: %s the camera\n", __func__, on ? "ENABLE" : "DISABLE");

	gpio_set_value(CSI_PWRDWN, on ? 0 : 1);



	if (!on)

		goto out;



	/* If enabled, give a reset impulse */

	gpio_set_value(CSI_RESET, 0);

	msleep(20);

	gpio_set_value(CSI_RESET, 1);

	msleep(100);



out:

	return 0;

}



static struct i2c_board_info mx27_3ds_i2c_camera = {

	I2C_BOARD_INFO("ov2640", 0x30),

};



static struct regulator_bulk_data mx27_3ds_camera_regs[] = {

	{ .supply = "cmos_vcore" },

	{ .supply = "cmos_2v8" },

};



static struct soc_camera_link iclink_ov2640 = {

	.bus_id		= 0,

	.board_info	= &mx27_3ds_i2c_camera,

	.i2c_adapter_id	= 0,

	.power		= mx27_3ds_camera_power,

	.regulators	= mx27_3ds_camera_regs,

	.num_regulators	= ARRAY_SIZE(mx27_3ds_camera_regs),

};



static struct platform_device mx27_3ds_ov2640 = {

	.name	= "soc-camera-pdrv",

	.id	= 0,

	.dev	= {

		.platform_data = &iclink_ov2640,

	},

};



static struct imx_fb_videomode mx27_3ds_modes[] = {

	{	/* 480x640 @ 60 Hz */

		.mode = {
@@ -471,14 +383,6 @@ static struct spi_board_info mx27_3ds_spi_devs[] __initdata = { 
	},

};



static struct platform_device *devices[] __initdata = {

	&mx27_3ds_ov2640,

};



static const struct mx2_camera_platform_data mx27_3ds_cam_pdata __initconst = {

	.clk = 26000000,

};



static const struct imxi2c_platform_data mx27_3ds_i2c0_data __initconst = {

	.bitrate = 100000,

};
@@ -498,7 +402,6 @@ static void __init mx27pdk_init(void) 
	imx27_add_spi_imx0(&spi1_pdata);



	imx27_add_imx_i2c(0, &mx27_3ds_i2c0_data);

	platform_add_devices(devices, ARRAY_SIZE(devices));

	imx27_add_imx_fb(&mx27_3ds_fb_data);



	imx27_add_imx_ssi(0, &mx27_3ds_ssi_pdata);
@@ -506,8 +409,6 @@ static void __init mx27pdk_init(void) 


static void __init mx27pdk_late_init(void)

{

	int ret;



	mx27_3ds_sdhc1_enable_level_translator();

	imx27_add_mxc_mmc(0, &sdhc1_pdata);
@@ -531,14 +432,6 @@ static void __init mx27pdk_late_init(void) 
	if (mxc_expio_init(MX27_CS5_BASE_ADDR, IMX_GPIO_NR(3, 28)))

		pr_warn("Init of the debugboard failed, all devices on the debugboard are unusable.\n");



	ret = gpio_request_array(mx27_3ds_camera_gpios,

				 ARRAY_SIZE(mx27_3ds_camera_gpios));

	if (ret) {

		pr_err("Failed to request camera gpios");

		iclink_ov2640.power = NULL;

	}



	imx27_add_mx2_camera(&mx27_3ds_cam_pdata);



	imx_add_platform_device("imx_mc13783", 0, NULL, 0, NULL, 0);

}

arch/arm/mach-imx/mach-mx31_3ds.c

+0 −160
Original line number Diff line number Diff line
@@ -26,16 +26,12 @@ 
#include <linux/regulator/machine.h>

#include <linux/usb/otg.h>

#include <linux/usb/ulpi.h>

#include <linux/memblock.h>



#include <media/soc_camera.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/time.h>

#include <asm/memory.h>

#include <asm/mach/map.h>

#include <asm/memblock.h>



#include "3ds_debugboard.h"

#include "common.h"
@@ -137,23 +133,6 @@ static int mx31_3ds_pins[] = { 
	MX31_PIN_HSYNC__HSYNC,

	MX31_PIN_FPSHIFT__FPSHIFT,

	MX31_PIN_CONTRAST__CONTRAST,

	/* CSI */

	MX31_PIN_CSI_D6__CSI_D6,

	MX31_PIN_CSI_D7__CSI_D7,

	MX31_PIN_CSI_D8__CSI_D8,

	MX31_PIN_CSI_D9__CSI_D9,

	MX31_PIN_CSI_D10__CSI_D10,

	MX31_PIN_CSI_D11__CSI_D11,

	MX31_PIN_CSI_D12__CSI_D12,

	MX31_PIN_CSI_D13__CSI_D13,

	MX31_PIN_CSI_D14__CSI_D14,

	MX31_PIN_CSI_D15__CSI_D15,

	MX31_PIN_CSI_HSYNC__CSI_HSYNC,

	MX31_PIN_CSI_MCLK__CSI_MCLK,

	MX31_PIN_CSI_PIXCLK__CSI_PIXCLK,

	MX31_PIN_CSI_VSYNC__CSI_VSYNC,

	MX31_PIN_CSI_D5__GPIO3_5, /* CMOS PWDN */

	IOMUX_MODE(MX31_PIN_RI_DTE1, IOMUX_CONFIG_GPIO), /* CMOS reset */

	/* SSI */

	MX31_PIN_STXD4__STXD4,

	MX31_PIN_SRXD4__SRXD4,
@@ -161,98 +140,6 @@ static int mx31_3ds_pins[] = { 
	MX31_PIN_SFS4__SFS4,

};



/*

 * Camera support

 */

static phys_addr_t mx3_camera_base __initdata;

#define MX31_3DS_CAMERA_BUF_SIZE SZ_8M



#define MX31_3DS_GPIO_CAMERA_PW IOMUX_TO_GPIO(MX31_PIN_CSI_D5)

#define MX31_3DS_GPIO_CAMERA_RST IOMUX_TO_GPIO(MX31_PIN_RI_DTE1)



static struct gpio mx31_3ds_camera_gpios[] = {

	{ MX31_3DS_GPIO_CAMERA_PW, GPIOF_OUT_INIT_HIGH, "camera-power" },

	{ MX31_3DS_GPIO_CAMERA_RST, GPIOF_OUT_INIT_HIGH, "camera-reset" },

};



static const struct mx3_camera_pdata mx31_3ds_camera_pdata __initconst = {

	.flags = MX3_CAMERA_DATAWIDTH_10,

	.mclk_10khz = 2600,

};



static int __init mx31_3ds_init_camera(void)

{

	int dma, ret = -ENOMEM;

	struct platform_device *pdev =

		imx31_alloc_mx3_camera(&mx31_3ds_camera_pdata);



	if (IS_ERR(pdev))

		return PTR_ERR(pdev);



	if (!mx3_camera_base)

		goto err;



	dma = dma_declare_coherent_memory(&pdev->dev,

					mx3_camera_base, mx3_camera_base,

					MX31_3DS_CAMERA_BUF_SIZE,

					DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE);



	if (!(dma & DMA_MEMORY_MAP))

		goto err;



	ret = platform_device_add(pdev);

	if (ret)

err:

		platform_device_put(pdev);



	return ret;

}



static int mx31_3ds_camera_power(struct device *dev, int on)

{

	/* enable or disable the camera */

	pr_debug("%s: %s the camera\n", __func__, on ? "ENABLE" : "DISABLE");

	gpio_set_value(MX31_3DS_GPIO_CAMERA_PW, on ? 0 : 1);



	if (!on)

		goto out;



	/* If enabled, give a reset impulse */

	gpio_set_value(MX31_3DS_GPIO_CAMERA_RST, 0);

	msleep(20);

	gpio_set_value(MX31_3DS_GPIO_CAMERA_RST, 1);

	msleep(100);



out:

	return 0;

}



static struct i2c_board_info mx31_3ds_i2c_camera = {

	I2C_BOARD_INFO("ov2640", 0x30),

};



static struct regulator_bulk_data mx31_3ds_camera_regs[] = {

	{ .supply = "cmos_vcore" },

	{ .supply = "cmos_2v8" },

};



static struct soc_camera_link iclink_ov2640 = {

	.bus_id		= 0,

	.board_info	= &mx31_3ds_i2c_camera,

	.i2c_adapter_id	= 0,

	.power		= mx31_3ds_camera_power,

	.regulators	= mx31_3ds_camera_regs,

	.num_regulators	= ARRAY_SIZE(mx31_3ds_camera_regs),

};



static struct platform_device mx31_3ds_ov2640 = {

	.name	= "soc-camera-pdrv",

	.id	= 0,

	.dev	= {

		.platform_data = &iclink_ov2640,

	},

};



/*

 * FB support

 */
@@ -410,7 +297,6 @@ static struct regulator_init_data vmmc2_init = { 


static struct regulator_consumer_supply vmmc1_consumers[] = {

	REGULATOR_SUPPLY("vcore", "spi0.0"),

	REGULATOR_SUPPLY("cmos_2v8", "soc-camera-pdrv.0"),

};



static struct regulator_init_data vmmc1_init = {
@@ -441,22 +327,6 @@ static struct regulator_init_data vgen_init = { 
	.consumer_supplies = vgen_consumers,

};



static struct regulator_consumer_supply vvib_consumers[] = {

	REGULATOR_SUPPLY("cmos_vcore", "soc-camera-pdrv.0"),

};



static struct regulator_init_data vvib_init = {

	.constraints = {

		.min_uV = 1300000,

		.max_uV = 1300000,

		.apply_uV = 1,

		.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |

				  REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies = ARRAY_SIZE(vvib_consumers),

	.consumer_supplies = vvib_consumers,

};



static struct mc13xxx_regulator_init_data mx31_3ds_regulators[] = {

	{

		.id = MC13783_REG_PWGT1SPI, /* Power Gate for ARM core. */
@@ -480,9 +350,6 @@ static struct mc13xxx_regulator_init_data mx31_3ds_regulators[] = { 
	}, {

		.id = MC13783_REG_VGEN,  /* Power LCD */

		.init_data = &vgen_init,

	}, {

		.id = MC13783_REG_VVIB,  /* Power CMOS */

		.init_data = &vvib_init,

	},

};
@@ -688,10 +555,6 @@ static const struct imxi2c_platform_data mx31_3ds_i2c0_data __initconst = { 
	.bitrate = 100000,

};



static struct platform_device *devices[] __initdata = {

	&mx31_3ds_ov2640,

};



static void __init mx31_3ds_init(void)

{

	imx31_soc_init();
@@ -723,14 +586,10 @@ static void __init mx31_3ds_init(void) 


static void __init mx31_3ds_late(void)

{

	int ret;



	mx31_3ds_spi_devs[0].irq = gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_3));

	spi_register_board_info(mx31_3ds_spi_devs,

				ARRAY_SIZE(mx31_3ds_spi_devs));



	platform_add_devices(devices, ARRAY_SIZE(devices));



	mx31_3ds_usbotg_init();

	if (otg_mode_host) {

		otg_pdata.otg = imx_otg_ulpi_create(ULPI_OTG_DRVVBUS |
@@ -751,17 +610,6 @@ static void __init mx31_3ds_late(void) 
		       "devices on the debug board are unusable.\n");



	imx31_add_mxc_mmc(0, &sdhc1_pdata);



	/* CSI */

	/* Camera power: default - off */

	ret = gpio_request_array(mx31_3ds_camera_gpios,

				 ARRAY_SIZE(mx31_3ds_camera_gpios));

	if (ret) {

		pr_err("Failed to request camera gpios");

		iclink_ov2640.power = NULL;

	}



	mx31_3ds_init_camera();

}



static void __init mx31_3ds_timer_init(void)
@@ -769,13 +617,6 @@ static void __init mx31_3ds_timer_init(void) 
	mx31_clocks_init(26000000);

}



static void __init mx31_3ds_reserve(void)

{

	/* reserve MX31_3DS_CAMERA_BUF_SIZE bytes for mx3-camera */

	mx3_camera_base = arm_memblock_steal(MX31_3DS_CAMERA_BUF_SIZE,

					 MX31_3DS_CAMERA_BUF_SIZE);

}



MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)")

	/* Maintainer: Freescale Semiconductor, Inc. */

	.atag_offset = 0x100,
@@ -785,6 +626,5 @@ MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)") 
	.init_time	= mx31_3ds_timer_init,

	.init_machine = mx31_3ds_init,

	.init_late	= mx31_3ds_late,

	.reserve = mx31_3ds_reserve,

	.restart	= mxc_restart,

MACHINE_END

arch/arm/mach-imx/mach-mx35_3ds.c

+0 −103
Original line number Diff line number Diff line
@@ -41,12 +41,9 @@ 
#include <asm/mach/arch.h>

#include <asm/mach/time.h>

#include <asm/mach/map.h>

#include <asm/memblock.h>



#include <video/platform_lcd.h>



#include <media/soc_camera.h>



#include "3ds_debugboard.h"

#include "common.h"

#include "devices-imx35.h"
@@ -233,83 +230,10 @@ static const iomux_v3_cfg_t mx35pdk_pads[] __initconst = { 
	MX35_PAD_D3_VSYNC__IPU_DISPB_D3_VSYNC,

	MX35_PAD_D3_REV__IPU_DISPB_D3_REV,

	MX35_PAD_D3_CLS__IPU_DISPB_D3_CLS,

	/* CSI */

	MX35_PAD_TX1__IPU_CSI_D_6,

	MX35_PAD_TX0__IPU_CSI_D_7,

	MX35_PAD_CSI_D8__IPU_CSI_D_8,

	MX35_PAD_CSI_D9__IPU_CSI_D_9,

	MX35_PAD_CSI_D10__IPU_CSI_D_10,

	MX35_PAD_CSI_D11__IPU_CSI_D_11,

	MX35_PAD_CSI_D12__IPU_CSI_D_12,

	MX35_PAD_CSI_D13__IPU_CSI_D_13,

	MX35_PAD_CSI_D14__IPU_CSI_D_14,

	MX35_PAD_CSI_D15__IPU_CSI_D_15,

	MX35_PAD_CSI_HSYNC__IPU_CSI_HSYNC,

	MX35_PAD_CSI_MCLK__IPU_CSI_MCLK,

	MX35_PAD_CSI_PIXCLK__IPU_CSI_PIXCLK,

	MX35_PAD_CSI_VSYNC__IPU_CSI_VSYNC,

	/*PMIC IRQ*/

	MX35_PAD_GPIO2_0__GPIO2_0,

};



/*

 * Camera support

*/

static phys_addr_t mx3_camera_base __initdata;

#define MX35_3DS_CAMERA_BUF_SIZE SZ_8M



static const struct mx3_camera_pdata mx35_3ds_camera_pdata __initconst = {

	.flags = MX3_CAMERA_DATAWIDTH_8,

	.mclk_10khz = 2000,

};



static int __init imx35_3ds_init_camera(void)

{

	int dma, ret = -ENOMEM;

	struct platform_device *pdev =

		imx35_alloc_mx3_camera(&mx35_3ds_camera_pdata);



	if (IS_ERR(pdev))

		return PTR_ERR(pdev);



	if (!mx3_camera_base)

		goto err;



	dma = dma_declare_coherent_memory(&pdev->dev,

					mx3_camera_base, mx3_camera_base,

					MX35_3DS_CAMERA_BUF_SIZE,

					DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE);



	if (!(dma & DMA_MEMORY_MAP))

		goto err;



	ret = platform_device_add(pdev);

	if (ret)

err:

		platform_device_put(pdev);



	return ret;

}



static struct i2c_board_info mx35_3ds_i2c_camera = {

	I2C_BOARD_INFO("ov2640", 0x30),

};



static struct soc_camera_link iclink_ov2640 = {

	.bus_id		= 0,

	.board_info	= &mx35_3ds_i2c_camera,

	.i2c_adapter_id	= 0,

	.power		= NULL,

};



static struct platform_device mx35_3ds_ov2640 = {

	.name	= "soc-camera-pdrv",

	.id	= 0,

	.dev	= {

		.platform_data = &iclink_ov2640,

	},

};



static struct regulator_consumer_supply sw1_consumers[] = {

	{

		.supply = "cpu_vcc",
@@ -321,10 +245,6 @@ static struct regulator_consumer_supply vcam_consumers[] = { 
	REGULATOR_SUPPLY("VDDA", "0-000a"),

};



static struct regulator_consumer_supply vaudio_consumers[] = {

	REGULATOR_SUPPLY("cmos_vio", "soc-camera-pdrv.0"),

};



static struct regulator_init_data sw1_init = {

	.constraints = {

		.name = "SW1",
@@ -405,18 +325,6 @@ static struct regulator_init_data vvideo_init = { 
	}

};



static struct regulator_init_data vaudio_init = {

	.constraints = {

		.name = "VAUDIO",

		.min_uV = 2300000,

		.max_uV = 3000000,

		.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE,

		.boot_on = 1

	},

	.num_consumer_supplies = ARRAY_SIZE(vaudio_consumers),

	.consumer_supplies = vaudio_consumers,

};



static struct regulator_init_data vcam_init = {

	.constraints = {

		.name = "VCAM",
@@ -460,7 +368,6 @@ static struct mc13xxx_regulator_init_data mx35_3ds_regulators[] = { 
	{ .id = MC13892_VDIG, .init_data = &vdig_init },

	{ .id = MC13892_VUSB2, .init_data = &vusb2_init },

	{ .id = MC13892_VVIDEO, .init_data = &vvideo_init },

	{ .id = MC13892_VAUDIO, .init_data = &vaudio_init },

	{ .id = MC13892_VCAM, .init_data = &vcam_init },

	{ .id = MC13892_VGEN1, .init_data = &vgen1_init },

	{ .id = MC13892_VGEN2, .init_data = &vgen2_init },
@@ -583,8 +490,6 @@ static void __init mx35_3ds_init(void) 
		0, i2c_devices_3ds, ARRAY_SIZE(i2c_devices_3ds));



	imx35_add_ipu_core();

	platform_device_register(&mx35_3ds_ov2640);

	imx35_3ds_init_camera();

}



static void __init mx35_3ds_late_init(void)
@@ -607,13 +512,6 @@ static void __init mx35pdk_timer_init(void) 
	mx35_clocks_init();

}



static void __init mx35_3ds_reserve(void)

{

	/* reserve MX35_3DS_CAMERA_BUF_SIZE bytes for mx3-camera */

	mx3_camera_base = arm_memblock_steal(MX35_3DS_CAMERA_BUF_SIZE,

					 MX35_3DS_CAMERA_BUF_SIZE);

}



MACHINE_START(MX35_3DS, "Freescale MX35PDK")

	/* Maintainer: Freescale Semiconductor, Inc */

	.atag_offset = 0x100,
@@ -623,6 +521,5 @@ MACHINE_START(MX35_3DS, "Freescale MX35PDK") 
	.init_time	= mx35pdk_timer_init,

	.init_machine = mx35_3ds_init,

	.init_late	= mx35_3ds_late_init,

	.reserve = mx35_3ds_reserve,

	.restart	= mxc_restart,

MACHINE_END