rk292x rk30xx rk31xx : defconfig remove CONFIG_VT

diff --git a/arch/arm/configs/rk2926_sdk_defconfig b/arch/arm/configs/rk2926_sdk_defconfig
index 7b88b91fc24d0e6dbd15a0c36212de85e5f9c265..d94e0d4a7c26524f7655303260a55344bdb97c9b 100644 (file)
--- a/arch/arm/configs/rk2926_sdk_defconfig
+++ b/arch/arm/configs/rk2926_sdk_defconfig
@@ -241,7 +241,7 @@ CONFIG_GS_MMA7660=y
 CONFIG_SENSOR_DEVICE=y
 CONFIG_GSENSOR_DEVICE=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_HW_RANDOM is not set
 CONFIG_I2C=y
@@ -250,7 +250,6 @@ CONFIG_I2C_CHARDEV=y
 CONFIG_I2C0_CONTROLLER_RK30=y
 CONFIG_I2C1_CONTROLLER_RK30=y
 CONFIG_I2C2_CONTROLLER_RK30=y
-CONFIG_ADC_RK30=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_EXPANDED_GPIO_NUM=0
 CONFIG_EXPANDED_GPIO_IRQ_NUM=0
@@ -272,7 +271,6 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_GC0308=y
-CONFIG_GC0308_USER_DEFINED_SERIES=y
 CONFIG_VIDEO_RK29=y
 CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y
@@ -303,6 +301,7 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
+CONFIG_SND_I2SO_USE_DOUBLE_CHANNELS=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK_SOC_RK2928=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y

diff --git a/arch/arm/configs/rk2926_tb_defconfig b/arch/arm/configs/rk2926_tb_defconfig
index cfd4efe304a4d4e98ca12cc42f4d23ca1744d13f..ec1e45d26fc3313924c0ff17e3f2dd1fadf9cfd8 100644 (file)
--- a/arch/arm/configs/rk2926_tb_defconfig
+++ b/arch/arm/configs/rk2926_tb_defconfig
@@ -244,7 +244,7 @@ CONFIG_GS_MMA8452=y
 CONFIG_SENSOR_DEVICE=y
 CONFIG_GSENSOR_DEVICE=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_HW_RANDOM is not set
 CONFIG_I2C=y
@@ -253,7 +253,6 @@ CONFIG_I2C_CHARDEV=y
 CONFIG_I2C0_CONTROLLER_RK30=y
 CONFIG_I2C1_CONTROLLER_RK30=y
 CONFIG_I2C2_CONTROLLER_RK30=y
-CONFIG_ADC_RK30=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_EXPANDED_GPIO_NUM=0
 CONFIG_EXPANDED_GPIO_IRQ_NUM=0
@@ -270,7 +269,6 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_OV2659=y
-CONFIG_SOC_CAMERA_OV5642=y
 CONFIG_VIDEO_RK29=y
 CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y
@@ -299,6 +297,7 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
+CONFIG_SND_I2SO_USE_DOUBLE_CHANNELS=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK_SOC_RK2928=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y

diff --git a/arch/arm/configs/rk2926_v86_defconfig b/arch/arm/configs/rk2926_v86_defconfig
index 83cc8a6669aa96361e8c1ae63237dacfe6f5e25c..4c56aa0eb6c056a43a8365eec58a20feeabf0229 100644 (file)
--- a/arch/arm/configs/rk2926_v86_defconfig
+++ b/arch/arm/configs/rk2926_v86_defconfig
@@ -244,7 +244,7 @@ CONFIG_GS_MMA7660=y
 CONFIG_SENSOR_DEVICE=y
 CONFIG_GSENSOR_DEVICE=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_HW_RANDOM is not set
 CONFIG_I2C=y
@@ -253,7 +253,6 @@ CONFIG_I2C_CHARDEV=y
 CONFIG_I2C0_CONTROLLER_RK30=y
 CONFIG_I2C1_CONTROLLER_RK30=y
 CONFIG_I2C2_CONTROLLER_RK30=y
-CONFIG_ADC_RK30=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_EXPANDED_GPIO_NUM=0
 CONFIG_EXPANDED_GPIO_IRQ_NUM=0
@@ -274,7 +273,6 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_GC0308=y
-CONFIG_GC0308_USER_DEFINED_SERIES=y
 CONFIG_VIDEO_RK29=y
 CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y
@@ -305,6 +303,7 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
+CONFIG_SND_I2SO_USE_DOUBLE_CHANNELS=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK_SOC_RK2928=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y

diff --git a/arch/arm/configs/rk2928_a720_defconfig b/arch/arm/configs/rk2928_a720_defconfig
index cbd1d647908284c9b900204c49b0998a5843452f..34e57a9c172807e6cd22cde59f47cba37b0d6ad3 100644 (file)
--- a/arch/arm/configs/rk2928_a720_defconfig
+++ b/arch/arm/configs/rk2928_a720_defconfig
@@ -242,7 +242,7 @@ CONFIG_GS_MMA7660=y
 CONFIG_SENSOR_DEVICE=y
 CONFIG_GSENSOR_DEVICE=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_HW_RANDOM is not set
 CONFIG_I2C=y
@@ -251,7 +251,6 @@ CONFIG_I2C_CHARDEV=y
 CONFIG_I2C0_CONTROLLER_RK30=y
 CONFIG_I2C1_CONTROLLER_RK30=y
 CONFIG_I2C2_CONTROLLER_RK30=y
-CONFIG_ADC_RK30=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_EXPANDED_GPIO_NUM=0
 CONFIG_EXPANDED_GPIO_IRQ_NUM=0
@@ -270,7 +269,6 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_GC0308=y
-CONFIG_GC0308_USER_DEFINED_SERIES=y
 CONFIG_VIDEO_RK29=y
 CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y
@@ -301,6 +299,7 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
+CONFIG_SND_I2SO_USE_DOUBLE_CHANNELS=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK_SOC_RK2928=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y

diff --git a/arch/arm/configs/rk2928_defconfig b/arch/arm/configs/rk2928_defconfig
index fa612439852a34958ab18a601c809ccf7952314e..55ff0616e2e4ae181bb0d0362e56ba286a24b4ce 100644 (file)
--- a/arch/arm/configs/rk2928_defconfig
+++ b/arch/arm/configs/rk2928_defconfig
@@ -197,7 +197,6 @@ CONFIG_UID_STAT=y
 CONFIG_APANIC=y
 CONFIG_MODEM_SOUND=y
 CONFIG_3G_MODULE=y
-CONFIG_SC6610=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_SCSI_MULTI_LUN=y
@@ -258,7 +257,7 @@ CONFIG_LS_AP321XX=y
 CONFIG_PROXIMITY_DEVICE=y
 CONFIG_PS_AP321XX=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_HW_RANDOM is not set
 CONFIG_I2C=y
@@ -267,7 +266,6 @@ CONFIG_I2C_CHARDEV=y
 CONFIG_I2C0_CONTROLLER_RK30=y
 CONFIG_I2C1_CONTROLLER_RK30=y
 CONFIG_I2C2_CONTROLLER_RK30=y
