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
2026-01-06 09:58:46 -08:00 · 2025-09-29 19:52:05 +02:00
parent 74c97b6c2a
commit badbc99594
2 changed files with 95 additions and 89 deletions
--- a/config/kernel/linux-rockchip64-edge.config
+++ b/config/kernel/linux-rockchip64-edge.config
@@ -1,7 +1,6 @@
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
-CONFIG_USELIB=y
 CONFIG_TIME_KUNIT_TEST=m
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
@@ -86,7 +85,6 @@ CONFIG_ARM_SCPI_CPUFREQ=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
 CONFIG_KPROBES=y
-CONFIG_JUMP_LABEL=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
@@ -99,9 +97,6 @@ CONFIG_BINFMT_MISC=m
 CONFIG_ZSWAP=y
 CONFIG_ZSWAP_DEFAULT_ON=y
 CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD=y
-CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD_DEPRECATED=y
-CONFIG_ZBUD=y
-CONFIG_ZSMALLOC=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_KSM=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
@@ -114,7 +109,6 @@ CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX_DIAG=m
-CONFIG_TLS=m
 CONFIG_TLS_DEVICE=y
 CONFIG_XFRM_USER=m
 CONFIG_XFRM_INTERFACE=m
@@ -295,6 +289,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m
 CONFIG_NETFILTER_XT_MATCH_RATEEST=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_SOCKET=m
 CONFIG_NETFILTER_XT_MATCH_STATE=m
 CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
@@ -414,8 +409,6 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
 CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_SCTP_DBG_OBJCNT=y
-CONFIG_SCTP_COOKIE_HMAC_SHA1=y
 CONFIG_RDS=m
 CONFIG_RDS_TCP=m
 CONFIG_TIPC=m
@@ -431,7 +424,7 @@ CONFIG_L2TP_DEBUGFS=m
 CONFIG_L2TP_V3=y
 CONFIG_L2TP_IP=m
 CONFIG_L2TP_ETH=m
-CONFIG_BRIDGE=m
+CONFIG_BRIDGE=y
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_TAG_OCELOT=m
@@ -672,7 +665,7 @@ CONFIG_MTD_HYPERBUS=m
 CONFIG_OF_CONFIGFS=y
 CONFIG_ZRAM=m
 CONFIG_ZRAM_WRITEBACK=y
-CONFIG_ZRAM_TRACK_ENTRY_ACTIME=y
+CONFIG_ZRAM_MEMORY_TRACKING=y
 CONFIG_ZRAM_MULTI_COMP=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_DRBD=m
@@ -1010,7 +1003,6 @@ CONFIG_USB_SIERRA_NET=m
 CONFIG_USB_VL600=m
 CONFIG_USB_NET_CH9200=m
 CONFIG_USB_NET_AQC111=m
-CONFIG_SSV6051=m
 # CONFIG_WLAN_VENDOR_ADMTEK is not set
 CONFIG_ATH9K=m
 CONFIG_ATH9K_AHB=y
@@ -1616,7 +1608,6 @@ CONFIG_SENSORS_XDPE122=m
 CONFIG_SENSORS_ZL6100=m
 CONFIG_SENSORS_PWM_FAN=m
 CONFIG_SENSORS_SBTSI=m
-CONFIG_SENSORS_SBRMI=m
 CONFIG_SENSORS_SHT15=m
 CONFIG_SENSORS_SHT21=m
 CONFIG_SENSORS_SHT3x=m
@@ -1699,7 +1690,6 @@ CONFIG_MFD_RC5T583=y
 CONFIG_MFD_RK8XX_I2C=y
 CONFIG_MFD_RK8XX_SPI=y
 CONFIG_MFD_RN5T618=m
-CONFIG_MFD_SEC_CORE=y
 CONFIG_MFD_LM3533=m
 CONFIG_MFD_TQMX86=m
 CONFIG_MFD_VX855=m
@@ -1749,7 +1739,6 @@ CONFIG_REGULATOR_RT6160=m
 CONFIG_REGULATOR_RT6245=m
 CONFIG_REGULATOR_RTQ2134=m
 CONFIG_REGULATOR_RTQ6752=m
