Merge branch 'develop-3.10-next' of 10.10.10.29:rk/kernel into develop-3.10-next

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

diff --git a/arch/arm64/configs/rockchip_defconfig b/arch/arm64/configs/rockchip_defconfig
index 44f5f8b506e893462ee5291d8418510e1207da2e..1ffd052199c6d7a3425300538f74ed313a66940d 100644 (file)
--- a/arch/arm64/configs/rockchip_defconfig
+++ b/arch/arm64/configs/rockchip_defconfig
@@ -64,6 +64,8 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_ARM_BIG_LITTLE_CPUFREQ=y
 CONFIG_ARM_DT_BL_CPUFREQ=y
+# CONFIG_ARM_ROCKCHIP_CPUFREQ is not set
+CONFIG_ARM_ROCKCHIP_BL_CPUFREQ=y
 CONFIG_CPU_IDLE=y
 CONFIG_ARM64_CPUIDLE=y
 CONFIG_NET=y
@@ -341,11 +343,13 @@ 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_POWER_RESET_GPIO=y
+CONFIG_POWER_RESET_ROCKCHIP=y
 CONFIG_POWER_AVS=y
 CONFIG_ROCKCHIP_IODOMAIN=y
 CONFIG_SENSORS_ROCKCHIP_TSADC=y
@@ -392,8 +396,6 @@ CONFIG_RK31XX_LVDS=y
 CONFIG_DP_ANX6345=y
 CONFIG_RK32_DP=y
 CONFIG_RK_HDMI=y
-# CONFIG_HDMI_RK3288 is not set
-# CONFIG_HDMI_RK3036 is not set
 CONFIG_RK_TVENCODER=y
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
@@ -483,6 +485,9 @@ CONFIG_USB_HIDDEV=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_RK=y
+CONFIG_USB_EHCI_HCD_PLATFORM=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
 CONFIG_USB_ACM=y
 CONFIG_USB_PRINTER=y
 CONFIG_USB_STORAGE=y