-CONFIG_ADC_RK30=y
 CONFIG_RK_HEADSET_DET=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_EXPANDED_GPIO_NUM=0
@@ -291,7 +289,6 @@ CONFIG_VIDEO_DEV=y
 CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_OV2659=y
 CONFIG_SOC_CAMERA_GC0308=y
-CONFIG_GC0308_USER_DEFINED_SERIES=y
 CONFIG_SOC_CAMERA_HI704=y
 CONFIG_VIDEO_RK29=y
 CONFIG_VIDEO_RK29_CAMMEM_ION=y
@@ -323,6 +320,7 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
+CONFIG_SND_I2SO_USE_DOUBLE_CHANNELS=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK_SOC_RK2928=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y

diff --git a/arch/arm/configs/rk2928_phonepad_760_defconfig b/arch/arm/configs/rk2928_phonepad_760_defconfig
index 47efe7a81dd1d991d6a2e8b70710c74c272b5508..998f017a1a11d535a58853600120ca1b421f6a2f 100755 (executable)
--- a/arch/arm/configs/rk2928_phonepad_760_defconfig
+++ b/arch/arm/configs/rk2928_phonepad_760_defconfig
@@ -243,7 +243,7 @@ CONFIG_GS_MMA7660=y
 CONFIG_SENSOR_DEVICE=y
 CONFIG_GSENSOR_DEVICE=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
@@ -275,9 +275,8 @@ CONFIG_REGULATOR_TPS65910=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_SOC_CAMERA=y
-CONFIG_SOC_CAMERA_GC2035=y
 CONFIG_SOC_CAMERA_GC0308=y
-CONFIG_GC0308_USER_DEFINED_SERIES=y
+CONFIG_SOC_CAMERA_GC2035=y
 CONFIG_VIDEO_RK29=y
 CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y

diff --git a/arch/arm/configs/rk2928_phonepad_760_hd_defconfig b/arch/arm/configs/rk2928_phonepad_760_hd_defconfig
index 7b49bc8a092f699f6af46a4859add3f7af1ec054..5bf5030f167eb5798a8a7bc02f6f0fede71f6fcf 100755 (executable)
--- a/arch/arm/configs/rk2928_phonepad_760_hd_defconfig
+++ b/arch/arm/configs/rk2928_phonepad_760_hd_defconfig
@@ -243,7 +243,7 @@ CONFIG_GS_MMA7660=y
 CONFIG_SENSOR_DEVICE=y
 CONFIG_GSENSOR_DEVICE=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
@@ -275,9 +275,8 @@ CONFIG_REGULATOR_TPS65910=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_SOC_CAMERA=y
-CONFIG_SOC_CAMERA_GC2035=y
 CONFIG_SOC_CAMERA_GC0308=y
-CONFIG_GC0308_USER_DEFINED_SERIES=y
+CONFIG_SOC_CAMERA_GC2035=y
 CONFIG_VIDEO_RK29=y
 CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y

diff --git a/arch/arm/configs/rk2928_phonepad_defconfig b/arch/arm/configs/rk2928_phonepad_defconfig
index 8bcc680122fa3d54097dc54710b93d46805095ff..f84c904f38c110229c03af00aed8b23555924765 100644 (file)
--- a/arch/arm/configs/rk2928_phonepad_defconfig
+++ b/arch/arm/configs/rk2928_phonepad_defconfig
@@ -195,9 +195,8 @@ CONFIG_MISC_DEVICES=y
 CONFIG_UID_STAT=y
 CONFIG_APANIC=y
 CONFIG_MODEM_SOUND=y
-CONFIG_3G_MODULE=y
-CONFIG_SC6610=y
 CONFIG_AUDIO_SWITCH=y
+CONFIG_3G_MODULE=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_SCSI_MULTI_LUN=y
@@ -251,7 +250,7 @@ CONFIG_LS_AP321XX=y
 CONFIG_PROXIMITY_DEVICE=y
 CONFIG_PS_AP321XX=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
@@ -264,7 +263,6 @@ CONFIG_I2C=y
 CONFIG_I2C0_CONTROLLER_RK30=y
 CONFIG_I2C1_CONTROLLER_RK30=y
 CONFIG_I2C2_CONTROLLER_RK30=y
-CONFIG_ADC_RK30=y
 CONFIG_RK_HEADSET_DET=y
 CONFIG_EXPANDED_GPIO_NUM=0
 CONFIG_EXPANDED_GPIO_IRQ_NUM=0
@@ -313,6 +311,7 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
+CONFIG_SND_I2SO_USE_DOUBLE_CHANNELS=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK_SOC_RK2928=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y

diff --git a/arch/arm/configs/rk2928_sdk_defconfig b/arch/arm/configs/rk2928_sdk_defconfig
index 94fa3920b3f931fc62a0e8b5d253f22fcf142a41..26abb6d4b3c42cbcedc7b94e16431010e794f0f5 100755 (executable)
--- a/arch/arm/configs/rk2928_sdk_defconfig
+++ b/arch/arm/configs/rk2928_sdk_defconfig
@@ -240,7 +240,7 @@ CONFIG_GS_MMA7660=y
 CONFIG_SENSOR_DEVICE=y
 CONFIG_GSENSOR_DEVICE=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_HW_RANDOM is not set
 CONFIG_I2C=y
@@ -249,7 +249,6 @@ CONFIG_I2C_CHARDEV=y
 CONFIG_I2C0_CONTROLLER_RK30=y
 CONFIG_I2C1_CONTROLLER_RK30=y
 CONFIG_I2C2_CONTROLLER_RK30=y
-CONFIG_ADC_RK30=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_EXPANDED_GPIO_NUM=0
 CONFIG_EXPANDED_GPIO_IRQ_NUM=0
@@ -271,7 +270,6 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_GC0308=y
-CONFIG_GC0308_USER_DEFINED_SERIES=y
 CONFIG_VIDEO_RK29=y
 CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y
@@ -302,6 +300,7 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
+CONFIG_SND_I2SO_USE_DOUBLE_CHANNELS=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK_SOC_RK2928=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y

diff --git a/arch/arm/configs/rk2928_tb_defconfig b/arch/arm/configs/rk2928_tb_defconfig
index 9630ec2f22a49c40298cff955f5a65d00ce054b6..cc5b6dc4aac9fe3550b562c022ff969071115d2d 100644 (file)
--- a/arch/arm/configs/rk2928_tb_defconfig
+++ b/arch/arm/configs/rk2928_tb_defconfig
@@ -241,7 +241,7 @@ CONFIG_GS_MMA8452=y
 CONFIG_SENSOR_DEVICE=y
 CONFIG_GSENSOR_DEVICE=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_HW_RANDOM is not set
 CONFIG_I2C=y
@@ -250,7 +250,6 @@ CONFIG_I2C_CHARDEV=y
 CONFIG_I2C0_CONTROLLER_RK30=y
 CONFIG_I2C1_CONTROLLER_RK30=y
 CONFIG_I2C2_CONTROLLER_RK30=y
