Revert "Consolidate NanoPi RK3399 settings with ayufan"
This reverts commit e07d12d543.
This commit is contained in:
parent
4910ad2fc2
commit
87071eabeb
@ -1440,7 +1440,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
|
||||
# CONFIG_BLK_DEV_RAM_DAX is not set
|
||||
# CONFIG_CDROM_PKTCDVD is not set
|
||||
CONFIG_ATA_OVER_ETH=m
|
||||
CONFIG_BLK_DEV_RBD=m
|
||||
# CONFIG_BLK_DEV_RBD is not set
|
||||
# CONFIG_BLK_DEV_RSXX is not set
|
||||
CONFIG_BLK_DEV_NVME=y
|
||||
|
||||
@ -2626,7 +2626,7 @@ CONFIG_GENERIC_PINCONF=y
|
||||
# CONFIG_PINCTRL_AMD is not set
|
||||
CONFIG_PINCTRL_ROCKCHIP=y
|
||||
# CONFIG_PINCTRL_SINGLE is not set
|
||||
CONFIG_PINCTRL_RK805=y
|
||||
# CONFIG_PINCTRL_RK805 is not set
|
||||
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
|
||||
CONFIG_ARCH_REQUIRE_GPIOLIB=y
|
||||
CONFIG_GPIOLIB=y
|
||||
@ -3499,8 +3499,8 @@ CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="rk"
|
||||
# CONFIG_MALI_SYSTEM_TRACE is not set
|
||||
# CONFIG_MALI_GPU_MMU_AARCH64 is not set
|
||||
CONFIG_MALI_BIFROST_FOR_ANDROID=y
|
||||
CONFIG_MALI_BIFROST_FOR_LINUX=y
|
||||
CONFIG_MALI_BIFROST=m
|
||||
# CONFIG_MALI_BIFROST_FOR_LINUX is not set
|
||||
# CONFIG_MALI_BIFROST is not set
|
||||
|
||||
#
|
||||
# Frame buffer Devices
|
||||
@ -3600,7 +3600,7 @@ CONFIG_LCD_GENERAL=y
|
||||
#
|
||||
# RGA2
|
||||
#
|
||||
CONFIG_ROCKCHIP_RGA2=y
|
||||
# CONFIG_ROCKCHIP_RGA2 is not set
|
||||
|
||||
#
|
||||
# VCODEC
|
||||
@ -3782,11 +3782,11 @@ CONFIG_SND_SOC_ROCKCHIP_I2S=y
|
||||
CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=m
|
||||
# CONFIG_SND_SOC_ROCKCHIP_MULTI_DAIS is not set
|
||||
# CONFIG_SND_SOC_ROCKCHIP_PDM is not set
|
||||
CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
|
||||
CONFIG_SND_SOC_ROCKCHIP_VAD=m
|
||||
CONFIG_SND_SOC_ROCKCHIP_SPDIF=y
|
||||
# CONFIG_SND_SOC_ROCKCHIP_VAD is not set
|
||||
# CONFIG_SND_SOC_ROCKCHIP_DA7219 is not set
|
||||
CONFIG_SND_SOC_ROCKCHIP_HDMI_ANALOG=m
|
||||
CONFIG_SND_SOC_ROCKCHIP_HDMI_DP=m
|
||||
# CONFIG_SND_SOC_ROCKCHIP_HDMI_ANALOG is not set
|
||||
# CONFIG_SND_SOC_ROCKCHIP_HDMI_DP is not set
|
||||
CONFIG_SND_SOC_ROCKCHIP_MAX98090=y
|
||||
CONFIG_SND_SOC_ROCKCHIP_MULTICODECS=m
|
||||
CONFIG_SND_SOC_ROCKCHIP_RT5645=y
|
||||
@ -4727,8 +4727,7 @@ CONFIG_IOMMU_IOVA=y
|
||||
CONFIG_OF_IOMMU=y
|
||||
CONFIG_IOMMU_DMA=y
|
||||
CONFIG_ROCKCHIP_IOMMU=y
|
||||
CONFIG_RK_IOMMU=y
|
||||
CONFIG_RK_IOVMM=y
|
||||
# CONFIG_RK_IOMMU is not set
|
||||
# CONFIG_ARM_SMMU is not set
|
||||
# CONFIG_ARM_SMMU_V3 is not set
|
||||
|
||||
@ -4777,11 +4776,11 @@ CONFIG_DEVFREQ_GOV_USERSPACE=y
|
||||
#
|
||||
# DEVFREQ Drivers
|
||||
#
|
||||
CONFIG_ARM_ROCKCHIP_BUS_DEVFREQ=y
|
||||
# CONFIG_ARM_ROCKCHIP_BUS_DEVFREQ is not set
|
||||
CONFIG_ARM_ROCKCHIP_DMC_DEVFREQ=y
|
||||
CONFIG_PM_DEVFREQ_EVENT=y
|
||||
CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=y
|
||||
CONFIG_DEVFREQ_EVENT_ROCKCHIP_NOCP=y
|
||||
# CONFIG_DEVFREQ_EVENT_ROCKCHIP_NOCP is not set
|
||||
CONFIG_EXTCON=y
|
||||
|
||||
#
|
||||
@ -5063,7 +5062,7 @@ CONFIG_ANDROID=y
|
||||
# CONFIG_LIBNVDIMM is not set
|
||||
CONFIG_NVMEM=y
|
||||
CONFIG_ROCKCHIP_EFUSE=y
|
||||
CONFIG_ROCKCHIP_OTP=y
|
||||
# CONFIG_ROCKCHIP_OTP is not set
|
||||
# CONFIG_STM is not set
|
||||
# CONFIG_INTEL_TH is not set
|
||||
|
||||
@ -5297,9 +5296,7 @@ CONFIG_SUNRPC_BACKCHANNEL=y
|
||||
CONFIG_SUNRPC_SWAP=y
|
||||
CONFIG_RPCSEC_GSS_KRB5=m
|
||||
# CONFIG_SUNRPC_DEBUG is not set
|
||||
CONFIG_CEPH_FS=m
|
||||
CONFIG_CEPH_FSCACHE=y
|
||||
CONFIG_CEPH_FS_POSIX_ACL=y
|
||||
# CONFIG_CEPH_FS is not set
|
||||
CONFIG_CIFS=m
|
||||
CONFIG_CIFS_STATS=y
|
||||
CONFIG_CIFS_STATS2=y
|
||||
|
||||
Loading…
Reference in New Issue
Block a user