ARM64: dts: rk3399-android: disable hdmi sound default

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

diff --git a/arch/arm64/configs/rockchip_cros_defconfig b/arch/arm64/configs/rockchip_cros_defconfig
index e6c1218ec874ed35a7be316ea0c5ef69ae415e45..584a12d04e097cd7b34557da865242b952e1243a 100644 (file)
--- a/arch/arm64/configs/rockchip_cros_defconfig
+++ b/arch/arm64/configs/rockchip_cros_defconfig
@@ -327,7 +327,8 @@ CONFIG_POWER_AVS=y
 CONFIG_ROCKCHIP_IODOMAIN=y
 CONFIG_THERMAL=y
 CONFIG_THERMAL_WRITABLE_TRIPS=y
-CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
+CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_CPU_THERMAL=y
 CONFIG_DEVFREQ_THERMAL=y
 CONFIG_ROCKCHIP_THERMAL=y
@@ -338,6 +339,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_ACT8865=y
 CONFIG_REGULATOR_FAN53555=y
 CONFIG_REGULATOR_GPIO=y
+CONFIG_REGULATOR_LP8752=y
 CONFIG_REGULATOR_MP8865=y
 CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_RK808=y
@@ -359,9 +361,7 @@ CONFIG_ROCKCHIP_DW_HDMI=y
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_ANALOGIX_DP=y
 CONFIG_DRM_PANEL_SIMPLE=y
-CONFIG_POWERVR_ROGUE_M=y
 CONFIG_MALI_MIDGARD=y
-CONFIG_MALI_MIDGARD_DEBUG_SYS=y
 CONFIG_MALI_DEVFREQ=y
 CONFIG_MALI_EXPERT=y
 CONFIG_MALI_DEBUG_SHADER_SPLIT_FS=y