-CONFIG_ADC_RK30=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_EXPANDED_GPIO_NUM=0
 CONFIG_EXPANDED_GPIO_IRQ_NUM=0
@@ -267,7 +266,6 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_OV2659=y
-CONFIG_SOC_CAMERA_OV5642=y
 CONFIG_VIDEO_RK29=y
 CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y
@@ -296,6 +294,7 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
+CONFIG_SND_I2SO_USE_DOUBLE_CHANNELS=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK_SOC_RK2928=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y

diff --git a/arch/arm/configs/rk3028_tb_defconfig b/arch/arm/configs/rk3028_tb_defconfig
index 6947d4e2a4645d3ba97d214200c57a7996acb4a4..366f037d2d3992e746e8054cb28e7044c09c055a 100755 (executable)
--- a/arch/arm/configs/rk3028_tb_defconfig
+++ b/arch/arm/configs/rk3028_tb_defconfig
@@ -257,7 +257,7 @@ CONFIG_PROXIMITY_DEVICE=y
 CONFIG_PS_AL3006=y
 CONFIG_PS_STK3171=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
@@ -298,7 +298,6 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_OV2659=y
-CONFIG_SOC_CAMERA_OV5642=y
 CONFIG_VIDEO_RK29=y
 CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y
@@ -424,7 +423,6 @@ CONFIG_MTK_COMBO=y
 CONFIG_MTK_COMBO_PLAT_PATH="rockchip"
 CONFIG_MTK_COMBO_COMM=m
 CONFIG_MTK_COMBO_COMM_UART=m
-CONFIG_MTK_COMBO_BT_HW_TEST=m
 CONFIG_MTK_COMBO_BT_HCI=m
 CONFIG_MTK_COMBO_FM=m
 CONFIG_MTK_COMBO_WIFI=m

diff --git a/arch/arm/configs/rk3066_sdk_defconfig b/arch/arm/configs/rk3066_sdk_defconfig
index a0bc12a796dd5ee9cfa2245c974a52469da8577a..beb71fc07a94a63c495f68c3e14b8750aa3ebf52 100644 (file)
--- a/arch/arm/configs/rk3066_sdk_defconfig
+++ b/arch/arm/configs/rk3066_sdk_defconfig
@@ -48,7 +48,6 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPU_FREQ_GOV_HOTPLUG=y
 CONFIG_CPU_IDLE=y
 CONFIG_VFP=y
 CONFIG_NEON=y
@@ -250,7 +249,7 @@ CONFIG_COMPASS_DEVICE=y
 CONFIG_GYROSCOPE_DEVICE=y
 CONFIG_LIGHT_DEVICE=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
@@ -281,7 +280,6 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_OV2659=y
-CONFIG_SOC_CAMERA_OV5642=y
 CONFIG_VIDEO_RK29=y
 CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y
@@ -312,6 +310,7 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
+CONFIG_SND_I2SO_USE_DOUBLE_CHANNELS=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK29_SOC_RT5631=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y

diff --git a/arch/arm/configs/rk3066_z600t_phonepad_defconfig b/arch/arm/configs/rk3066_z600t_phonepad_defconfig
index 81aa90bee80a8e6286f0218f87cd9b2235c2ee74..e2db20055caa43e61c860815a644ca5149764c2f 100644 (file)
--- a/arch/arm/configs/rk3066_z600t_phonepad_defconfig
+++ b/arch/arm/configs/rk3066_z600t_phonepad_defconfig
@@ -48,7 +48,6 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPU_FREQ_GOV_HOTPLUG=y
 CONFIG_CPU_IDLE=y
 CONFIG_VFP=y
 CONFIG_NEON=y
@@ -248,7 +247,7 @@ CONFIG_GS_MMA8452=y
 CONFIG_SENSOR_DEVICE=y
 CONFIG_GSENSOR_DEVICE=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
@@ -290,7 +289,6 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_OV2659=y
-CONFIG_SOC_CAMERA_OV5640=y
 CONFIG_VIDEO_RK29=y
 CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y
@@ -320,6 +318,7 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
+CONFIG_SND_I2SO_USE_DOUBLE_CHANNELS=y
 CONFIG_SND_RK_SOC_I2S2_2CH=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK29_SOC_RT3224=y

diff --git a/arch/arm/configs/rk3066b_m701_defconfig b/arch/arm/configs/rk3066b_m701_defconfig
index ff7b65024776feba1b428f459dd7944133a3423d..0aa28d2f03992f7a2c3a8e48969aa138f77dc98d 100755 (executable)
--- a/arch/arm/configs/rk3066b_m701_defconfig
+++ b/arch/arm/configs/rk3066b_m701_defconfig
@@ -21,7 +21,6 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_ARCH_RK30=y
-CONFIG_DDR_SDRAM_FREQ=300
 # CONFIG_DDR_TEST is not set
 CONFIG_RK_CLOCK_PROC=y
 # CONFIG_RK_CONSOLE_THREAD is not set
@@ -247,7 +246,7 @@ CONFIG_GS_MMA7660=y
 CONFIG_SENSOR_DEVICE=y
 CONFIG_GSENSOR_DEVICE=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
@@ -314,7 +313,6 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
-CONFIG_SND_RK29_SOC_I2S_2CH=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK29_SOC_RK610=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y

diff --git a/arch/arm/configs/rk3066b_sdk_defconfig b/arch/arm/configs/rk3066b_sdk_defconfig
index eb9c68729283186ad5725544582c7450c698fc22..4e1cab5eeb9238f135749aa7d1651f9f2381c0ce 100644 (file)
--- a/arch/arm/configs/rk3066b_sdk_defconfig
+++ b/arch/arm/configs/rk3066b_sdk_defconfig
@@ -256,7 +256,7 @@ CONFIG_PROXIMITY_DEVICE=y
 CONFIG_PS_AL3006=y
 CONFIG_PS_STK3171=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
@@ -292,7 +292,6 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_OV2659=y
-CONFIG_SOC_CAMERA_OV5642=y
 CONFIG_VIDEO_RK29=y
 CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y
@@ -319,7 +318,6 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
-CONFIG_SND_RK29_SOC_I2S_2CH=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK29_SOC_RT5631=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y

diff --git a/arch/arm/configs/rk30_ds1001b_defconfig b/arch/arm/configs/rk30_ds1001b_defconfig
index 97e9341488f09d6302524a29f6dd69a202abf54f..ea18f6910c73dc6a0fe6d68167261e699833836d 100644 (file)
--- a/arch/arm/configs/rk30_ds1001b_defconfig
+++ b/arch/arm/configs/rk30_ds1001b_defconfig
@@ -21,8 +21,6 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_ARCH_RK30=y
-CONFIG_DDR_SDRAM_FREQ=400
-CONFIG_WIFI_CONTROL_FUNC=y
 CONFIG_MACH_RK30_DS1001B=y
 # CONFIG_SWP_EMULATE is not set
 CONFIG_FIQ_DEBUGGER=y
