86v:电池检测，摄像头的整理修改

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

diff --git a/arch/arm/configs/rk3126_86v_defconfig b/arch/arm/configs/rk3126_86v_defconfig
index 74f3989490a308499870f09d7361c607a67384f2..c42a54bee3908efe078bf8f22d498078c9d6f3f3 100755 (executable)
--- a/arch/arm/configs/rk3126_86v_defconfig
+++ b/arch/arm/configs/rk3126_86v_defconfig
@@ -210,6 +210,7 @@ CONFIG_RFKILL=y
 CONFIG_RFKILL_RK=y
 CONFIG_DEVTMPFS=y
 CONFIG_DMA_CMA=y
+CONFIG_CMA_SIZE_MBYTES=4
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_UID_STAT=y
 CONFIG_SRAM=y
@@ -332,6 +333,10 @@ CONFIG_SPI_ROCKCHIP_DMA=y
 CONFIG_SPI_ROCKCHIP_TEST=y
 CONFIG_DEBUG_GPIO=y
 CONFIG_GPIO_SYSFS=y
+CONFIG_CHARGER_RT5025=y
+CONFIG_BATTERY_RT5025=y
+CONFIG_CHARGER_RT5036=y
+CONFIG_RT_POWER=y
 CONFIG_BATTERY_RICOH619=y
 CONFIG_BATTERY_BQ24296=y
 CONFIG_BATTERY_BQ27320=y
@@ -339,6 +344,13 @@ CONFIG_BATTERY_RK30_ADC_FAC=y
 CONFIG_CW2015_BATTERY=y
 CONFIG_SENSORS_ROCKCHIP_TSADC=y
 CONFIG_THERMAL=y
+CONFIG_MFD_RT5025=y
+CONFIG_MISC_RT5025=y
+CONFIG_IRQ_RT5025=y
+CONFIG_DEBUG_RT5025=y
+CONFIG_MFD_RT5036=y
+CONFIG_MISC_RT5036=y
+CONFIG_IRQ_RT5036=y
 CONFIG_MFD_RK808=y
 CONFIG_MFD_RK818=y
 CONFIG_MFD_RICOH619=y
@@ -346,6 +358,8 @@ CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_ACT8846=y
 CONFIG_ACT8846_SUPPORT_RESET=y
+CONFIG_REGULATOR_RT5025=y
+CONFIG_REGULATOR_RT5036=y
 CONFIG_ROCKCHIP_PWM_REGULATOR=y
 CONFIG_REGULATOR_SYR82X=y
 CONFIG_REGULATOR_RICOH619=y
@@ -358,6 +372,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_GC0308=y
 # CONFIG_GC0329 is not set
 CONFIG_GC2035=y
+# CONFIG_OV2659 is not set
 CONFIG_MALI_MIDGARD=m
 CONFIG_MALI_MIDGARD_DVFS=y
 CONFIG_MALI_MIDGARD_RT_PM=y
@@ -517,6 +532,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 CONFIG_SWITCH=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HYM8563=y
+CONFIG_RTC_RT5036=y
 CONFIG_RTC_DRV_RC5T619=y
 CONFIG_STAGING=y
 CONFIG_ZSMALLOC=y