From 0cc6d6bfb28f6e01af67185a7917d62e38173e2f Mon Sep 17 00:00:00 2001 From: Liang Chen Date: Mon, 22 Nov 2021 16:35:01 +0800 Subject: [PATCH] arm64: dts: rockchip: rk3588: delete RK3588_PD_NVM RK3588_PD_NVM need keep always on for emmc. Change-Id: Ia96894eb4bf640799893c3ae68ac68ed15ea989d Signed-off-by: Liang Chen --- arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 36 ++++------------------- 1 file changed, 5 insertions(+), 31 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi index 6ff5bf7170b3..4d74865444e0 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi @@ -1473,26 +1473,11 @@ <&cru ACLK_PHP_ROOT>; }; }; - power-domain@RK3588_PD_NVM { - reg = ; - #address-cells = <1>; - #size-cells = <0>; - - power-domain@RK3588_PD_NVM0 { - reg = ; - clocks = <&cru HCLK_EMMC>, - <&cru ACLK_EMMC>, - <&cru HCLK_SFC>, - <&cru HCLK_SFC_XIP>; - pm_qos = <&qos_emmc>, - <&qos_fspi>; - }; - power-domain@RK3588_PD_SDIO { - reg = ; - clocks = <&cru HCLK_SDIO>, - <&cru HCLK_NVM_ROOT>; - pm_qos = <&qos_sdio>; - }; + power-domain@RK3588_PD_SDIO { + reg = ; + clocks = <&cru HCLK_SDIO>, + <&cru HCLK_NVM_ROOT>; + pm_qos = <&qos_sdio>; }; power-domain@RK3588_PD_AUDIO { reg = ; @@ -2740,16 +2725,6 @@ reg = <0x0 0xfdf36000 0x0 0x20>; }; - qos_fspi: qos@fdf38000 { - compatible = "syscon"; - reg = <0x0 0xfdf38000 0x0 0x20>; - }; - - qos_emmc: qos@fdf38200 { - compatible = "syscon"; - reg = <0x0 0xfdf38200 0x0 0x20>; - }; - qos_sdio: qos@fdf39000 { compatible = "syscon"; reg = <0x0 0xfdf39000 0x0 0x20>; @@ -3229,7 +3204,6 @@ <&cru TMCLK_EMMC>; clock-names = "core", "bus", "axi", "block", "timer"; max-frequency = <200000000>; - power-domains = <&power RK3588_PD_NVM0>; status = "disabled"; };