@@ -49,7 +47,6 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPU_FREQ_GOV_HOTPLUG=y
 CONFIG_CPU_IDLE=y
 CONFIG_VFP=y
 CONFIG_NEON=y
@@ -206,7 +203,6 @@ CONFIG_PHYLIB=y
 # CONFIG_NETDEV_10000 is not set
 CONFIG_WLAN_80211=y
 CONFIG_RKWIFI=y
-CONFIG_RK903=y
 CONFIG_USB_USBNET=y
 CONFIG_PPP=y
 CONFIG_PPP_MULTILINK=y
@@ -242,9 +238,8 @@ CONFIG_INPUT_UINPUT=y
 CONFIG_MAG_SENSORS=y
 CONFIG_G_SENSOR_DEVICE=y
 CONFIG_GS_MMA8452=y
-
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
@@ -302,6 +297,7 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
+CONFIG_SND_I2SO_USE_DOUBLE_CHANNELS=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK29_SOC_RT5631=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y

diff --git a/arch/arm/configs/rk30_ds975_defconfig b/arch/arm/configs/rk30_ds975_defconfig
index 52a3968e3b82a0ed33cd0bd0d4cc1c60944a7949..82930e3fc4365fa94f29a282692268ec9fc6db0b 100644 (file)
--- a/arch/arm/configs/rk30_ds975_defconfig
+++ b/arch/arm/configs/rk30_ds975_defconfig
@@ -21,9 +21,8 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_ARCH_RK30=y
-CONFIG_MACH_RK30_DS975=y
 CONFIG_CLK_SWITCH_TO_32K=y
-CONFIG_WIFI_CONTROL_FUNC=y
+CONFIG_MACH_RK30_DS975=y
 CONFIG_FIQ_DEBUGGER=y
 CONFIG_FIQ_DEBUGGER_NO_SLEEP=y
 CONFIG_FIQ_DEBUGGER_CONSOLE=y
@@ -48,7 +47,6 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPU_FREQ_GOV_HOTPLUG=y
 CONFIG_CPU_IDLE=y
 CONFIG_VFP=y
 CONFIG_NEON=y
@@ -257,7 +255,7 @@ CONFIG_PROXIMITY_DEVICE=y
 CONFIG_PS_AL3006=y
 CONFIG_PS_STK3171=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
@@ -320,6 +318,7 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
+CONFIG_SND_I2SO_USE_DOUBLE_CHANNELS=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK29_SOC_RT5631=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y

diff --git a/arch/arm/configs/rk30_phone_a22_defconfig b/arch/arm/configs/rk30_phone_a22_defconfig
index 4fb1f4fbe398b8cbd049d1456efbf971c34dc78f..9107459cffb25427af9d3493666b10a79b409985 100755 (executable)
--- a/arch/arm/configs/rk30_phone_a22_defconfig
+++ b/arch/arm/configs/rk30_phone_a22_defconfig
@@ -24,7 +24,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_ARCH_RK30=y
 CONFIG_DDR_TYPE_LPDDR=y
 CONFIG_DDR_SDRAM_FREQ=300
-CONFIG_WIFI_CONTROL_FUNC=y
 CONFIG_MACH_RK30_PHONE_A22=y
 # CONFIG_SWP_EMULATE is not set
 CONFIG_FIQ_DEBUGGER=y
@@ -235,7 +234,7 @@ CONFIG_GS_MMA8452=y
 CONFIG_GYRO_SENSOR_DEVICE=y
 CONFIG_LIGHT_SENSOR_DEVICE=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
@@ -303,6 +302,7 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
+CONFIG_SND_I2SO_USE_DOUBLE_CHANNELS=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK29_SOC_WM8994=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y

diff --git a/arch/arm/configs/rk30_phone_defconfig b/arch/arm/configs/rk30_phone_defconfig
index adafc70e49ab92287bfeb0f1dbced2d5edb45165..5e6e8a28b354d6eeb82256243f4af782d76e590e 100755 (executable)
--- a/arch/arm/configs/rk30_phone_defconfig
+++ b/arch/arm/configs/rk30_phone_defconfig
@@ -24,7 +24,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_ARCH_RK30=y
 CONFIG_DDR_SDRAM_FREQ=300
 CONFIG_CLK_SWITCH_TO_32K=y
-CONFIG_WIFI_CONTROL_FUNC=y
 CONFIG_MACH_RK30_PHONE=y
 # CONFIG_SWP_EMULATE is not set
 CONFIG_FIQ_DEBUGGER=y
@@ -52,7 +51,6 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPU_FREQ_GOV_HOTPLUG=y
 CONFIG_CPU_IDLE=y
 CONFIG_VFP=y
 CONFIG_NEON=y
@@ -246,7 +244,7 @@ CONFIG_LIGHT_DEVICE=y
 CONFIG_LS_AL3006=y
 CONFIG_LS_STK3171=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
@@ -286,7 +284,6 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_OV7675=y
-CONFIG_SOC_CAMERA_OV5640_FOR_TD8801=y
 CONFIG_VIDEO_RK29=y
 CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y
@@ -312,6 +309,7 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
+CONFIG_SND_I2SO_USE_DOUBLE_CHANNELS=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK29_SOC_AIC3262=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y

diff --git a/arch/arm/configs/rk30_phone_loquat_defconfig b/arch/arm/configs/rk30_phone_loquat_defconfig
index 38d07d1b1f30a60b3d2f9789fe4ef569f1d923a2..11ea580f33b1453f7d08488af5305c193a3ecc75 100755 (executable)
--- a/arch/arm/configs/rk30_phone_loquat_defconfig
+++ b/arch/arm/configs/rk30_phone_loquat_defconfig
@@ -23,9 +23,8 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_ARCH_RK30=y
 CONFIG_DDR_SDRAM_FREQ=300
-CONFIG_WIFI_CONTROL_FUNC=y
-CONFIG_MACH_RK30_PHONE_LOQUAT=y
 CONFIG_CLK_SWITCH_TO_32K=y
+CONFIG_MACH_RK30_PHONE_LOQUAT=y
 # CONFIG_SWP_EMULATE is not set
 CONFIG_FIQ_DEBUGGER=y
 CONFIG_FIQ_DEBUGGER_NO_SLEEP=y
@@ -52,7 +51,6 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPU_FREQ_GOV_HOTPLUG=y
 CONFIG_CPU_IDLE=y
 CONFIG_VFP=y
 CONFIG_NEON=y
@@ -252,7 +250,7 @@ CONFIG_LS_AL3006=y
 CONFIG_PROXIMITY_DEVICE=y
 CONFIG_PS_AL3006=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
@@ -313,6 +311,7 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
+CONFIG_SND_I2SO_USE_DOUBLE_CHANNELS=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK29_SOC_AIC3262=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y