-CONFIG_REGULATOR_S2MPS11=y
 CONFIG_REGULATOR_SLG51000=m
 CONFIG_REGULATOR_SY8824X=m
 CONFIG_RC_CORE=m
@@ -1933,6 +1922,7 @@ CONFIG_DVB_PLATFORM_DRIVERS=y
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
 CONFIG_VIDEO_ROCKCHIP_RGA=m
+CONFIG_VIDEO_ROCKCHIP_VDEC=m
 CONFIG_VIDEO_SYNOPSYS_HDMIRX=m
 CONFIG_VIDEO_SYNOPSYS_HDMIRX_LOAD_DEFAULT_EDID=y
 CONFIG_VIDEO_HANTRO=m
@@ -1998,14 +1988,12 @@ CONFIG_CXD2880_SPI_DRV=m
 CONFIG_VIDEO_GS1662=m
 CONFIG_DVB_DUMMY_FE=m
 CONFIG_AUXDISPLAY=y
+CONFIG_CHARLCD_BL_OFF=y
 CONFIG_TM16XX_I2C=m
 CONFIG_TM16XX_SPI=m
-CONFIG_CHARLCD_BL_OFF=y
 CONFIG_DRM=y
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m
-CONFIG_DRM_I2C_NXP_TDA9950=m
+CONFIG_DRM_SIMPLEDRM=m
 CONFIG_DRM_KOMEDA=m
 CONFIG_DRM_ROCKCHIP=m
 CONFIG_ROCKCHIP_VOP2=y
@@ -2079,8 +2067,8 @@ CONFIG_DRM_PANEL_TPO_TD043MTEA1=m
 CONFIG_DRM_PANEL_TPO_TPG110=m
 CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
 CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m
-CONFIG_DRM_PANEL_XINPENG_XPP055C272=m
 CONFIG_DRM_PANEL_YIXIAN_YX0345=m
+CONFIG_DRM_PANEL_XINPENG_XPP055C272=m
 CONFIG_DRM_CHIPONE_ICN6211=m
 CONFIG_DRM_DISPLAY_CONNECTOR=m
 CONFIG_DRM_LONTIUM_LT8912B=m
@@ -2108,7 +2096,6 @@ CONFIG_DRM_ETNAVIV=m
 CONFIG_DRM_BOCHS=m
 CONFIG_DRM_GM12U320=m
 CONFIG_DRM_PANEL_MIPI_DBI=y
-CONFIG_DRM_SIMPLEDRM=m
 CONFIG_TINYDRM_HX8357D=m
 CONFIG_TINYDRM_ILI9163=m
 CONFIG_TINYDRM_ILI9225=m
@@ -2116,8 +2103,6 @@ CONFIG_TINYDRM_ILI9341=m
 CONFIG_TINYDRM_ILI9486=m
 CONFIG_TINYDRM_MI0283QT=m
 CONFIG_TINYDRM_REPAPER=m
-CONFIG_TINYDRM_ST7586=m
-CONFIG_TINYDRM_ST7735R=m
 CONFIG_DRM_XEN_FRONTEND=m
 CONFIG_DRM_LIMA=m
 CONFIG_DRM_PANFROST=m
@@ -2191,15 +2176,11 @@ CONFIG_SND_SOC_FSL_XCVR=m
 CONFIG_SND_SOC_ROCKCHIP=y
 CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=y
 CONFIG_SND_SOC_ROCKCHIP_PDM=y
-CONFIG_SND_SOC_ROCKCHIP_PDM_V2=m
 CONFIG_SND_SOC_ROCKCHIP_SAI=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_ROCKCHIP_RT5651=y
-CONFIG_SND_SOC_ROCKCHIP_HDMI=y
-CONFIG_SND_SOC_DUMMY_CODEC=y
 CONFIG_SND_SOC_RK3288_HDMI_ANALOG=m
 CONFIG_SND_SOC_RK3399_GRU_SOUND=m
 CONFIG_SND_SOC_XILINX_I2S=m
@@ -2385,11 +2366,6 @@ CONFIG_HID_TWINHAN=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_LCPOWER=m
 CONFIG_HID_LETSKETCH=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_LOGITECH_DJ=m
-CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_LOGIG940_FF=y
 CONFIG_HID_MAGICMOUSE=m
 CONFIG_HID_MALTRON=m
 CONFIG_HID_MEGAWORLD_FF=m
