From 7534ec9a5140ec2de8aa9d161af1de5a2428f3b1 Mon Sep 17 00:00:00 2001 From: shengfei Xu Date: Tue, 23 Nov 2021 01:32:51 +0000 Subject: [PATCH] arm64: dts: rockchip: rk806: bind the rk806 to the rk3588 rename "rk806-double.dtsi" to "rk3588-rk806-daul.dtsi" rename "rk806-single.dtsi" to "rk3588-rk806-single.dtsi" Signed-off-by: shengfei Xu Change-Id: I0f2de1d32a0cd2ed6d551dca7cdf7ebb6eb6d990 --- arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3588-evb4-lp4.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3588-evb5-lp4.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3588-evb6-lp4.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3588-nvr-demo.dtsi | 2 +- .../rockchip/{rk806-double.dtsi => rk3588-rk806-daul.dtsi} | 4 ++-- .../rockchip/{rk806-single.dtsi => rk3588-rk806-single.dtsi} | 0 arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3588s-evb2-lp5.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3588s-evb3-lp4x.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) rename arch/arm64/boot/dts/rockchip/{rk806-double.dtsi => rk3588-rk806-daul.dtsi} (99%) rename arch/arm64/boot/dts/rockchip/{rk806-single.dtsi => rk3588-rk806-single.dtsi} (100%) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi index a0c8e8aeda4c..e769fc34f4fc 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi @@ -7,7 +7,7 @@ #include "dt-bindings/usb/pd.h" #include "rk3588.dtsi" #include "rk3588-evb.dtsi" -#include "rk806-double.dtsi" +#include "rk3588-rk806-daul.dtsi" / { es8388_sound: es8388-sound { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi index 67027b90c783..0d72e41f289c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi @@ -6,7 +6,7 @@ #include "rk3588.dtsi" #include "rk3588-evb.dtsi" -#include "rk806-double.dtsi" +#include "rk3588-rk806-daul.dtsi" / { es7202_sound_micarray: es7202-sound-micarray { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi index d3d0678e3e2b..02a708996c35 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi @@ -7,7 +7,7 @@ #include "dt-bindings/usb/pd.h" #include "rk3588.dtsi" #include "rk3588-evb.dtsi" -#include "rk806-double.dtsi" +#include "rk3588-rk806-daul.dtsi" / { es7202_sound_micarray: es7202-sound-micarray { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb4-lp4.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb4-lp4.dtsi index bce6973828d2..a18d58ed27ee 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb4-lp4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb4-lp4.dtsi @@ -7,7 +7,7 @@ #include "dt-bindings/usb/pd.h" #include "rk3588.dtsi" #include "rk3588-evb.dtsi" -#include "rk806-single.dtsi" +#include "rk3588-rk806-single.dtsi" / { pcie30_avdd1v8: pcie30-avdd1v8 { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb5-lp4.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb5-lp4.dtsi index 9dd36b5858c1..82435fde5236 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb5-lp4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb5-lp4.dtsi @@ -6,7 +6,7 @@ #include "rk3588.dtsi" #include "rk3588-evb.dtsi" -#include "rk806-double.dtsi" +#include "rk3588-rk806-daul.dtsi" / { dsm_sound: dsm-sound { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb6-lp4.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb6-lp4.dtsi index afc1ca8be4f3..96ecba5e4306 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb6-lp4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb6-lp4.dtsi @@ -6,7 +6,7 @@ #include "rk3588.dtsi" #include "rk3588-evb.dtsi" -#include "rk806-double.dtsi" +#include "rk3588-rk806-daul.dtsi" / { es8388_sound: es8388-sound { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nvr-demo.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nvr-demo.dtsi index 7e15e71c8b75..90663b704a31 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-nvr-demo.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-nvr-demo.dtsi @@ -6,7 +6,7 @@ #include "rk3588.dtsi" #include "rk3588-nvr.dtsi" -#include "rk806-single.dtsi" +#include "rk3588-rk806-single.dtsi" / { i2s0_sound: i2s0-sound { diff --git a/arch/arm64/boot/dts/rockchip/rk806-double.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-rk806-daul.dtsi similarity index 99% rename from arch/arm64/boot/dts/rockchip/rk806-double.dtsi rename to arch/arm64/boot/dts/rockchip/rk3588-rk806-daul.dtsi index 2e829801b456..8692a03dade4 100644 --- a/arch/arm64/boot/dts/rockchip/rk806-double.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-rk806-daul.dtsi @@ -259,7 +259,7 @@ vdd2_ddr_s3: DCDC_REG9 { regulator-always-on; regulator-boot-on; - regulator-name = "vdd2_ddr_s0"; + regulator-name = "vdd2_ddr_s3"; regulator-state-mem { regulator-on-in-suspend; }; @@ -688,7 +688,7 @@ regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; regulator-ramp-delay = <12500>; - regulator-name = "vdd1v8_pll_s0"; + regulator-name = "vdd_1v8_pll_s0"; regulator-state-mem { regulator-off-in-suspend; }; diff --git a/arch/arm64/boot/dts/rockchip/rk806-single.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-rk806-single.dtsi similarity index 100% rename from arch/arm64/boot/dts/rockchip/rk806-single.dtsi rename to arch/arm64/boot/dts/rockchip/rk3588-rk806-single.dtsi diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi index 6ea430b1e06f..8fc5eb36e46d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi @@ -7,7 +7,7 @@ #include "dt-bindings/usb/pd.h" #include "rk3588s.dtsi" #include "rk3588s-evb.dtsi" -#include "rk806-double.dtsi" +#include "rk3588-rk806-daul.dtsi" / { combophy_avdd0v85: combophy-avdd0v85 { diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb2-lp5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb2-lp5.dtsi index 9061521b5156..d23dc43f195c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-evb2-lp5.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb2-lp5.dtsi @@ -6,7 +6,7 @@ #include "rk3588s.dtsi" #include "rk3588s-evb.dtsi" -#include "rk806-double.dtsi" +#include "rk3588-rk806-daul.dtsi" / { es7202_sound_micarray: es7202-sound-micarray { diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb3-lp4x.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb3-lp4x.dtsi index afe2518df016..d585198e34e1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-evb3-lp4x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb3-lp4x.dtsi @@ -7,7 +7,7 @@ #include "dt-bindings/usb/pd.h" #include "rk3588s.dtsi" #include "rk3588s-evb.dtsi" -#include "rk806-double.dtsi" +#include "rk3588-rk806-daul.dtsi" / { combophy_avdd0v85: combophy-avdd0v85 { diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi index d7ed3109638d..8f1360ea1a6a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi @@ -7,7 +7,7 @@ #include "dt-bindings/usb/pd.h" #include "rk3588s.dtsi" #include "rk3588s-evb.dtsi" -#include "rk806-single.dtsi" +#include "rk3588-rk806-single.dtsi" / { combophy_avdd0v85: combophy-avdd0v85 { diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi index 6980819e6e64..a643e2d73beb 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi @@ -14,7 +14,7 @@ #include #include "rk3588s.dtsi" #include "rk3588-android.dtsi" -#include "rk806-double.dtsi" +#include "rk3588-rk806-daul.dtsi" / { adc_keys: adc-keys {