diff --git a/arch/arm/configs/rk30_phonepad_c8003_defconfig b/arch/arm/configs/rk30_phonepad_c8003_defconfig
index ba116d6e1b80b9ba52fefa53dd666b0d7eba18af..4271cc8f0e0cbaa6659653df6e8cc91dfaeb214d 100755 (executable)
--- a/arch/arm/configs/rk30_phonepad_c8003_defconfig
+++ b/arch/arm/configs/rk30_phonepad_c8003_defconfig
@@ -200,8 +200,6 @@ CONFIG_MISC_DEVICES=y
 CONFIG_UID_STAT=y
 CONFIG_APANIC=y
 CONFIG_BP_AUTO=y
-CONFIG_BP_AUTO_MT6229=y
-CONFIG_BP_AUTO_MU509=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_SCSI_MULTI_LUN=y
@@ -268,7 +266,7 @@ CONFIG_COMPASS_DEVICE=y
 CONFIG_GYROSCOPE_DEVICE=y
 CONFIG_LIGHT_DEVICE=y
 CONFIG_LS_ISL29023=y
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
@@ -310,11 +308,8 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_OV2659=y
-CONFIG_SOC_CAMERA_OV5640=y
 CONFIG_SOC_CAMERA_GT2005=y
-CONFIG_GT2005_USER_DEFINED_SERIES=y
 CONFIG_SOC_CAMERA_GC0308=y
-CONFIG_GC0308_USER_DEFINED_SERIES=y
 CONFIG_SOC_CAMERA_GC2035=y
 CONFIG_SOC_CAMERA_HI253=y
 CONFIG_SOC_CAMERA_HI704=y
@@ -347,6 +342,7 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
+CONFIG_SND_I2SO_USE_DOUBLE_CHANNELS=y
 CONFIG_SND_RK_SOC_I2S2_2CH=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK29_SOC_RT5623=y

diff --git a/arch/arm/configs/rk30_phonepad_defconfig b/arch/arm/configs/rk30_phonepad_defconfig
index f90c585e2bf347a53a0e6913662e6522576d7523..d7e4751fcb5df74c9df01391be42055178c218d3 100755 (executable)
--- a/arch/arm/configs/rk30_phonepad_defconfig
+++ b/arch/arm/configs/rk30_phonepad_defconfig
@@ -256,7 +256,7 @@ CONFIG_GS_KXTIK=y
 CONFIG_COMPASS_DEVICE=y
 CONFIG_GYROSCOPE_DEVICE=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
@@ -296,9 +296,7 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_GT2005=y
-CONFIG_GT2005_USER_DEFINED_SERIES=y
 CONFIG_SOC_CAMERA_GC0308=y
-CONFIG_GC0308_USER_DEFINED_SERIES=y
 CONFIG_VIDEO_RK29=y
 CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y
@@ -327,6 +325,7 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
+CONFIG_SND_I2SO_USE_DOUBLE_CHANNELS=y
 CONFIG_SND_RK_SOC_I2S2_2CH=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK29_SOC_RT5623=y
@@ -424,7 +423,6 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER=y
 CONFIG_MTK_COMBO=y
 CONFIG_MTK_COMBO_PLAT_PATH="rockchip"
 CONFIG_MTK_COMBO_COMM=m
-CONFIG_MTK_COMBO_BT_HW_TEST=m
 CONFIG_MTK_COMBO_BT_HCI=m
 CONFIG_MTK_COMBO_FM=m
 CONFIG_MTK_COMBO_WIFI=m

diff --git a/arch/arm/configs/rk30_sdk_defconfig b/arch/arm/configs/rk30_sdk_defconfig
index 1c56cf28e73aa9b15efeeda97e0fd6d1abc2cabe..c704bf0d42ad5d7b5f5643b29094559671dd837a 100644 (file)
--- a/arch/arm/configs/rk30_sdk_defconfig
+++ b/arch/arm/configs/rk30_sdk_defconfig
@@ -21,7 +21,6 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_ARCH_RK30=y
-CONFIG_WIFI_CONTROL_FUNC=y
 CONFIG_FIQ_DEBUGGER=y
 CONFIG_FIQ_DEBUGGER_NO_SLEEP=y
 CONFIG_FIQ_DEBUGGER_CONSOLE=y
@@ -47,7 +46,6 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPU_FREQ_GOV_HOTPLUG=y
 CONFIG_CPU_IDLE=y
 CONFIG_VFP=y
 CONFIG_NEON=y
@@ -255,7 +253,7 @@ CONFIG_PROXIMITY_DEVICE=y
 CONFIG_PS_AL3006=y
 CONFIG_PS_STK3171=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
@@ -286,7 +284,6 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_OV2659=y
-CONFIG_SOC_CAMERA_OV5642=y
 CONFIG_VIDEO_RK29=y
 CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y
@@ -316,6 +313,7 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
+CONFIG_SND_I2SO_USE_DOUBLE_CHANNELS=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK29_SOC_RT5631=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y

diff --git a/arch/arm/configs/rk3108_tb_defconfig b/arch/arm/configs/rk3108_tb_defconfig
index bd8127ff7da438e3b25e8af8f1f0a70df27c08bb..fcafe19be08fa7ac87c295ed12c24a2491f0544b 100644 (file)
--- a/arch/arm/configs/rk3108_tb_defconfig
+++ b/arch/arm/configs/rk3108_tb_defconfig
@@ -255,7 +255,7 @@ CONFIG_PROXIMITY_DEVICE=y
 CONFIG_PS_AL3006=y
 CONFIG_PS_STK3171=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
@@ -291,7 +291,6 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_OV2659=y
-CONFIG_SOC_CAMERA_OV5642=y
 CONFIG_VIDEO_RK29=y
 CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y
@@ -318,7 +317,6 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
-CONFIG_SND_RK29_SOC_I2S_2CH=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK29_SOC_RT5631=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y

diff --git a/arch/arm/configs/rk3168_86v_codec_defconfig b/arch/arm/configs/rk3168_86v_codec_defconfig
index b697eea2de4533c452104bf6eef47bacde6d556c..e2f90584af1e080987a809421fe4d4c0e6774606 100644 (file)
--- a/arch/arm/configs/rk3168_86v_codec_defconfig
+++ b/arch/arm/configs/rk3168_86v_codec_defconfig
@@ -237,7 +237,7 @@ CONFIG_GS_MMA7660=y
 CONFIG_SENSOR_DEVICE=y
 CONFIG_GSENSOR_DEVICE=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y

diff --git a/arch/arm/configs/rk3168_86v_defconfig b/arch/arm/configs/rk3168_86v_defconfig
index 24be9e926567735f03827d930b72a2e5f0058491..f6bf6cdbc50a6159a1c315c56a340c33d3a377ef 100644 (file)
--- a/arch/arm/configs/rk3168_86v_defconfig
+++ b/arch/arm/configs/rk3168_86v_defconfig
@@ -237,7 +237,7 @@ CONFIG_GS_MMA7660=y
 CONFIG_SENSOR_DEVICE=y
 CONFIG_GSENSOR_DEVICE=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y

