Commit dae2efd7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'imx-drivers' of git://git.pengutronix.de/git/imx/linux-2.6 into next/drivers 

* 'imx-drivers' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM: imx_v4_v5_defconfig: Update defconfig
  ARM: mx27_3ds: Add camera support
  ARM: imx_v6_v7_defconfig: Add support for framebuffer and camera on mx31
parents afde9626 15cc1b1c

arch/arm/configs/imx_v4_v5_defconfig

+16 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ CONFIG_FPE_NWFPE=y 
CONFIG_FPE_NWFPE_XP=y

CONFIG_PM_DEBUG=y

CONFIG_NET=y

CONFIG_SMSC911X=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y
@@ -117,6 +118,21 @@ CONFIG_FB_IMX=y 
CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_BACKLIGHT_CLASS_DEVICE=y

CONFIG_LCD_L4F00242T03=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_VIDEO_DEV=y

CONFIG_VIDEO_V4L2_COMMON=y

CONFIG_VIDEO_MEDIA=y

CONFIG_VIDEO_V4L2=y

CONFIG_VIDEOBUF_GEN=y

CONFIG_VIDEOBUF_DMA_CONTIG=y

CONFIG_VIDEOBUF2_CORE=y

CONFIG_VIDEO_CAPTURE_DRIVERS=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_SOC_CAMERA=y

CONFIG_SOC_CAMERA_OV2640=y

CONFIG_VIDEO_MX2_HOSTSUPPORT=y

CONFIG_VIDEO_MX2=y

CONFIG_BACKLIGHT_PWM=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FONTS=y

arch/arm/configs/imx_v6_v7_defconfig

+32 −0
Original line number Diff line number Diff line
@@ -126,7 +126,39 @@ CONFIG_WATCHDOG=y 
CONFIG_IMX2_WDT=y

CONFIG_MFD_MC13XXX=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_MC13783=y

CONFIG_REGULATOR_MC13892=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_VIDEO_V4L2=y

CONFIG_VIDEO_DEV=y

CONFIG_VIDEO_V4L2_COMMON=y

CONFIG_VIDEOBUF_GEN=y

CONFIG_VIDEOBUF2_CORE=y

CONFIG_VIDEOBUF2_MEMOPS=y

CONFIG_VIDEOBUF2_DMA_CONTIG=y

CONFIG_VIDEO_CAPTURE_DRIVERS=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_SOC_CAMERA=y

CONFIG_SOC_CAMERA_OV2640=y

CONFIG_MX3_VIDEO=y

CONFIG_VIDEO_MX3=y

CONFIG_FB=y

CONFIG_FB_MX3=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_LCD_L4F00242T03=y

CONFIG_BACKLIGHT_CLASS_DEVICE=y

CONFIG_BACKLIGHT_GENERIC=y

CONFIG_DUMMY_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

CONFIG_FONTS=y

CONFIG_FONT_8x8=y

CONFIG_FONT_8x16=y

CONFIG_LOGO=y

CONFIG_LOGO_LINUX_MONO=y

CONFIG_LOGO_LINUX_VGA16=y

CONFIG_LOGO_LINUX_CLUT224=y

CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_MXC=y

arch/arm/mach-imx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -304,6 +304,7 @@ config MACH_MX27_3DS 
	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_KEYPAD

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MX2_CAMERA

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_MMC

	select IMX_HAVE_PLATFORM_SPI_IMX

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

+108 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
#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>

#include <asm/mach/time.h>
@@ -52,6 +54,8 @@ 
#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 */
@@ -141,6 +145,26 @@ 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,

};



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 = {
@@ -242,6 +266,7 @@ 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 = {
@@ -270,6 +295,22 @@ 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,
@@ -283,6 +324,9 @@ 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,

	},

};
@@ -311,6 +355,51 @@ 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 = {
@@ -367,12 +456,21 @@ 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,

};



static void __init mx27pdk_init(void)

{

	int ret;

	imx27_soc_init();



	mxc_gpio_setup_multiple_pins(mx27pdk_pins, ARRAY_SIZE(mx27pdk_pins),
@@ -404,7 +502,17 @@ static void __init mx27pdk_init(void) 
	if (mxc_expio_init(MX27_CS5_BASE_ADDR, EXPIO_PARENT_INT))

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

	imx27_add_imx_i2c(0, &mx27_3ds_i2c0_data);

	platform_add_devices(devices, ARRAY_SIZE(devices));

	imx27_add_imx_fb(&mx27_3ds_fb_data);



	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);

}



static void __init mx27pdk_timer_init(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE