From 30e227faa36b9f0ca817f9574deaeafd4c717539 Mon Sep 17 00:00:00 2001 From: Ziyuan Xu Date: Wed, 17 Apr 2019 14:55:56 +0800 Subject: [PATCH] arm64: config: remove non-related for px30/rk3326 Change-Id: I42de5c57cf32c146b02c1e11213e4d84ea9d41f2 Signed-off-by: Ziyuan Xu --- arch/arm64/configs/px30_linux_defconfig | 72 ++----------------- arch/arm64/configs/px30_linux_robot_defconfig | 17 ++--- arch/arm64/configs/rk3326_linux_defconfig | 40 ++--------- .../configs/rk3326_linux_robot_defconfig | 19 ++--- 4 files changed, 19 insertions(+), 129 deletions(-) diff --git a/arch/arm64/configs/px30_linux_defconfig b/arch/arm64/configs/px30_linux_defconfig index 2dc0f4449e3d..bd854db38e9b 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 @@ -111,63 +107,32 @@ CONFIG_ZRAM=y 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 -# CONFIG_NET_VENDOR_AGERE is not set -# CONFIG_NET_VENDOR_ALTEON is not set # CONFIG_NET_VENDOR_AMD is not set # CONFIG_NET_VENDOR_ARC is not set -# CONFIG_NET_VENDOR_ATHEROS is not set # CONFIG_NET_CADENCE is not set # CONFIG_NET_VENDOR_BROADCOM is not set -# CONFIG_NET_VENDOR_BROCADE is not set -# CONFIG_NET_VENDOR_CAVIUM is not set -# CONFIG_NET_VENDOR_CHELSIO is not set -# CONFIG_NET_VENDOR_CISCO is not set -# CONFIG_NET_VENDOR_DEC is not set -# CONFIG_NET_VENDOR_DLINK is not set -# CONFIG_NET_VENDOR_EMULEX is not set # CONFIG_NET_VENDOR_EZCHIP is not set -# CONFIG_NET_VENDOR_EXAR is not set # CONFIG_NET_VENDOR_HISILICON is not set -# CONFIG_NET_VENDOR_HP is not set # CONFIG_NET_VENDOR_INTEL is not set # CONFIG_NET_VENDOR_MARVELL is not set -# CONFIG_NET_VENDOR_MELLANOX is not set # CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICROCHIP is not set -# CONFIG_NET_VENDOR_MYRI is not set # CONFIG_NET_VENDOR_NATSEMI is not set -# CONFIG_NET_VENDOR_NVIDIA is not set -# CONFIG_NET_VENDOR_OKI is not set -# CONFIG_NET_PACKET_ENGINE is not set -# CONFIG_NET_VENDOR_QLOGIC is not set # CONFIG_NET_VENDOR_QUALCOMM is not set -# CONFIG_NET_VENDOR_REALTEK is not set # CONFIG_NET_VENDOR_RENESAS is not set -# CONFIG_NET_VENDOR_RDC is not set # CONFIG_NET_VENDOR_ROCKER is not set # CONFIG_NET_VENDOR_SAMSUNG is not set # CONFIG_NET_VENDOR_SEEQ is not set -# CONFIG_NET_VENDOR_SILAN is not set -# CONFIG_NET_VENDOR_SIS is not set # CONFIG_NET_VENDOR_SMSC is not set CONFIG_STMMAC_ETH=y # CONFIG_DWMAC_GENERIC is not set -# CONFIG_NET_VENDOR_SUN is not set # CONFIG_NET_VENDOR_SYNOPSYS is not set -# CONFIG_NET_VENDOR_TEHUTI is not set -# CONFIG_NET_VENDOR_TI is not set # CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_WIZNET is not set CONFIG_ROCKCHIP_PHY=y @@ -186,6 +151,7 @@ CONFIG_RTL8188EU=y 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 @@ -193,7 +159,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 @@ -217,7 +182,6 @@ CONFIG_DEVPTS_MULTIPLE_INSTANCES=y # 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_DW=y @@ -228,7 +192,6 @@ CONFIG_TCG_TIS_I2C_INFINEON=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 @@ -237,9 +200,7 @@ CONFIG_DEBUG_GPIO=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 @@ -257,24 +218,16 @@ 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_FUSB_30X=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 @@ -305,7 +258,6 @@ CONFIG_VIDEO_ROCKCHIP_PREISP=y # CONFIG_DVB_AU8522_V4L is not set # CONFIG_DVB_TUNER_DIB0070 is not set # CONFIG_DVB_TUNER_DIB0090 is not set -# CONFIG_VGA_ARB is not set CONFIG_DRM=y CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_DMA_SYNC=y @@ -338,20 +290,12 @@ 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 @@ -368,7 +312,6 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_HCD_PLATFORM=y CONFIG_USB_OHCI_HCD=y -# CONFIG_USB_OHCI_HCD_PCI is not set CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_USB_ACM=y CONFIG_USB_STORAGE=y @@ -395,9 +338,6 @@ CONFIG_USB_CONFIGFS_UEVENT=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 @@ -405,7 +345,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 @@ -418,7 +357,7 @@ CONFIG_FIQ_DEBUGGER_NO_SLEEP=y CONFIG_FIQ_DEBUGGER_CONSOLE=y CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y CONFIG_COMMON_CLK_RK808=y -CONFIG_MAILBOX=y +# CONFIG_COMMON_CLK_XGENE is not set CONFIG_ROCKCHIP_IOMMU=y CONFIG_ROCKCHIP_PM_DOMAINS=y CONFIG_ROCKCHIP_PVTM=y @@ -439,16 +378,13 @@ CONFIG_SENSORS_TSL2563=y CONFIG_IIO_SYSFS_TRIGGER=y CONFIG_PWM=y CONFIG_PWM_ROCKCHIP=y -CONFIG_PHY_ROCKCHIP_USB=y CONFIG_PHY_ROCKCHIP_INNO_USB2=y -CONFIG_PHY_ROCKCHIP_EMMC=y -CONFIG_PHY_ROCKCHIP_DP=y CONFIG_PHY_ROCKCHIP_INNO_VIDEO_COMBO_PHY=y +CONFIG_RAS=y CONFIG_ANDROID=y CONFIG_NVMEM=y CONFIG_ROCKCHIP_OTP=y CONFIG_ROCKCHIP_SIP=y -# CONFIG_ACPI is not set CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y diff --git a/arch/arm64/configs/px30_linux_robot_defconfig b/arch/arm64/configs/px30_linux_robot_defconfig index 16fe0f534b08..153d4c2424d5 100644 --- a/arch/arm64/configs/px30_linux_robot_defconfig +++ b/arch/arm64/configs/px30_linux_robot_defconfig @@ -85,8 +85,6 @@ CONFIG_ZRAM=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=1 -CONFIG_ROCKCHIP_SCR=y -CONFIG_SRAM=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SR=y @@ -135,7 +133,6 @@ CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_TCG_TPM=y CONFIG_TCG_TIS_I2C_INFINEON=y -CONFIG_I2C=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_MUX=y CONFIG_I2C_RK3X=y @@ -193,15 +190,13 @@ CONFIG_VIDEO_GC2155=y # CONFIG_DVB_TUNER_DIB0070 is not set # CONFIG_DVB_TUNER_DIB0090 is not set CONFIG_DRM=y +# CONFIG_DRM_FBDEV_EMULATION is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_DMA_SYNC=y CONFIG_DRM_ROCKCHIP=y -# CONFIG_DRM_FBDEV_EMULATION is not set 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_FOR_LINUX=y CONFIG_MALI_BIFROST=y @@ -219,6 +214,7 @@ CONFIG_SND_SEQ_DUMMY=y CONFIG_SND_HRTIMER=y CONFIG_SND_DYNAMIC_MINORS=y # CONFIG_SND_SUPPORT_OLD_API is not set +# CONFIG_SND_SPI is not set # CONFIG_SND_USB is not set CONFIG_SND_SOC=y CONFIG_SND_SOC_ROCKCHIP=y @@ -250,9 +246,6 @@ CONFIG_USB_CONFIGFS_UEVENT=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 @@ -271,8 +264,10 @@ CONFIG_FIQ_DEBUGGER_CONSOLE=y CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y CONFIG_COMMON_CLK_RK808=y # CONFIG_COMMON_CLK_XGENE is not set -CONFIG_MAILBOX=y CONFIG_ROCKCHIP_IOMMU=y +# CONFIG_CPU_RK3328 is not set +# CONFIG_CPU_RK3368 is not set +# CONFIG_CPU_RK3399 is not set CONFIG_ROCKCHIP_PM_DOMAINS=y CONFIG_ROCKCHIP_PVTM=y CONFIG_ROCKCHIP_SUSPEND_MODE=y @@ -287,9 +282,7 @@ CONFIG_IIO=y CONFIG_ROCKCHIP_SARADC=y CONFIG_PWM=y CONFIG_PWM_ROCKCHIP=y -CONFIG_PHY_ROCKCHIP_USB=y CONFIG_PHY_ROCKCHIP_INNO_USB2=y -CONFIG_PHY_ROCKCHIP_EMMC=y CONFIG_PHY_ROCKCHIP_INNO_MIPI_DPHY=y CONFIG_ANDROID=y CONFIG_NVMEM=y diff --git a/arch/arm64/configs/rk3326_linux_defconfig b/arch/arm64/configs/rk3326_linux_defconfig index 34e18910e14c..baef23a0dc09 100644 --- a/arch/arm64/configs/rk3326_linux_defconfig +++ b/arch/arm64/configs/rk3326_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 @@ -111,9 +107,6 @@ CONFIG_ZRAM=y 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 @@ -138,6 +131,7 @@ CONFIG_RTL8188EU=y 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 @@ -145,7 +139,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 @@ -169,7 +162,6 @@ CONFIG_DEVPTS_MULTIPLE_INSTANCES=y # 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_DW=y @@ -180,7 +172,6 @@ CONFIG_TCG_TIS_I2C_INFINEON=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 @@ -190,9 +181,7 @@ CONFIG_DEBUG_GPIO=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 @@ -210,24 +199,16 @@ 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_FUSB_30X=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 @@ -260,13 +241,11 @@ CONFIG_VIDEO_ROCKCHIP_PREISP=y # CONFIG_DVB_AU8522_V4L is not set # CONFIG_DVB_TUNER_DIB0070 is not set # CONFIG_DVB_TUNER_DIB0090 is not set -# CONFIG_VGA_ARB is not set CONFIG_DRM=y CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_DMA_SYNC=y 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 @@ -293,17 +272,14 @@ 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_I2S=y CONFIG_SND_SOC_ROCKCHIP_MULTI_DAIS=y CONFIG_SND_SOC_ROCKCHIP_PDM=y -CONFIG_SND_SOC_ROCKCHIP_SPDIF=y -CONFIG_SND_SOC_ROCKCHIP_MAX98090=y CONFIG_SND_SOC_ROCKCHIP_MULTICODECS=y -CONFIG_SND_SOC_ROCKCHIP_RT5645=y CONFIG_SND_SOC_RK817=y CONFIG_SND_SIMPLE_CARD=y CONFIG_HID_BATTERY_STRENGTH=y @@ -321,7 +297,6 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_HCD_PLATFORM=y CONFIG_USB_OHCI_HCD=y -# CONFIG_USB_OHCI_HCD_PCI is not set CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_USB_ACM=y CONFIG_USB_STORAGE=y @@ -348,9 +323,6 @@ CONFIG_USB_CONFIGFS_UEVENT=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 @@ -358,7 +330,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 @@ -371,7 +342,7 @@ CONFIG_FIQ_DEBUGGER_NO_SLEEP=y CONFIG_FIQ_DEBUGGER_CONSOLE=y CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y CONFIG_COMMON_CLK_RK808=y -CONFIG_MAILBOX=y +# CONFIG_COMMON_CLK_XGENE is not set CONFIG_ROCKCHIP_IOMMU=y CONFIG_ROCKCHIP_PM_DOMAINS=y CONFIG_ROCKCHIP_PVTM=y @@ -392,16 +363,13 @@ CONFIG_SENSORS_TSL2563=y CONFIG_IIO_SYSFS_TRIGGER=y CONFIG_PWM=y CONFIG_PWM_ROCKCHIP=y -CONFIG_PHY_ROCKCHIP_USB=y CONFIG_PHY_ROCKCHIP_INNO_USB2=y -CONFIG_PHY_ROCKCHIP_EMMC=y -CONFIG_PHY_ROCKCHIP_DP=y CONFIG_PHY_ROCKCHIP_INNO_VIDEO_COMBO_PHY=y +CONFIG_RAS=y CONFIG_ANDROID=y CONFIG_NVMEM=y CONFIG_ROCKCHIP_OTP=y CONFIG_ROCKCHIP_SIP=y -# CONFIG_ACPI is not set CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y diff --git a/arch/arm64/configs/rk3326_linux_robot_defconfig b/arch/arm64/configs/rk3326_linux_robot_defconfig index a34735b68efd..0876e951258e 100644 --- a/arch/arm64/configs/rk3326_linux_robot_defconfig +++ b/arch/arm64/configs/rk3326_linux_robot_defconfig @@ -85,8 +85,6 @@ CONFIG_ZRAM=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=1 -CONFIG_ROCKCHIP_SCR=y -CONFIG_SRAM=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SR=y @@ -135,7 +133,6 @@ CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_TCG_TPM=y CONFIG_TCG_TIS_I2C_INFINEON=y -CONFIG_I2C=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_MUX=y CONFIG_I2C_RK3X=y @@ -192,17 +189,15 @@ CONFIG_VIDEO_GC2155=y # CONFIG_DVB_AU8522_V4L is not set # CONFIG_DVB_TUNER_DIB0070 is not set # CONFIG_DVB_TUNER_DIB0090 is not set -CONFIG_ROCKCHIP_RGB=y CONFIG_DRM=y +# CONFIG_DRM_FBDEV_EMULATION is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_DMA_SYNC=y CONFIG_DRM_ROCKCHIP=y -# CONFIG_DRM_FBDEV_EMULATION is not set 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_ROCKCHIP_RGB=y CONFIG_MALI_PWRSOFT_765=y CONFIG_MALI_BIFROST_FOR_LINUX=y CONFIG_MALI_BIFROST=y @@ -220,6 +215,7 @@ CONFIG_SND_SEQ_DUMMY=y CONFIG_SND_HRTIMER=y CONFIG_SND_DYNAMIC_MINORS=y # CONFIG_SND_SUPPORT_OLD_API is not set +# CONFIG_SND_SPI is not set # CONFIG_SND_USB is not set CONFIG_SND_SOC=y CONFIG_SND_SOC_ROCKCHIP=y @@ -251,9 +247,6 @@ CONFIG_USB_CONFIGFS_UEVENT=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 @@ -272,8 +265,10 @@ CONFIG_FIQ_DEBUGGER_CONSOLE=y CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y CONFIG_COMMON_CLK_RK808=y # CONFIG_COMMON_CLK_XGENE is not set -CONFIG_MAILBOX=y CONFIG_ROCKCHIP_IOMMU=y +# CONFIG_CPU_RK3328 is not set +# CONFIG_CPU_RK3368 is not set +# CONFIG_CPU_RK3399 is not set CONFIG_ROCKCHIP_PM_DOMAINS=y CONFIG_ROCKCHIP_PVTM=y CONFIG_ROCKCHIP_SUSPEND_MODE=y @@ -288,9 +283,7 @@ CONFIG_IIO=y CONFIG_ROCKCHIP_SARADC=y CONFIG_PWM=y CONFIG_PWM_ROCKCHIP=y -CONFIG_PHY_ROCKCHIP_USB=y CONFIG_PHY_ROCKCHIP_INNO_USB2=y -CONFIG_PHY_ROCKCHIP_EMMC=y CONFIG_PHY_ROCKCHIP_INNO_MIPI_DPHY=y CONFIG_ANDROID=y CONFIG_NVMEM=y