@@ -2669,6 +2645,9 @@ CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
 CONFIG_MMC_HSQ=m
 CONFIG_MMC_SDHCI_XENON=y
+CONFIG_SCSI_UFSHCD=y
+CONFIG_SCSI_UFSHCD_PLATFORM=y
+CONFIG_SCSI_UFS_ROCKCHIP=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_AN30259A=m
 CONFIG_LEDS_CR0014114=m
@@ -2730,7 +2709,6 @@ CONFIG_RTC_DRV_RX8025=m
 CONFIG_RTC_DRV_EM3027=m
 CONFIG_RTC_DRV_RV3028=m
 CONFIG_RTC_DRV_RV8803=m
-CONFIG_RTC_DRV_S5M=m
 CONFIG_RTC_DRV_SD3078=m
 CONFIG_RTC_DRV_M41T93=m
 CONFIG_RTC_DRV_M41T94=m
@@ -2808,8 +2786,6 @@ CONFIG_AD9832=m
 CONFIG_AD9834=m
 CONFIG_FB_SM750=m
 CONFIG_STAGING_MEDIA=y
-CONFIG_VIDEO_ROCKCHIP_VDEC=m
-CONFIG_VIDEO_ROCKCHIP_VDEC2=m
 CONFIG_FB_TFT=m
 CONFIG_FB_TFT_AGM1264K_FL=m
 CONFIG_FB_TFT_BD663474=m
@@ -2850,7 +2826,6 @@ CONFIG_COMMON_CLK_SCMI=y
 CONFIG_COMMON_CLK_SCPI=y
 CONFIG_COMMON_CLK_SI544=m
 CONFIG_COMMON_CLK_CS2000_CP=y
-CONFIG_COMMON_CLK_S2MPS11=y
 CONFIG_COMMON_CLK_AXI_CLKGEN=m
 CONFIG_COMMON_CLK_XGENE=y
 CONFIG_COMMON_CLK_PWM=y
@@ -2862,11 +2837,11 @@ CONFIG_ARM_MHU_V2=m
 CONFIG_ARM_MHU_V3=m
 CONFIG_PLATFORM_MHU=y
 CONFIG_ROCKCHIP_MBOX=y
-CONFIG_IOMMUFD=m
-CONFIG_ROCKCHIP_IOMMU=y
 CONFIG_ARM_SMMU=y
 CONFIG_ARM_SMMU_V3=y
 CONFIG_ARM_SMMU_V3_SVA=y
+CONFIG_IOMMUFD=m
+CONFIG_ROCKCHIP_IOMMU=y
 CONFIG_VIRTIO_IOMMU=m
 CONFIG_LITEX_SOC_CONTROLLER=m
 CONFIG_ROCKCHIP_IODOMAIN=y
@@ -2947,16 +2922,16 @@ CONFIG_ROCKCHIP_SARADC=y
 CONFIG_TI_ADC081C=m
 CONFIG_TI_ADC0832=m
 CONFIG_TI_ADC084S021=m
-CONFIG_TI_ADC12138=m
 CONFIG_TI_ADC108S102=m
+CONFIG_TI_ADC12138=m
 CONFIG_TI_ADC128S052=m
 CONFIG_TI_ADC161S626=m
 CONFIG_TI_ADS1015=m
+CONFIG_TI_ADS124S08=m
+CONFIG_TI_ADS131E08=m
 CONFIG_TI_ADS7950=m
 CONFIG_TI_ADS8344=m
 CONFIG_TI_ADS8688=m
-CONFIG_TI_ADS124S08=m
-CONFIG_TI_ADS131E08=m
 CONFIG_TI_TSC2046=m
 CONFIG_XILINX_XADC=m
 CONFIG_AD74413R=m
@@ -3116,7 +3091,6 @@ CONFIG_PHY_CAN_TRANSCEIVER=m
 CONFIG_PHY_CADENCE_TORRENT=m
 CONFIG_PHY_CADENCE_DPHY=m
 CONFIG_PHY_CADENCE_SIERRA=m
-CONFIG_PHY_LAN966X_SERDES=m
 CONFIG_PHY_MAPPHONE_MDM6600=m
 CONFIG_PHY_ROCKCHIP_DP=y
 CONFIG_PHY_ROCKCHIP_DPHY_RX0=m
