Merge branch develop-3.10 into develop-3.10-next

[firefly-linux-kernel-4.4.55.git] / arch / arm / configs / rockchip_defconfig

diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index 4ea09b35ca71e225152a5a5aefd430f27543f64e..7d88cf9d7bc7758d2ee15cf4b3136749537f622f 100644 (file)
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -51,6 +51,7 @@ CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 # CONFIG_CROSS_MEMORY_ATTACH is not set
 CONFIG_CMA=y
+CONFIG_SECCOMP=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ARM_APPENDED_DTB=y
@@ -248,6 +249,7 @@ CONFIG_TUN=y
 # CONFIG_NET_VENDOR_SMSC is not set
 # CONFIG_NET_VENDOR_STMICRO is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
+CONFIG_RK_VMAC_ETH=y
 CONFIG_RK_GMAC_ETH=y
 CONFIG_PPP=y
 CONFIG_PPP_BSDCOMP=y
@@ -350,10 +352,14 @@ CONFIG_BATTERY_RT5025=y
 CONFIG_CHARGER_RT5036=y
 CONFIG_RT_POWER=y
 CONFIG_BATTERY_RICOH619=y
+CONFIG_TEST_POWER=y
 CONFIG_BATTERY_BQ24296=y
 CONFIG_BATTERY_BQ27320=y
 CONFIG_BATTERY_RK30_ADC_FAC=y
 CONFIG_CW2015_BATTERY=y
+CONFIG_BATTERY_RK818=y
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_GPIO=y
 CONFIG_SENSORS_ROCKCHIP_TSADC=y
 CONFIG_THERMAL=y
 CONFIG_MFD_RT5025=y
@@ -381,7 +387,13 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_MEDIA_RC_SUPPORT=y
 CONFIG_MEDIA_CONTROLLER=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
+CONFIG_MEDIA_USB_SUPPORT=y
+CONFIG_USB_VIDEO_CLASS=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_CAMSYS_DRV=y
+CONFIG_FLASHLIGHT=y
+CONFIG_LEDS_RT8547=y
+CONFIG_RK30_CAMERA_ONEFRAME=y
 CONFIG_MALI_MIDGARD=m
 CONFIG_MALI_MIDGARD_DVFS=y
 CONFIG_MALI_MIDGARD_RT_PM=y
@@ -401,6 +413,7 @@ CONFIG_BACKLIGHT_PWM=y
 CONFIG_FB_ROCKCHIP=y
 CONFIG_LCDC_RK3188=y
 CONFIG_LCDC_RK3288=y
+CONFIG_LCDC_RK3036=y
 CONFIG_LCDC_RK312X=y
 CONFIG_RK_TRSM=y
 CONFIG_RK32_LVDS=y
@@ -412,9 +425,6 @@ CONFIG_RK_TVENCODER=y
 CONFIG_RK3036_TV_ENCODER=y
 CONFIG_ROCKCHIP_RGA=y
 CONFIG_ROCKCHIP_RGA2=y
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
 CONFIG_SOUND=y
 CONFIG_SND=y
 # CONFIG_SND_SUPPORT_OLD_API is not set
@@ -426,8 +436,10 @@ CONFIG_SND_USB_AUDIO=y
 CONFIG_SND_SOC=y
 CONFIG_SND_RK_SOC=y
 CONFIG_SND_RK_SOC_HDMI_I2S=y
+CONFIG_SND_RK_SOC_SPDIF_CARD=y
 CONFIG_SND_RK_SOC_RT5631=y
 CONFIG_SND_RK_SOC_RT3224=y
+CONFIG_SND_RK_SOC_RK3036=y
 CONFIG_SND_RK_SOC_RK312X=y
 CONFIG_HID_BATTERY_STRENGTH=y
 CONFIG_HIDRAW=y
@@ -499,6 +511,8 @@ CONFIG_USB_HIDDEV=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_RK=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_RK=y
 CONFIG_USB_ACM=y
 CONFIG_USB_PRINTER=y
 CONFIG_USB_STORAGE=y