From 0f640bf3b5a0039513ffcba0fd1bf3ca3e74d609 Mon Sep 17 00:00:00 2001 From: Lin Jianhua Date: Tue, 30 Aug 2022 14:15:48 +0800 Subject: [PATCH] arm64: configs: update some configs for px30_linux_defconfig 1: enable CONFIG_EXTCON for usb 2: enable CONFIG_PHY_ROCKCHIP_CSI2_DPHY/CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY for display 3: enable CONFIG_VIDEO_ROCKCHIP_CIF/CONFIG_VIDEO_ROCKCHIP_RKISP1 for camera 4: enable CONFIG_ROCKCHIP_MPP_RKVDEC/CONFIG_ROCKCHIP_MPP_VDPU2/CONFIG_ROCKCHIP_MPP_VEPU2 for mpp 5: other sync from linux-4.4 Signed-off-by: Lin Jianhua Change-Id: Iee7a5d7445e3c70178bfab1c81a7b94878a9070a --- arch/arm64/configs/px30_linux_defconfig | 74 +++++++++---------------- 1 file changed, 26 insertions(+), 48 deletions(-) diff --git a/arch/arm64/configs/px30_linux_defconfig b/arch/arm64/configs/px30_linux_defconfig index 79d592b70b34..518854521dc1 100644 --- a/arch/arm64/configs/px30_linux_defconfig +++ b/arch/arm64/configs/px30_linux_defconfig @@ -25,10 +25,6 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_PARTITION_ADVANCED=y CONFIG_ARCH_ROCKCHIP=y -CONFIG_PCI=y -CONFIG_PCI_MSI=y -CONFIG_PCIEPORTBUS=y -CONFIG_PCIEASPM_POWERSAVE=y # CONFIG_ARM64_ERRATUM_826319 is not set # CONFIG_ARM64_ERRATUM_827319 is not set # CONFIG_ARM64_ERRATUM_824069 is not set @@ -56,6 +52,8 @@ CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y CONFIG_CPU_IDLE=y CONFIG_ARM_CPUIDLE=y CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_TIMES=y CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y @@ -104,6 +102,7 @@ CONFIG_MAC80211_DEBUGFS=y CONFIG_MAC80211_DEBUG_MENU=y CONFIG_MAC80211_VERBOSE_DEBUG=y CONFIG_RFKILL=y +CONFIG_RFKILL_RK=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_DTC_SYMBOLS=y @@ -114,14 +113,11 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=1 CONFIG_BLK_DEV_NVME=y -CONFIG_ROCKCHIP_SCR=y -CONFIG_SRAM=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SR=y CONFIG_SCSI_SCAN_ASYNC=y CONFIG_SCSI_SPI_ATTRS=y -CONFIG_MD=y CONFIG_NETDEVICES=y # CONFIG_NET_VENDOR_3COM is not set # CONFIG_NET_VENDOR_ADAPTEC is not set @@ -182,12 +178,13 @@ CONFIG_USB_NET_CDC_MBIM=y CONFIG_LIBERTAS_THINFIRM=y CONFIG_USB_NET_RNDIS_WLAN=y CONFIG_WL_ROCKCHIP=y -CONFIG_WIFI_LOAD_DRIVER_WHEN_KERNEL_BOOTUP=y -CONFIG_AP6XXX=y -CONFIG_RTL8188EU=y +CONFIG_WIFI_BUILD_MODULE=y +CONFIG_AP6XXX=m +CONFIG_RTL8188EU=m CONFIG_MWIFIEX=y CONFIG_MWIFIEX_SDIO=y CONFIG_INPUT_FF_MEMLESS=y +CONFIG_INPUT_MATRIXKMAP=y # CONFIG_INPUT_MOUSEDEV is not set CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_ADC=y @@ -195,7 +192,6 @@ CONFIG_KEYBOARD_ADC=y CONFIG_KEYBOARD_GPIO=y CONFIG_KEYBOARD_GPIO_POLLED=y CONFIG_KEYBOARD_ROCKCHIP=y -CONFIG_KEYBOARD_CROS_EC=y # CONFIG_MOUSE_PS2 is not set CONFIG_MOUSE_CYAPA=y CONFIG_MOUSE_ELAN_I2C=y @@ -210,37 +206,35 @@ CONFIG_TOUCHSCREEN_GT1X=y CONFIG_ROCKCHIP_REMOTECTL=y CONFIG_ROCKCHIP_REMOTECTL_PWM=y CONFIG_INPUT_MISC=y -CONFIG_INPUT_RK8XX_PWRKEY=y CONFIG_INPUT_UINPUT=y +CONFIG_INPUT_RK805_PWRKEY=y CONFIG_INPUT_GPIO=y # CONFIG_SERIO is not set +CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_DEVPTS_MULTIPLE_INSTANCES=y # CONFIG_LEGACY_PTYS is not set # CONFIG_DEVKMEM is not set CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y # CONFIG_SERIAL_8250_PCI is not set -CONFIG_SERIAL_8250_NR_UARTS=5 -CONFIG_SERIAL_8250_RUNTIME_UARTS=5 +CONFIG_SERIAL_8250_NR_UARTS=6 +CONFIG_SERIAL_8250_RUNTIME_UARTS=6 CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_HW_RANDOM=y -CONFIG_TCG_TPM=y -CONFIG_TCG_TIS_I2C_INFINEON=y +CONFIG_HW_RANDOM_ROCKCHIP=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_MUX=y CONFIG_I2C_RK3X=y -CONFIG_I2C_CROS_EC_TUNNEL=y CONFIG_SPI=y CONFIG_SPI_BITBANG=y CONFIG_SPI_ROCKCHIP=y CONFIG_SPI_SPIDEV=y +CONFIG_PINCTRL_RK805=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_GENERIC_PLATFORM=y -CONFIG_GPIO_RK8XX=y CONFIG_BATTERY_SBS=y CONFIG_CHARGER_GPIO=y -CONFIG_CHARGER_BQ24735=y CONFIG_BATTERY_RK817=y CONFIG_CHARGER_RK817=y CONFIG_POWER_RESET_GPIO=y @@ -258,23 +252,15 @@ CONFIG_DEVFREQ_THERMAL=y CONFIG_ROCKCHIP_THERMAL=y CONFIG_WATCHDOG=y CONFIG_DW_WATCHDOG=y -CONFIG_MFD_CROS_EC=y -CONFIG_MFD_CROS_EC_SPI=y CONFIG_MFD_RK808=y -CONFIG_MFD_TPS6586X=y CONFIG_REGULATOR=y CONFIG_REGULATOR_DEBUG=y 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 CONFIG_REGULATOR_RK818=y -CONFIG_REGULATOR_TPS6586X=y -CONFIG_REGULATOR_XZ3216=y CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_RC_SUPPORT=y @@ -293,10 +279,9 @@ CONFIG_USB_VIDEO_CLASS=y # CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV is not set # CONFIG_USB_GSPCA is not set CONFIG_V4L_PLATFORM_DRIVERS=y -CONFIG_SOC_CAMERA=y -CONFIG_VIDEO_ROCKCHIP_ISP1=y +CONFIG_VIDEO_ROCKCHIP_CIF=y +CONFIG_VIDEO_ROCKCHIP_RKISP1=y CONFIG_V4L_MEM2MEM_DRIVERS=y -CONFIG_VIDEO_ROCKCHIP_RGA=y # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set # CONFIG_VIDEO_IR_I2C is not set CONFIG_VIDEO_OV5695=y @@ -311,7 +296,6 @@ CONFIG_DRM_ROCKCHIP=y CONFIG_ROCKCHIP_DW_MIPI_DSI=y CONFIG_ROCKCHIP_ANALOGIX_DP=y CONFIG_ROCKCHIP_LVDS=y -CONFIG_ROCKCHIP_DRM_TVE=y CONFIG_DRM_PANEL_SIMPLE=y CONFIG_MALI_PWRSOFT_765=y CONFIG_MALI_BIFROST=y @@ -323,10 +307,13 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y # CONFIG_LCD_CLASS_DEVICE is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_PWM=y +CONFIG_ROCKCHIP_MULTI_RGA=y CONFIG_RK_VCODEC=y CONFIG_ROCKCHIP_MPP_SERVICE=y CONFIG_ROCKCHIP_MPP_DEVICE=y -CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_ROCKCHIP_MPP_RKVDEC=y +CONFIG_ROCKCHIP_MPP_VDPU2=y +CONFIG_ROCKCHIP_MPP_VEPU2=y CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_SEQUENCER=y @@ -334,21 +321,13 @@ CONFIG_SND_SEQ_DUMMY=y CONFIG_SND_HRTIMER=y CONFIG_SND_DYNAMIC_MINORS=y # CONFIG_SND_SUPPORT_OLD_API is not set -# CONFIG_SND_PROC_FS is not set # CONFIG_SND_PCI is not set # CONFIG_SND_SPI is not set CONFIG_SND_USB_AUDIO=y CONFIG_SND_SOC=y CONFIG_SND_SOC_ROCKCHIP=y -CONFIG_SND_SOC_ROCKCHIP_SPDIF=y -CONFIG_SND_SOC_ROCKCHIP_MAX98090=y -CONFIG_SND_SOC_ROCKCHIP_RT5645=y -CONFIG_SND_SOC_ES8316=y +CONFIG_SND_SOC_ROCKCHIP_I2S=y CONFIG_SND_SOC_RK817=y -CONFIG_SND_SOC_RT5616=y -CONFIG_SND_SOC_RT5640=y -CONFIG_SND_SOC_RT5651=y -CONFIG_SND_SOC_SPDIF=y CONFIG_SND_SIMPLE_CARD=y CONFIG_HID_BATTERY_STRENGTH=y CONFIG_HIDRAW=y @@ -389,12 +368,10 @@ CONFIG_USB_CONFIGFS_ACM=y CONFIG_USB_CONFIGFS_MASS_STORAGE=y CONFIG_USB_CONFIGFS_F_FS=y CONFIG_USB_CONFIGFS_UEVENT=y +CONFIG_USB_CONFIGFS_F_UVC=y CONFIG_MMC=y CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_TEST=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_MMC_SDHCI_OF_ARASAN=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_NEW_LEDS=y @@ -402,7 +379,6 @@ CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=y CONFIG_LEDS_IS31FL32XX=y CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_HYM8563=y CONFIG_RTC_DRV_RK808=y CONFIG_DMADEVICES=y CONFIG_PL330_DMA=y @@ -434,6 +410,7 @@ CONFIG_DEVFREQ_GOV_USERSPACE=y CONFIG_ARM_ROCKCHIP_BUS_DEVFREQ=y CONFIG_ARM_ROCKCHIP_DMC_DEVFREQ=y CONFIG_PM_DEVFREQ_EVENT=y +CONFIG_EXTCON=y CONFIG_MEMORY=y CONFIG_IIO=y CONFIG_IIO_BUFFER=y @@ -444,16 +421,16 @@ CONFIG_SENSORS_TSL2563=y CONFIG_IIO_SYSFS_TRIGGER=y CONFIG_PWM=y CONFIG_PWM_ROCKCHIP=y -CONFIG_PHY_ROCKCHIP_USB=y +CONFIG_PHY_ROCKCHIP_CSI2_DPHY=y CONFIG_PHY_ROCKCHIP_INNO_USB2=y -CONFIG_PHY_ROCKCHIP_EMMC=y -CONFIG_PHY_ROCKCHIP_DP=y +CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=y CONFIG_PHY_ROCKCHIP_INNO_VIDEO_COMBO_PHY=y CONFIG_ANDROID=y CONFIG_NVMEM=y CONFIG_ROCKCHIP_OTP=y CONFIG_ROCKCHIP_SIP=y # CONFIG_ACPI is not set +CONFIG_RK_HEADSET=y CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y @@ -497,6 +474,7 @@ CONFIG_BLK_DEV_IO_TRACE=y CONFIG_LKDTM=y CONFIG_STRICT_DEVMEM=y CONFIG_DEBUG_SET_MODULE_RONX=y +CONFIG_SECURITYFS=y # CONFIG_CRYPTO_ECHAINIV is not set CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_SHA1=y