@@ -3128,8 +3102,8 @@ CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY=m
 CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
 CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=y
 CONFIG_PHY_ROCKCHIP_PCIE=y
-CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=m
 CONFIG_PHY_ROCKCHIP_SAMSUNG_DCPHY=m
+CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=m
 CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=m
 CONFIG_PHY_ROCKCHIP_TYPEC=y
 CONFIG_PHY_ROCKCHIP_USB=y
@@ -3258,7 +3232,6 @@ CONFIG_ROMFS_FS=m
 CONFIG_PSTORE=y
 CONFIG_PSTORE_RAM=m
 CONFIG_PSTORE_BLK=m
-CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 CONFIG_UFS_FS_WRITE=y
 CONFIG_EROFS_FS=m
@@ -3294,7 +3267,6 @@ CONFIG_CIFS_POSIX=y
 CONFIG_CIFS_DFS_UPCALL=y
 CONFIG_CIFS_FSCACHE=y
 CONFIG_SMB_SERVER=m
-CONFIG_SMB_SERVER_KERBEROS5=y
 CONFIG_CODA_FS=m
 CONFIG_AFS_FS=m
 CONFIG_AFS_FSCACHE=y
@@ -3362,8 +3334,6 @@ CONFIG_SECURITY_DMESG_RESTRICT=y
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_LSM_MMAP_MIN_ADDR=0
-CONFIG_HARDENED_USERCOPY=y
-CONFIG_FORTIFY_SOURCE=y
 CONFIG_SECURITY_SELINUX=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SECURITY_SMACK=y
@@ -3379,11 +3349,12 @@ CONFIG_INTEGRITY_PLATFORM_KEYRING=y
 CONFIG_DEFAULT_SECURITY_APPARMOR=y
 CONFIG_LSM="lockdown,yama,integrity,apparmor"
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+CONFIG_FORTIFY_SOURCE=y
+CONFIG_HARDENED_USERCOPY=y
 CONFIG_CRYPTO_USER=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_AUTHENC=y
-CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_ECDH=y
 CONFIG_CRYPTO_ECDSA=m
 CONFIG_CRYPTO_ECRDSA=m
@@ -3391,7 +3362,6 @@ CONFIG_CRYPTO_CURVE25519=m
 CONFIG_CRYPTO_AES_TI=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_DES=y
@@ -3429,10 +3399,8 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
 CONFIG_CRYPTO_USER_API_RNG=m
 CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_NHPOLY1305_NEON=m
-CONFIG_CRYPTO_CHACHA20_NEON=y
 CONFIG_CRYPTO_GHASH_ARM64_CE=y
 CONFIG_CRYPTO_SHA1_ARM64_CE=y
-CONFIG_CRYPTO_SHA2_ARM64_CE=y
 CONFIG_CRYPTO_SHA512_ARM64=y
 CONFIG_CRYPTO_SHA512_ARM64_CE=m
 CONFIG_CRYPTO_SHA3_ARM64=m
@@ -3447,7 +3415,6 @@ CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
 CONFIG_CRYPTO_DEV_ATMEL_ECC=m
 CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
 CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
-CONFIG_CRYPTO_DEV_CAVIUM_ZIP=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_CRYPTO_DEV_ROCKCHIP_TRNG=y
 CONFIG_CRYPTO_DEV_ROCKCHIP_DEBUG=y
@@ -3465,7 +3432,6 @@ CONFIG_SIGNED_PE_FILE_VERIFICATION=y
 CONFIG_SYSTEM_EXTRA_CERTIFICATE=y
 CONFIG_SECONDARY_TRUSTED_KEYRING=y
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
-CONFIG_CRC4=m
 CONFIG_XZ_DEC_MICROLZMA=y
 CONFIG_XZ_DEC_TEST=m
 CONFIG_DMA_RESTRICTED_POOL=y
@@ -3492,11 +3458,9 @@ CONFIG_FUNCTION_ERROR_INJECTION=y
 CONFIG_TEST_DIV64=m
 CONFIG_REED_SOLOMON_TEST=m
 CONFIG_ASYNC_RAID6_TEST=m