diff --git a/arch/arm/configs/rk3168_86v_old_defconfig b/arch/arm/configs/rk3168_86v_old_defconfig
index 1ac1d7f40d7bed3e3ea71a89a38c9192c65c5533..36fcb68ee783105aff61e723f8aa0bf764e2c0db 100644 (file)
--- a/arch/arm/configs/rk3168_86v_old_defconfig
+++ b/arch/arm/configs/rk3168_86v_old_defconfig
@@ -238,7 +238,7 @@ CONFIG_GS_MMA7660=y
 CONFIG_SENSOR_DEVICE=y
 CONFIG_GSENSOR_DEVICE=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
@@ -310,7 +310,6 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
-CONFIG_SND_RK29_SOC_I2S_2CH=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK29_SOC_RK610=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y

diff --git a/arch/arm/configs/rk3168_LR097_defconfig b/arch/arm/configs/rk3168_LR097_defconfig
index a21d9446b33d7431b1c12559ccd2ca478002d92c..4bebcd6229ca03ce14b48f65fb6d350c464d8bea 100644 (file)
--- a/arch/arm/configs/rk3168_LR097_defconfig
+++ b/arch/arm/configs/rk3168_LR097_defconfig
@@ -21,11 +21,14 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_ARCH_RK30=y
-CONFIG_DDR_SDRAM_FREQ=360
+CONFIG_DDR_INIT_CHANGE_FREQ=y
+CONFIG_DDR_SDRAM_FREQ=300
+# CONFIG_DDR_TEST is not set
 CONFIG_RK_CLOCK_PROC=y
 CONFIG_CLK_SWITCH_TO_32K=y
+CONFIG_RK30_I2C_INSRAM=y
 CONFIG_SOC_RK3168=y
-CONFIG_MACH_RK3168_LR097=y
+CONFIG_MACH_RK3168_86V=y
 CONFIG_FIQ_DEBUGGER=y
 CONFIG_FIQ_DEBUGGER_NO_SLEEP=y
 CONFIG_FIQ_DEBUGGER_CONSOLE=y
@@ -180,8 +183,9 @@ CONFIG_BT_HCIUART=y
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_LL=y
 CONFIG_BT_HCIBCM4325=y
-CONFIG_BT_AUTOSLEEP=y
 CONFIG_MAC80211=y
+CONFIG_RFKILL=y
+CONFIG_RFKILL_RK=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_FIRMWARE_IN_KERNEL is not set
@@ -236,20 +240,25 @@ CONFIG_TABLET_USB_HANWANG=y
 CONFIG_TABLET_USB_KBTAB=y
 CONFIG_TABLET_USB_WACOM=y
 CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_CT36X_TS=y
+CONFIG_TOUCHSCREEN_GT82X_IIC=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_KEYCHORD=y
 CONFIG_INPUT_UINPUT=y
-CONFIG_GS_MMA8452=y
+CONFIG_GS_LIS3DH=y
+CONFIG_GYRO_L3G4200D=y
 CONFIG_SENSOR_DEVICE=y
 CONFIG_GSENSOR_DEVICE=y
+CONFIG_COMPASS_DEVICE=y
+CONFIG_COMPASS_AK8963=y
+CONFIG_GYROSCOPE_DEVICE=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
 CONFIG_UART0_DMA_RK29=2
 CONFIG_UART3_RK29=y
+CONFIG_UART3_CTS_RTS_RK29=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_I2C=y
 # CONFIG_I2C_COMPAT is not set
@@ -260,7 +269,6 @@ CONFIG_I2C2_CONTROLLER_RK30=y
 CONFIG_I2C3_CONTROLLER_RK30=y
 CONFIG_I2C4_CONTROLLER_RK30=y
 CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_WM831X=y
 CONFIG_EXPANDED_GPIO_NUM=0
 CONFIG_EXPANDED_GPIO_IRQ_NUM=0
 CONFIG_SPI_FPGA_GPIO_NUM=0
@@ -268,11 +276,15 @@ CONFIG_SPI_FPGA_GPIO_IRQ_NUM=0
 CONFIG_POWER_SUPPLY=y
 CONFIG_BATTERY_RK30_ADC_FAC=y
 CONFIG_BATTERY_RK30_AC_CHARGE=y
+CONFIG_BATTERY_RK30_VOL3V8=y
 # CONFIG_HWMON is not set
+CONFIG_WATCHDOG=y
+CONFIG_RK29_WATCHDOG=y
+CONFIG_RK29_FEED_DOG_BY_INTE=y
+CONFIG_RK29_WATCHDOG_ATBOOT=y
+CONFIG_RK29_WATCHDOG_DEFAULT_TIME=5
 CONFIG_MFD_TPS65910=y
 CONFIG_MFD_WM831X_I2C=y
-CONFIG_MFD_TPS65090=y
-CONFIG_MFD_RK610=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_TPS65910=y
 CONFIG_REGULATOR_WM831X=y
@@ -281,24 +293,22 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_OV2659=y
+CONFIG_SOC_CAMERA_GC0308=y
 CONFIG_VIDEO_RK29=y
 CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y
 CONFIG_ION_ROCKCHIP=y
 CONFIG_FB=y
+CONFIG_FB_MODE_HELPERS=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_LCD_CLASS_DEVICE is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_DISPLAY_SUPPORT=y
-CONFIG_LCD_LP097QX1=y
-CONFIG_DP_ANX6345=y
+CONFIG_LCD_RK3168_AUO_A080SN03=y
 CONFIG_FB_ROCKCHIP=y
-CONFIG_DUAL_LCDC_DUAL_DISP_IN_KERNEL=y
+CONFIG_ONE_LCDC_DUAL_OUTPUT_INF=y
 CONFIG_LCDC_RK3066B=y
-CONFIG_LCDC1_RK3066B=y
-CONFIG_RK_HDMI=y
-CONFIG_HDMI_RK610=y
 CONFIG_RGA_RK30=y
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
@@ -311,9 +321,8 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
-CONFIG_SND_RK29_SOC_I2S_2CH=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
-CONFIG_SND_RK29_SOC_RK610=y
+CONFIG_SND_RK29_SOC_ES8323=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y
 CONFIG_UHID=y
 CONFIG_HID_A4TECH=y
@@ -327,7 +336,6 @@ CONFIG_HID_CYPRESS=y
 CONFIG_HID_DRAGONRISE=y
 CONFIG_DRAGONRISE_FF=y
 CONFIG_HID_EMS_FF=y
-CONFIG_HID_ELECOM=y
 CONFIG_HID_EZKEY=y
 CONFIG_HID_KEYTOUCH=y
 CONFIG_HID_KYE=y
@@ -342,7 +350,6 @@ CONFIG_LOGITECH_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIWII_FF=y
-CONFIG_HID_MAGICMOUSE=y
 CONFIG_HID_MICROSOFT=y
 CONFIG_HID_MONTEREY=y
 CONFIG_HID_MULTITOUCH=y
@@ -368,7 +375,6 @@ CONFIG_SMARTJOYPLUS_FF=y
 CONFIG_HID_TOPSEED=y
 CONFIG_HID_THRUSTMASTER=y
 CONFIG_THRUSTMASTER_FF=y
