Skip to content

Commit badbc99

Browse files
authored
rockchip64-edge: Enable UFS and add power regulators for NanoPi M5 (#8691)
* rockchip64-edge: Enable UFS and add power regulators for NanoPi M5 * rockchip64-edge: cleanup and rewrite using kernel-config
1 parent 74c97b6 commit badbc99

File tree

2 files changed

+95
-89
lines changed

2 files changed

+95
-89
lines changed

config/kernel/linux-rockchip64-edge.config

Lines changed: 18 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# CONFIG_LOCALVERSION_AUTO is not set
22
CONFIG_SYSVIPC=y
33
CONFIG_POSIX_MQUEUE=y
4-
CONFIG_USELIB=y
54
CONFIG_TIME_KUNIT_TEST=m
65
CONFIG_NO_HZ=y
76
CONFIG_HIGH_RES_TIMERS=y
@@ -86,7 +85,6 @@ CONFIG_ARM_SCPI_CPUFREQ=y
8685
CONFIG_VIRTUALIZATION=y
8786
CONFIG_KVM=y
8887
CONFIG_KPROBES=y
89-
CONFIG_JUMP_LABEL=y
9088
CONFIG_MODULES=y
9189
CONFIG_MODULE_UNLOAD=y
9290
CONFIG_MODULE_FORCE_UNLOAD=y
@@ -99,9 +97,6 @@ CONFIG_BINFMT_MISC=m
9997
CONFIG_ZSWAP=y
10098
CONFIG_ZSWAP_DEFAULT_ON=y
10199
CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD=y
102-
CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED=y
103-
CONFIG_ZBUD=y
104-
CONFIG_ZSMALLOC=y
105100
# CONFIG_COMPAT_BRK is not set
106101
CONFIG_KSM=y
107102
CONFIG_TRANSPARENT_HUGEPAGE=y
@@ -114,7 +109,6 @@ CONFIG_NET=y
114109
CONFIG_PACKET=y
115110
CONFIG_PACKET_DIAG=m
116111
CONFIG_UNIX_DIAG=m
117-
CONFIG_TLS=m
118112
CONFIG_TLS_DEVICE=y
119113
CONFIG_XFRM_USER=m
120114
CONFIG_XFRM_INTERFACE=m
@@ -295,6 +289,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m
295289
CONFIG_NETFILTER_XT_MATCH_RATEEST=m
296290
CONFIG_NETFILTER_XT_MATCH_REALM=m
297291
CONFIG_NETFILTER_XT_MATCH_RECENT=m
292+
CONFIG_NETFILTER_XT_MATCH_SCTP=m
298293
CONFIG_NETFILTER_XT_MATCH_SOCKET=m
299294
CONFIG_NETFILTER_XT_MATCH_STATE=m
300295
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
@@ -414,8 +409,6 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
414409
CONFIG_BRIDGE_EBT_SNAT=m
415410
CONFIG_BRIDGE_EBT_LOG=m
416411
CONFIG_BRIDGE_EBT_NFLOG=m
417-
CONFIG_SCTP_DBG_OBJCNT=y
418-
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
419412
CONFIG_RDS=m
420413
CONFIG_RDS_TCP=m
421414
CONFIG_TIPC=m
@@ -431,7 +424,7 @@ CONFIG_L2TP_DEBUGFS=m
431424
CONFIG_L2TP_V3=y
432425
CONFIG_L2TP_IP=m
433426
CONFIG_L2TP_ETH=m
434-
CONFIG_BRIDGE=m
427+
CONFIG_BRIDGE=y
435428
CONFIG_BRIDGE_VLAN_FILTERING=y
436429
CONFIG_NET_DSA=m
437430
CONFIG_NET_DSA_TAG_OCELOT=m
@@ -672,7 +665,7 @@ CONFIG_MTD_HYPERBUS=m
672665
CONFIG_OF_CONFIGFS=y
673666
CONFIG_ZRAM=m
674667
CONFIG_ZRAM_WRITEBACK=y
675-
CONFIG_ZRAM_TRACK_ENTRY_ACTIME=y
668+
CONFIG_ZRAM_MEMORY_TRACKING=y
676669
CONFIG_ZRAM_MULTI_COMP=y
677670
CONFIG_BLK_DEV_LOOP=y
678671
CONFIG_BLK_DEV_DRBD=m
@@ -1010,7 +1003,6 @@ CONFIG_USB_SIERRA_NET=m
10101003
CONFIG_USB_VL600=m
10111004
CONFIG_USB_NET_CH9200=m
10121005
CONFIG_USB_NET_AQC111=m
1013-
CONFIG_SSV6051=m
10141006
# CONFIG_WLAN_VENDOR_ADMTEK is not set
10151007
CONFIG_ATH9K=m
10161008
CONFIG_ATH9K_AHB=y
@@ -1616,7 +1608,6 @@ CONFIG_SENSORS_XDPE122=m
16161608
CONFIG_SENSORS_ZL6100=m
16171609
CONFIG_SENSORS_PWM_FAN=m
16181610
CONFIG_SENSORS_SBTSI=m
1619-
CONFIG_SENSORS_SBRMI=m
16201611
CONFIG_SENSORS_SHT15=m
16211612
CONFIG_SENSORS_SHT21=m
16221613
CONFIG_SENSORS_SHT3x=m
@@ -1699,7 +1690,6 @@ CONFIG_MFD_RC5T583=y
16991690
CONFIG_MFD_RK8XX_I2C=y
17001691
CONFIG_MFD_RK8XX_SPI=y
17011692
CONFIG_MFD_RN5T618=m
1702-
CONFIG_MFD_SEC_CORE=y
17031693
CONFIG_MFD_LM3533=m
17041694
CONFIG_MFD_TQMX86=m
17051695
CONFIG_MFD_VX855=m
@@ -1749,7 +1739,6 @@ CONFIG_REGULATOR_RT6160=m
17491739
CONFIG_REGULATOR_RT6245=m
17501740
CONFIG_REGULATOR_RTQ2134=m
17511741
CONFIG_REGULATOR_RTQ6752=m
1752-
CONFIG_REGULATOR_S2MPS11=y
17531742
CONFIG_REGULATOR_SLG51000=m
17541743
CONFIG_REGULATOR_SY8824X=m
17551744
CONFIG_RC_CORE=m
@@ -1933,6 +1922,7 @@ CONFIG_DVB_PLATFORM_DRIVERS=y
19331922
CONFIG_V4L_MEM2MEM_DRIVERS=y
19341923
CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
19351924
CONFIG_VIDEO_ROCKCHIP_RGA=m
1925+
CONFIG_VIDEO_ROCKCHIP_VDEC=m
19361926
CONFIG_VIDEO_SYNOPSYS_HDMIRX=m
19371927
CONFIG_VIDEO_SYNOPSYS_HDMIRX_LOAD_DEFAULT_EDID=y
19381928
CONFIG_VIDEO_HANTRO=m
@@ -1998,14 +1988,12 @@ CONFIG_CXD2880_SPI_DRV=m
19981988
CONFIG_VIDEO_GS1662=m
19991989
CONFIG_DVB_DUMMY_FE=m
20001990
CONFIG_AUXDISPLAY=y
1991+
CONFIG_CHARLCD_BL_OFF=y
20011992
CONFIG_TM16XX_I2C=m
20021993
CONFIG_TM16XX_SPI=m
2003-
CONFIG_CHARLCD_BL_OFF=y
20041994
CONFIG_DRM=y
20051995
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
2006-
CONFIG_DRM_I2C_CH7006=m
2007-
CONFIG_DRM_I2C_SIL164=m
2008-
CONFIG_DRM_I2C_NXP_TDA9950=m
1996+
CONFIG_DRM_SIMPLEDRM=m
20091997
CONFIG_DRM_KOMEDA=m
20101998
CONFIG_DRM_ROCKCHIP=m
20111999
CONFIG_ROCKCHIP_VOP2=y
@@ -2079,8 +2067,8 @@ CONFIG_DRM_PANEL_TPO_TD043MTEA1=m
20792067
CONFIG_DRM_PANEL_TPO_TPG110=m
20802068
CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
20812069
CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
2082-
CONFIG_DRM_PANEL_XINPENG_XPP055C272=m
20832070
CONFIG_DRM_PANEL_YIXIAN_YX0345=m
2071+
CONFIG_DRM_PANEL_XINPENG_XPP055C272=m
20842072
CONFIG_DRM_CHIPONE_ICN6211=m
20852073
CONFIG_DRM_DISPLAY_CONNECTOR=m
20862074
CONFIG_DRM_LONTIUM_LT8912B=m
@@ -2108,16 +2096,13 @@ CONFIG_DRM_ETNAVIV=m
21082096
CONFIG_DRM_BOCHS=m
21092097
CONFIG_DRM_GM12U320=m
21102098
CONFIG_DRM_PANEL_MIPI_DBI=y
2111-
CONFIG_DRM_SIMPLEDRM=m
21122099
CONFIG_TINYDRM_HX8357D=m
21132100
CONFIG_TINYDRM_ILI9163=m
21142101
CONFIG_TINYDRM_ILI9225=m
21152102
CONFIG_TINYDRM_ILI9341=m
21162103
CONFIG_TINYDRM_ILI9486=m
21172104
CONFIG_TINYDRM_MI0283QT=m
21182105
CONFIG_TINYDRM_REPAPER=m
2119-
CONFIG_TINYDRM_ST7586=m
2120-
CONFIG_TINYDRM_ST7735R=m
21212106
CONFIG_DRM_XEN_FRONTEND=m
21222107
CONFIG_DRM_LIMA=m
21232108
CONFIG_DRM_PANFROST=m
@@ -2191,15 +2176,11 @@ CONFIG_SND_SOC_FSL_XCVR=m
21912176
CONFIG_SND_SOC_ROCKCHIP=y
21922177
CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=y
21932178
CONFIG_SND_SOC_ROCKCHIP_PDM=y
2194-
CONFIG_SND_SOC_ROCKCHIP_PDM_V2=m
21952179
CONFIG_SND_SOC_ROCKCHIP_SAI=y
21962180
CONFIG_SND_SOC_ROCKCHIP_SPDIF=y
21972181
CONFIG_SND_SOC_ROCKCHIP_MAX98090=y
2198-
CONFIG_SND_SOC_ROCKCHIP_MULTICODECS=y
21992182
CONFIG_SND_SOC_ROCKCHIP_RT5645=y
22002183
CONFIG_SND_SOC_ROCKCHIP_RT5651=y
2201-
CONFIG_SND_SOC_ROCKCHIP_HDMI=y
2202-
CONFIG_SND_SOC_DUMMY_CODEC=y
22032184
CONFIG_SND_SOC_RK3288_HDMI_ANALOG=m
22042185
CONFIG_SND_SOC_RK3399_GRU_SOUND=m
22052186
CONFIG_SND_SOC_XILINX_I2S=m
@@ -2385,11 +2366,6 @@ CONFIG_HID_TWINHAN=m
23852366
CONFIG_HID_KENSINGTON=m
23862367
CONFIG_HID_LCPOWER=m
23872368
CONFIG_HID_LETSKETCH=m
2388-
CONFIG_HID_LOGITECH=m
2389-
CONFIG_HID_LOGITECH_DJ=m
2390-
CONFIG_LOGITECH_FF=y
2391-
CONFIG_LOGIRUMBLEPAD2_FF=y
2392-
CONFIG_LOGIG940_FF=y
23932369
CONFIG_HID_MAGICMOUSE=m
23942370
CONFIG_HID_MALTRON=m
23952371
CONFIG_HID_MEGAWORLD_FF=m
@@ -2669,6 +2645,9 @@ CONFIG_MMC_REALTEK_PCI=m
26692645
CONFIG_MMC_REALTEK_USB=m
26702646
CONFIG_MMC_HSQ=m
26712647
CONFIG_MMC_SDHCI_XENON=y
2648+
CONFIG_SCSI_UFSHCD=y
2649+
CONFIG_SCSI_UFSHCD_PLATFORM=y
2650+
CONFIG_SCSI_UFS_ROCKCHIP=y
26722651
CONFIG_LEDS_CLASS=y
26732652
CONFIG_LEDS_AN30259A=m
26742653
CONFIG_LEDS_CR0014114=m
@@ -2730,7 +2709,6 @@ CONFIG_RTC_DRV_RX8025=m
27302709
CONFIG_RTC_DRV_EM3027=m
27312710
CONFIG_RTC_DRV_RV3028=m
27322711
CONFIG_RTC_DRV_RV8803=m
2733-
CONFIG_RTC_DRV_S5M=m
27342712
CONFIG_RTC_DRV_SD3078=m
27352713
CONFIG_RTC_DRV_M41T93=m
27362714
CONFIG_RTC_DRV_M41T94=m
@@ -2808,8 +2786,6 @@ CONFIG_AD9832=m
28082786
CONFIG_AD9834=m
28092787
CONFIG_FB_SM750=m
28102788
CONFIG_STAGING_MEDIA=y
2811-
CONFIG_VIDEO_ROCKCHIP_VDEC=m
2812-
CONFIG_VIDEO_ROCKCHIP_VDEC2=m
28132789
CONFIG_FB_TFT=m
28142790
CONFIG_FB_TFT_AGM1264K_FL=m
28152791
CONFIG_FB_TFT_BD663474=m
@@ -2850,7 +2826,6 @@ CONFIG_COMMON_CLK_SCMI=y
28502826
CONFIG_COMMON_CLK_SCPI=y
28512827
CONFIG_COMMON_CLK_SI544=m
28522828
CONFIG_COMMON_CLK_CS2000_CP=y
2853-
CONFIG_COMMON_CLK_S2MPS11=y
28542829
CONFIG_COMMON_CLK_AXI_CLKGEN=m
28552830
CONFIG_COMMON_CLK_XGENE=y
28562831
CONFIG_COMMON_CLK_PWM=y
@@ -2862,11 +2837,11 @@ CONFIG_ARM_MHU_V2=m
28622837
CONFIG_ARM_MHU_V3=m
28632838
CONFIG_PLATFORM_MHU=y
28642839
CONFIG_ROCKCHIP_MBOX=y
2865-
CONFIG_IOMMUFD=m
2866-
CONFIG_ROCKCHIP_IOMMU=y
28672840
CONFIG_ARM_SMMU=y
28682841
CONFIG_ARM_SMMU_V3=y
28692842
CONFIG_ARM_SMMU_V3_SVA=y
2843+
CONFIG_IOMMUFD=m
2844+
CONFIG_ROCKCHIP_IOMMU=y
28702845
CONFIG_VIRTIO_IOMMU=m
28712846
CONFIG_LITEX_SOC_CONTROLLER=m
28722847
CONFIG_ROCKCHIP_IODOMAIN=y
@@ -2947,16 +2922,16 @@ CONFIG_ROCKCHIP_SARADC=y
29472922
CONFIG_TI_ADC081C=m
29482923
CONFIG_TI_ADC0832=m
29492924
CONFIG_TI_ADC084S021=m
2950-
CONFIG_TI_ADC12138=m
29512925
CONFIG_TI_ADC108S102=m
2926+
CONFIG_TI_ADC12138=m
29522927
CONFIG_TI_ADC128S052=m
29532928
CONFIG_TI_ADC161S626=m
29542929
CONFIG_TI_ADS1015=m
2930+
CONFIG_TI_ADS124S08=m
2931+
CONFIG_TI_ADS131E08=m
29552932
CONFIG_TI_ADS7950=m
29562933
CONFIG_TI_ADS8344=m
29572934
CONFIG_TI_ADS8688=m
2958-
CONFIG_TI_ADS124S08=m
2959-
CONFIG_TI_ADS131E08=m
29602935
CONFIG_TI_TSC2046=m
29612936
CONFIG_XILINX_XADC=m
29622937
CONFIG_AD74413R=m
@@ -3116,7 +3091,6 @@ CONFIG_PHY_CAN_TRANSCEIVER=m
31163091
CONFIG_PHY_CADENCE_TORRENT=m
31173092
CONFIG_PHY_CADENCE_DPHY=m
31183093
CONFIG_PHY_CADENCE_SIERRA=m
3119-
CONFIG_PHY_LAN966X_SERDES=m
31203094
CONFIG_PHY_MAPPHONE_MDM6600=m
31213095
CONFIG_PHY_ROCKCHIP_DP=y
31223096
CONFIG_PHY_ROCKCHIP_DPHY_RX0=m
@@ -3128,8 +3102,8 @@ CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY=m
31283102
CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
31293103
CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=y
31303104
CONFIG_PHY_ROCKCHIP_PCIE=y
3131-
CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=m
31323105
CONFIG_PHY_ROCKCHIP_SAMSUNG_DCPHY=m
3106+
CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=m
31333107
CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=m
31343108
CONFIG_PHY_ROCKCHIP_TYPEC=y
31353109
CONFIG_PHY_ROCKCHIP_USB=y
@@ -3258,7 +3232,6 @@ CONFIG_ROMFS_FS=m
32583232
CONFIG_PSTORE=y
32593233
CONFIG_PSTORE_RAM=m
32603234
CONFIG_PSTORE_BLK=m
3261-
CONFIG_SYSV_FS=m
32623235
CONFIG_UFS_FS=m
32633236
CONFIG_UFS_FS_WRITE=y
32643237
CONFIG_EROFS_FS=m
@@ -3294,7 +3267,6 @@ CONFIG_CIFS_POSIX=y
32943267
CONFIG_CIFS_DFS_UPCALL=y
32953268
CONFIG_CIFS_FSCACHE=y
32963269
CONFIG_SMB_SERVER=m
3297-
CONFIG_SMB_SERVER_KERBEROS5=y
32983270
CONFIG_CODA_FS=m
32993271
CONFIG_AFS_FS=m
33003272
CONFIG_AFS_FSCACHE=y
@@ -3362,8 +3334,6 @@ CONFIG_SECURITY_DMESG_RESTRICT=y
33623334
CONFIG_SECURITY=y
33633335
CONFIG_SECURITY_NETWORK_XFRM=y
33643336
CONFIG_LSM_MMAP_MIN_ADDR=0
3365-
CONFIG_HARDENED_USERCOPY=y
3366-
CONFIG_FORTIFY_SOURCE=y
33673337
CONFIG_SECURITY_SELINUX=y
33683338
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
33693339
CONFIG_SECURITY_SMACK=y
@@ -3379,19 +3349,19 @@ CONFIG_INTEGRITY_PLATFORM_KEYRING=y
33793349
CONFIG_DEFAULT_SECURITY_APPARMOR=y
33803350
CONFIG_LSM="lockdown,yama,integrity,apparmor"
33813351
CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
3352+
CONFIG_FORTIFY_SOURCE=y
3353+
CONFIG_HARDENED_USERCOPY=y
33823354
CONFIG_CRYPTO_USER=m
33833355
CONFIG_CRYPTO_PCRYPT=m
33843356
CONFIG_CRYPTO_CRYPTD=y
33853357
CONFIG_CRYPTO_AUTHENC=y
3386-
CONFIG_CRYPTO_TEST=m
33873358
CONFIG_CRYPTO_ECDH=y
33883359
CONFIG_CRYPTO_ECDSA=m
33893360
CONFIG_CRYPTO_ECRDSA=m
33903361
CONFIG_CRYPTO_CURVE25519=m
33913362
CONFIG_CRYPTO_AES_TI=m
33923363
CONFIG_CRYPTO_ANUBIS=m
33933364
CONFIG_CRYPTO_BLOWFISH=m
3394-
CONFIG_CRYPTO_CAMELLIA=m
33953365
CONFIG_CRYPTO_CAST5=m
33963366
CONFIG_CRYPTO_CAST6=m
33973367
CONFIG_CRYPTO_DES=y
@@ -3429,10 +3399,8 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
34293399
CONFIG_CRYPTO_USER_API_RNG=m
34303400
CONFIG_CRYPTO_USER_API_AEAD=m
34313401
CONFIG_CRYPTO_NHPOLY1305_NEON=m
3432-
CONFIG_CRYPTO_CHACHA20_NEON=y
34333402
CONFIG_CRYPTO_GHASH_ARM64_CE=y
34343403
CONFIG_CRYPTO_SHA1_ARM64_CE=y
3435-
CONFIG_CRYPTO_SHA2_ARM64_CE=y
34363404
CONFIG_CRYPTO_SHA512_ARM64=y
34373405
CONFIG_CRYPTO_SHA512_ARM64_CE=m
34383406
CONFIG_CRYPTO_SHA3_ARM64=m
@@ -3447,7 +3415,6 @@ CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
34473415
CONFIG_CRYPTO_DEV_ATMEL_ECC=m
34483416
CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
34493417
CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
3450-
CONFIG_CRYPTO_DEV_CAVIUM_ZIP=m
34513418
CONFIG_CRYPTO_DEV_ROCKCHIP=m
34523419
CONFIG_CRYPTO_DEV_ROCKCHIP_TRNG=y
34533420
CONFIG_CRYPTO_DEV_ROCKCHIP_DEBUG=y
@@ -3465,7 +3432,6 @@ CONFIG_SIGNED_PE_FILE_VERIFICATION=y
34653432
CONFIG_SYSTEM_EXTRA_CERTIFICATE=y
34663433
CONFIG_SECONDARY_TRUSTED_KEYRING=y
34673434
CONFIG_SYSTEM_BLACKLIST_KEYRING=y
3468-
CONFIG_CRC4=m
34693435
CONFIG_XZ_DEC_MICROLZMA=y
34703436
CONFIG_XZ_DEC_TEST=m
34713437
CONFIG_DMA_RESTRICTED_POOL=y
@@ -3492,11 +3458,9 @@ CONFIG_FUNCTION_ERROR_INJECTION=y
34923458
CONFIG_TEST_DIV64=m
34933459
CONFIG_REED_SOLOMON_TEST=m
34943460
CONFIG_ASYNC_RAID6_TEST=m
3495-
CONFIG_TEST_SCANF=m
34963461
CONFIG_TEST_XARRAY=m
34973462
CONFIG_TEST_VMALLOC=m
34983463
CONFIG_TEST_BPF=m
3499-
CONFIG_TEST_BLACKHOLE_DEV=m
35003464
CONFIG_HASH_KUNIT_TEST=m
35013465
CONFIG_RESOURCE_KUNIT_TEST=m
35023466
CONFIG_CMDLINE_KUNIT_TEST=m

0 commit comments

Comments
 (0)