-CONFIG_TEST_SCANF=m
 CONFIG_TEST_XARRAY=m
 CONFIG_TEST_VMALLOC=m
 CONFIG_TEST_BPF=m
-CONFIG_TEST_BLACKHOLE_DEV=m
 CONFIG_HASH_KUNIT_TEST=m
 CONFIG_RESOURCE_KUNIT_TEST=m
 CONFIG_CMDLINE_KUNIT_TEST=m
--- a/patch/kernel/archive/rockchip64-6.16/dt/rk3576-nanopi-m5.dts
+++ b/patch/kernel/archive/rockchip64-6.16/dt/rk3576-nanopi-m5.dts
@@ -123,7 +123,7 @@
 		reset-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
 	};

-	/* Power Supply Regulators */
+	/* Power Input */
 	vcc_5v0_dcin: regulator-vcc-5v0-dcin {
 		compatible = "regulator-fixed";
 		regulator-name = "vcc_5v0_dcin";
@@ -133,6 +133,18 @@
 		regulator-max-microvolt = <5000000>;
 	};

+	/* Main System Power */
+	vcc_5v0_sys: regulator-vcc-5v0-sys {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc_5v0_sys";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&vcc_5v0_dcin>;
+	};
+
+	/* PMIC Input Rails */
 	vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
 		compatible = "regulator-fixed";
 		regulator-name = "vcc_1v1_nldo_s3";
@@ -153,7 +165,30 @@
 		vin-supply = <&vcc_5v0_sys>;
 	};

