diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-26 08:31:47 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-26 08:31:47 +0100 |
| commit | 48b71e3ac138469e83d044db22020424aaa44753 (patch) | |
| tree | 5fdc072d847bf123b727f4b9e0732bb3a75bec2a /arch/arm | |
| parent | Merge branch 'imx/board' into next/boards (diff) | |
| parent | ARM: imx: configs: Enable CONFIG_MEDIA_CAMERA_SUPPORT (diff) | |
| download | linux-48b71e3ac138469e83d044db22020424aaa44753.tar.xz linux-48b71e3ac138469e83d044db22020424aaa44753.zip | |
Merge tag 'imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6 into next/boards
From Sascha Hauer:
ARM i.MX specific defconfig updates
* tag 'imx-defconfig' of git://git.pengutronix.de/git/imx/linux-2.6:
ARM: imx: configs: Enable CONFIG_MEDIA_CAMERA_SUPPORT
ARM: imx_v6_v7_defconfig: Add DA9052 regulator support
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/imx_v4_v5_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig index 78ed575feb1a..d10040108249 100644 --- a/arch/arm/configs/imx_v4_v5_defconfig +++ b/arch/arm/configs/imx_v4_v5_defconfig @@ -121,6 +121,7 @@ CONFIG_REGULATOR_MC13892=y CONFIG_MEDIA_SUPPORT=y CONFIG_VIDEO_DEV=y CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_SOC_CAMERA=y CONFIG_SOC_CAMERA_OV2640=y CONFIG_VIDEO_MX2=y diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 394ded624e37..508ac9d8e056 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -143,15 +143,18 @@ CONFIG_GPIO_MC9S08DZ60=y # CONFIG_HWMON is not set CONFIG_WATCHDOG=y CONFIG_IMX2_WDT=y +CONFIG_MFD_DA9052_I2C=y CONFIG_MFD_MC13XXX_SPI=y CONFIG_MFD_MC13XXX_I2C=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_REGULATOR_DA9052=y CONFIG_REGULATOR_MC13783=y CONFIG_REGULATOR_MC13892=y CONFIG_MEDIA_SUPPORT=y CONFIG_VIDEO_DEV=y CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_SOC_CAMERA=y CONFIG_SOC_CAMERA_OV2640=y CONFIG_VIDEO_MX3=y |