-CONFIG_HID_WACOM=y
 CONFIG_HID_ZEROPLUS=y
 CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=y
@@ -393,7 +399,6 @@ CONFIG_LEDS_GPIO=y
 CONFIG_SWITCH=y
 CONFIG_SWITCH_GPIO=y
 CONFIG_RTC_CLASS=y
-CONFIG_RTC_HYM8563=y
 CONFIG_RTC_DRV_WM831X=y
 CONFIG_TPS65910_RTC=y
 CONFIG_STAGING=y

diff --git a/arch/arm/configs/rk3168_ds1006h_defconfig b/arch/arm/configs/rk3168_ds1006h_defconfig
index 38db4ca62a6cdee7e28796ad1a63e66d5e1692c1..29efe2c53f37af846ff2d70840f85797029336c4 100644 (file)
--- a/arch/arm/configs/rk3168_ds1006h_defconfig
+++ b/arch/arm/configs/rk3168_ds1006h_defconfig
@@ -257,7 +257,7 @@ CONFIG_PROXIMITY_DEVICE=y
 CONFIG_PS_AL3006=y
 CONFIG_PS_STK3171=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
@@ -290,7 +290,6 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_OV2659=y
-CONFIG_SOC_CAMERA_OV5640=y
 CONFIG_VIDEO_RK29=y
 CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y
@@ -324,7 +323,6 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
-CONFIG_SND_RK29_SOC_I2S_2CH=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK29_SOC_RK610=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y

diff --git a/arch/arm/configs/rk3168_ds803f_defconfig b/arch/arm/configs/rk3168_ds803f_defconfig
index 082257431b888c420f6f0ec3fac86231db059495..4bebcd6229ca03ce14b48f65fb6d350c464d8bea 100644 (file)
--- a/arch/arm/configs/rk3168_ds803f_defconfig
+++ b/arch/arm/configs/rk3168_ds803f_defconfig
@@ -252,7 +252,7 @@ CONFIG_COMPASS_DEVICE=y
 CONFIG_COMPASS_AK8963=y
 CONFIG_GYROSCOPE_DEVICE=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y

diff --git a/arch/arm/configs/rk3168_tb_defconfig b/arch/arm/configs/rk3168_tb_defconfig
index ffe05e9248cabd41ca05806dd90e1b4563c11303..194e57138beabab0af09200ac901cf0e1760441d 100755 (executable)
--- a/arch/arm/configs/rk3168_tb_defconfig
+++ b/arch/arm/configs/rk3168_tb_defconfig
@@ -255,7 +255,7 @@ CONFIG_PROXIMITY_DEVICE=y
 CONFIG_PS_AL3006=y
 CONFIG_PS_STK3171=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
@@ -292,7 +292,6 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_OV2659=y
-CONFIG_SOC_CAMERA_OV5642=y
 CONFIG_VIDEO_RK29=y
 CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y
@@ -319,7 +318,6 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
-CONFIG_SND_RK29_SOC_I2S_2CH=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK29_SOC_RT5631=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y

diff --git a/arch/arm/configs/rk3168m_tb_defconfig b/arch/arm/configs/rk3168m_tb_defconfig
index 6d2bc9a130209633b058ffecf95f3b52c569a5c2..4d34e3fecc14b3fa31177b7828976ae52b790a80 100644 (file)
--- a/arch/arm/configs/rk3168m_tb_defconfig
+++ b/arch/arm/configs/rk3168m_tb_defconfig
@@ -255,7 +255,7 @@ CONFIG_PROXIMITY_DEVICE=y
 CONFIG_PS_AL3006=y
 CONFIG_PS_STK3171=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
@@ -293,7 +293,6 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_OV2659=y
-CONFIG_SOC_CAMERA_OV5642=y
 CONFIG_VIDEO_RK29=y
 CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y
@@ -327,7 +326,6 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
-CONFIG_SND_RK29_SOC_I2S_2CH=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK29_SOC_RK610=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y
@@ -423,7 +421,6 @@ CONFIG_MTK_COMBO=y
 CONFIG_MTK_COMBO_PLAT_PATH="rockchip"
 CONFIG_MTK_COMBO_COMM=m
 CONFIG_MTK_COMBO_COMM_UART=m
-CONFIG_MTK_COMBO_BT_HW_TEST=m
 CONFIG_MTK_COMBO_BT_HCI=m
 CONFIG_MTK_COMBO_FM=m
 CONFIG_MTK_COMBO_WIFI=m

diff --git a/arch/arm/configs/rk3188_LR097_defconfig b/arch/arm/configs/rk3188_LR097_defconfig
index 2059cbf4d6f55040b584d30e2910d5b664ec0999..07d89f3c71d3d02021d236241c735f425a97dc55 100644 (file)
--- a/arch/arm/configs/rk3188_LR097_defconfig
+++ b/arch/arm/configs/rk3188_LR097_defconfig
@@ -243,7 +243,7 @@ CONFIG_GS_LIS3DH=y
 CONFIG_SENSOR_DEVICE=y
 CONFIG_GSENSOR_DEVICE=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
@@ -317,7 +317,6 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
-CONFIG_SND_RK29_SOC_I2S_2CH=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK29_SOC_RT5631=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y

diff --git a/arch/arm/configs/rk3188_ds1006h_defconfig b/arch/arm/configs/rk3188_ds1006h_defconfig
index 25ad5570d8e5856a9938c7904a6929cd85a65de3..5397bb94328da5322eda6e7c4960da87982ebcc5 100644 (file)
--- a/arch/arm/configs/rk3188_ds1006h_defconfig
+++ b/arch/arm/configs/rk3188_ds1006h_defconfig
@@ -25,7 +25,6 @@ CONFIG_ARCH_RK3188=y
 CONFIG_RK_CLOCK_PROC=y
 CONFIG_CLK_SWITCH_TO_32K=y
 CONFIG_RK_USB_UART=y
-CONFIG_RK_USB_DETECT_BY_OTG_BVALID=y
 CONFIG_MACH_RK3188_DS1006H=y
 CONFIG_FIQ_DEBUGGER=y
 CONFIG_FIQ_DEBUGGER_NO_SLEEP=y
@@ -252,7 +251,7 @@ CONFIG_COMPASS_DEVICE=y
 CONFIG_COMPASS_AK8963=y
 CONFIG_GYROSCOPE_DEVICE=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
@@ -292,7 +291,6 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_OV2659=y
-CONFIG_SOC_CAMERA_OV5640=y
 CONFIG_VIDEO_RK29=y
 CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y
@@ -325,7 +323,6 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
-CONFIG_SND_RK29_SOC_I2S_2CH=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK29_SOC_RT5631=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y

