diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-12-17 14:42:47 -0500 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2013-12-30 20:36:38 -0500 |
commit | 920c9648c10547aef67f7a1d6f227ab479dca658 (patch) | |
tree | 300733c903252a76fa079f5d62fcb281eee3c664 | |
parent | 8962a5dbe0a5faa14c075b1c652b1ec6d9810e53 (diff) |
ARM: imx: update imx_v6_v7_defconfig
Update the IMX v6/v7 defconfig for the SolidRun HummingBoard:
- Add AT803X ethernet phy
- Add consumer IR devices
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index f338fd6370ad..318c5fbccc6c 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig | |||
@@ -119,6 +119,7 @@ CONFIG_SMC91X=y | |||
119 | CONFIG_SMC911X=y | 119 | CONFIG_SMC911X=y |
120 | CONFIG_SMSC911X=y | 120 | CONFIG_SMSC911X=y |
121 | # CONFIG_NET_VENDOR_STMICRO is not set | 121 | # CONFIG_NET_VENDOR_STMICRO is not set |
122 | CONFIG_AT803X_PHY=y | ||
122 | CONFIG_BRCMFMAC=m | 123 | CONFIG_BRCMFMAC=m |
123 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | 124 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set |
124 | CONFIG_INPUT_EVDEV=y | 125 | CONFIG_INPUT_EVDEV=y |
@@ -168,6 +169,9 @@ CONFIG_REGULATOR_MC13783=y | |||
168 | CONFIG_REGULATOR_MC13892=y | 169 | CONFIG_REGULATOR_MC13892=y |
169 | CONFIG_MEDIA_SUPPORT=y | 170 | CONFIG_MEDIA_SUPPORT=y |
170 | CONFIG_MEDIA_CAMERA_SUPPORT=y | 171 | CONFIG_MEDIA_CAMERA_SUPPORT=y |
172 | CONFIG_MEDIA_RC_SUPPORT=y | ||
173 | CONFIG_RC_DEVICES=y | ||
174 | CONFIG_IR_GPIO_CIR=y | ||
171 | CONFIG_V4L_PLATFORM_DRIVERS=y | 175 | CONFIG_V4L_PLATFORM_DRIVERS=y |
172 | CONFIG_SOC_CAMERA=y | 176 | CONFIG_SOC_CAMERA=y |
173 | CONFIG_VIDEO_MX3=y | 177 | CONFIG_VIDEO_MX3=y |