-	vcc3v3_m2_keym: vcc3v3-m2_keym {
+	/* General Purpose 3.3V Rails */
+	vcc_3v3_s0: regulator-vcc-3v3-s0 {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc_3v3_s0";
+		regulator-boot-on;
+		regulator-always-on;
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		vin-supply = <&vcc_3v3_s3>;
+	};
+
+	/* RTC Backup Power */
+	vcc_3v3_rtc_s5: regulator-vcc-3v3-rtc-s5 {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc_3v3_rtc_s5";
+		regulator-boot-on;
+		regulator-always-on;
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		vin-supply = <&vcc_5v0_sys>;
+	};
+
+	/* PCIe M.2 Key M Power */
+	vcc3v3_m2_keym: regulator-vcc3v3-m2-keym {
 		compatible = "regulator-fixed";
 		enable-active-high;
 		gpios = <&gpio0 RK_PD3 GPIO_ACTIVE_HIGH>;
@@ -165,9 +200,10 @@
 		vin-supply = <&vcc_5v0_sys>;
 	};

-	vcc_3v3_rtc_s5: regulator-vcc-3v3-rtc-s5 {
+	/* UFS Storage Power Rails */
+	vcc_ufs_s0: regulator-vcc-ufs-s0 {
 		compatible = "regulator-fixed";
-		regulator-name = "vcc_3v3_rtc_s5";
+		regulator-name = "vcc_ufs_s0";
 		regulator-boot-on;
 		regulator-always-on;
 		regulator-min-microvolt = <3300000>;
@@ -175,28 +211,28 @@
 		vin-supply = <&vcc_5v0_sys>;
 	};

-	vcc_3v3_s0: regulator-vcc-3v3-s0 {
+	vcc_1v8_ufs_s0: regulator-vcc-1v8-ufs-s0 {
 		compatible = "regulator-fixed";
-		regulator-name = "vcc_3v3_s0";
+		regulator-name = "vcc_1v8_ufs_s0";
 		regulator-boot-on;
 		regulator-always-on;
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		vin-supply = <&vcc_3v3_s3>;
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		vin-supply = <&vcc_1v8_s3>;
 	};

-	vcc_5v0_sys: regulator-vcc-5v0-sys {
+	vcc_1v2_ufs_s0: regulator-vcc-1v2-ufs-s0 {
 		compatible = "regulator-fixed";
-		regulator-name = "vcc_5v0_sys";
-		regulator-always-on;
+		regulator-name = "vcc_1v2_ufs_s0";
 		regulator-boot-on;
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		vin-supply = <&vcc_5v0_dcin>;
+		regulator-always-on;
+		regulator-min-microvolt = <1200000>;
+		regulator-max-microvolt = <1200000>;
+		vin-supply = <&vcc_5v0_sys>;
 	};

-	/* USB Power Regulators */
-	vcc5v0_host: vcc5v0-host {
+	/* USB Host Power */
+	vcc5v0_host: regulator-vcc5v0-host {
 		compatible = "regulator-fixed";
 		regulator-name = "vcc5v0_host";
 		regulator-min-microvolt = <5000000>;
@@ -208,7 +244,8 @@
 		pinctrl-0 = <&usb_host_pwren>;
 	};

-	vbus5v0_typec: vbus5v0-typec {
+	/* USB Type-C Power */
+	vbus5v0_typec: regulator-vbus5v0-typec {
 		compatible = "regulator-fixed";
 		regulator-name = "vbus5v0_typec";
 		regulator-min-microvolt = <5000000>;
@@ -575,7 +612,6 @@
 				regulator-name = "vdd_cpu_lit_s0";
 				regulator-state-mem {
 					regulator-off-in-suspend;
-					regulator-suspend-microvolt = <750000>;
 				};
 			};

@@ -594,13 +630,12 @@
 			vdd_gpu_s0: dcdc-reg5 {
 				regulator-boot-on;
 				regulator-min-microvolt = <550000>;
-				regulator-max-microvolt = <900000>;
+				regulator-max-microvolt = <950000>;
 				regulator-ramp-delay = <12500>;
 				regulator-name = "vdd_gpu_s0";
 				regulator-enable-ramp-delay = <400>;
 				regulator-state-mem {
 					regulator-off-in-suspend;
-					regulator-suspend-microvolt = <850000>;
 				};
 			};

@@ -667,12 +702,12 @@
 				};
 			};

-			vcca1v8_pldo2_s0: pldo-reg2 {
+			vcca_1v8_codec_s0: pldo-reg2 {
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-min-microvolt = <1800000>;
 				regulator-max-microvolt = <1800000>;
-				regulator-name = "vcca1v8_pldo2_s0";
+				regulator-name = "vcca_1v8_codec_s0";
 				regulator-state-mem {
 					regulator-off-in-suspend;
 				};
@@ -711,12 +746,12 @@
 				};
 			};

-			vcca1v8_pldo6_s3: pldo-reg6 {
+			vcca_1v8_s3: pldo-reg6 {
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-min-microvolt = <1800000>;
 				regulator-max-microvolt = <1800000>;
-				regulator-name = "vcca1v8_pldo6_s3";
+				regulator-name = "vcca_1v8_s3";
 				regulator-state-mem {
 					regulator-on-in-suspend;
 					regulator-suspend-microvolt = <1800000>;
@@ -746,12 +781,12 @@
 				};
 			};

-			vdda0v75_hdmi_s0: nldo-reg3 {
+			vdda_0v75_hdmi_s0: nldo-reg3 {
 				regulator-always-on;
 				regulator-boot-on;
-				regulator-min-microvolt = <837500>;
-				regulator-max-microvolt = <837500>;
-				regulator-name = "vdda0v75_hdmi_s0";
+				regulator-min-microvolt = <750000>;
+				regulator-max-microvolt = <750000>;
+				regulator-name = "vdda_0v75_hdmi_s0";
 				regulator-state-mem {
 					regulator-off-in-suspend;
 				};
@@ -950,7 +985,7 @@
 /* ADC Configuration */
 &saradc {
 	status = "okay";
-	vref-supply = <&vcca1v8_pldo2_s0>;
+	vref-supply = <&vcca_1v8_codec_s0>;
 };

 /* SD/MMC Configuration */
@@ -1017,7 +1052,19 @@
 	};
 };

+/* UFS Storage */
+
+&ufshc {
+	status = "okay";
+};
+
 /* UART Configuration */
+
+&uart3 {
+	pinctrl-0 = <&uart3m0_xfer>;
+	status = "okay";
+};
+
 &uart5 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart5m0_xfer &uart5m0_ctsn &uart5m0_rtsn>;
@@ -1031,11 +1078,6 @@
 	};
 };

-&uart3 {
-	pinctrl-0 = <&uart3m0_xfer>;
-	status = "okay";
-};
-
 &uart8 {
 	pinctrl-0 = <&uart8m1_xfer>;
 	status = "okay";