diff --git a/arch/arm/configs/rk3188_ds1006h_v1_0_defconfig b/arch/arm/configs/rk3188_ds1006h_v1_0_defconfig
index b398557e7b1a74cde38359a6616ce569afeea8c5..a2b9f39987f1e156c067169796089c5534b2e70e 100644 (file)
--- a/arch/arm/configs/rk3188_ds1006h_v1_0_defconfig
+++ b/arch/arm/configs/rk3188_ds1006h_v1_0_defconfig
@@ -256,7 +256,7 @@ CONFIG_PROXIMITY_DEVICE=y
 CONFIG_PS_AL3006=y
 CONFIG_PS_STK3171=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
@@ -289,7 +289,6 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_OV2659=y
-CONFIG_SOC_CAMERA_OV5640=y
 CONFIG_VIDEO_RK29=y
 CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y
@@ -322,7 +321,6 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
-CONFIG_SND_RK29_SOC_I2S_2CH=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK29_SOC_RK610=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y

diff --git a/arch/arm/configs/rk3188_ds1006h_v1_1_defconfig b/arch/arm/configs/rk3188_ds1006h_v1_1_defconfig
index c12b4ad264b9d6cc03a1381e027ba6c115eb4b27..8d55f5d53993907816f04f3b116fb18f623a26c4 100644 (file)
--- a/arch/arm/configs/rk3188_ds1006h_v1_1_defconfig
+++ b/arch/arm/configs/rk3188_ds1006h_v1_1_defconfig
@@ -25,7 +25,6 @@ CONFIG_ARCH_RK3188=y
 CONFIG_RK_CLOCK_PROC=y
 CONFIG_CLK_SWITCH_TO_32K=y
 CONFIG_RK_USB_UART=y
-CONFIG_RK_USB_DETECT_BY_OTG_BVALID=y
 CONFIG_MACH_RK3188_DS1006H=y
 CONFIG_FIQ_DEBUGGER=y
 CONFIG_FIQ_DEBUGGER_NO_SLEEP=y
@@ -253,7 +252,7 @@ CONFIG_GYROSCOPE_DEVICE=y
 CONFIG_LIGHT_DEVICE=y
 CONFIG_LS_PHOTORESISTOR=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
@@ -291,7 +290,6 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_OV2659=y
-CONFIG_SOC_CAMERA_OV5640=y
 CONFIG_VIDEO_RK29=y
 CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y
@@ -324,7 +322,6 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
-CONFIG_SND_RK29_SOC_I2S_2CH=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK29_SOC_RK610=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y

diff --git a/arch/arm/configs/rk3188_jettaplus_defconfig b/arch/arm/configs/rk3188_jettaplus_defconfig
index bad212674187f667ff5d72cc3835923a257041cb..c3b09587bbcebd8f1cec2591dcdbd0671b77421a 100644 (file)
--- a/arch/arm/configs/rk3188_jettaplus_defconfig
+++ b/arch/arm/configs/rk3188_jettaplus_defconfig
@@ -255,7 +255,7 @@ CONFIG_PROXIMITY_DEVICE=y
 CONFIG_PS_AL3006=y
 CONFIG_PS_STK3171=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y

diff --git a/arch/arm/configs/rk3188_sdk_defconfig b/arch/arm/configs/rk3188_sdk_defconfig
index cdfaa9f0a6b6bee532939cd02a86b48636bc8ace..2d00d03f6b2db235325acea3a25019b5ecdd3954 100644 (file)
--- a/arch/arm/configs/rk3188_sdk_defconfig
+++ b/arch/arm/configs/rk3188_sdk_defconfig
@@ -256,7 +256,7 @@ CONFIG_PROXIMITY_DEVICE=y
 CONFIG_PS_AL3006=y
 CONFIG_PS_STK3171=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
@@ -293,7 +293,6 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_OV2659=y
-CONFIG_SOC_CAMERA_OV5642=y
 CONFIG_VIDEO_RK29=y
 CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y

diff --git a/arch/arm/configs/rk3188_tb_defconfig b/arch/arm/configs/rk3188_tb_defconfig
index d6e079a90927e9322e3576aff0bab57954e363e5..c4429348fde4d9a8f466c1a15f0a3279f101e111 100644 (file)
--- a/arch/arm/configs/rk3188_tb_defconfig
+++ b/arch/arm/configs/rk3188_tb_defconfig
@@ -253,7 +253,7 @@ CONFIG_PROXIMITY_DEVICE=y
 CONFIG_PS_AL3006=y
 CONFIG_PS_STK3171=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
@@ -290,7 +290,6 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_OV2659=y
-CONFIG_SOC_CAMERA_OV5642=y
 CONFIG_VIDEO_RK29=y
 CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y
@@ -318,7 +317,6 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
-CONFIG_SND_RK29_SOC_I2S_2CH=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK29_SOC_RT5631=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y

diff --git a/arch/arm/configs/rk3188_u30gt2_defconfig b/arch/arm/configs/rk3188_u30gt2_defconfig
index b9e1178c94e316de21ea3ada6d62365c6fe25619..0873299eaf9b9071edb6953350d24de6ba438c6c 100644 (file)
--- a/arch/arm/configs/rk3188_u30gt2_defconfig
+++ b/arch/arm/configs/rk3188_u30gt2_defconfig
@@ -24,7 +24,6 @@ CONFIG_ARCH_RK3188=y
 # CONFIG_DDR_TEST is not set
 CONFIG_RK_CLOCK_PROC=y
 CONFIG_CLK_SWITCH_TO_32K=y
-CONFIG_RK_USB_DETECT_BY_OTG_BVALID=y
 CONFIG_MACH_RK3188_U30GT2=y
 CONFIG_FIQ_DEBUGGER=y
 CONFIG_FIQ_DEBUGGER_NO_SLEEP=y
@@ -248,7 +247,7 @@ CONFIG_GSENSOR_DEVICE=y
 CONFIG_GYROSCOPE_DEVICE=y
 CONFIG_GYRO_L3G20D=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y
@@ -284,7 +283,6 @@ CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
 CONFIG_SOC_CAMERA=y
 CONFIG_SOC_CAMERA_OV2659=y
-CONFIG_SOC_CAMERA_OV5640=y
 CONFIG_SOC_CAMERA_GC0308=y
 CONFIG_VIDEO_RK29=y
 CONFIG_VIDEO_RK29_CAMMEM_ION=y
@@ -318,7 +316,6 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
-CONFIG_SND_RK29_SOC_I2S_2CH=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK29_SOC_ES8323=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y

diff --git a/arch/arm/configs/rk3188m_tb_defconfig b/arch/arm/configs/rk3188m_tb_defconfig
index a7c60a39954d1e4867f894f440f4717d00fcfd6f..0102ac70c3a05b478d3fc8c443528c0f8cdcc62e 100644 (file)
--- a/arch/arm/configs/rk3188m_tb_defconfig
+++ b/arch/arm/configs/rk3188m_tb_defconfig
@@ -254,7 +254,7 @@ CONFIG_PROXIMITY_DEVICE=y
 CONFIG_PS_AL3006=y
 CONFIG_PS_STK3171=y
 # CONFIG_SERIO is not set
-# CONFIG_CONSOLE_TRANSLATIONS is not set
+# CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_RK29=y
 CONFIG_UART0_RK29=y