[PATCH 13/13] arm64: dts: hisilicon: cleanup Hikey 970 PCI schema

[Mauro Carvalho Chehab]

The original schema was not generic enough and not
properly documented. Those got updated via some driver
changes.

Apply those changes also to Hikey 970 schema.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei at kernel.org>
---
 arch/arm64/boot/dts/hisilicon/hi3670.dtsi      | 18 +++++++++---------
 .../boot/dts/hisilicon/hikey970-pmic.dtsi      |  1 -
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/arch/arm64/boot/dts/hisilicon/hi3670.dtsi b/arch/arm64/boot/dts/hisilicon/hi3670.dtsi
index c0a0336a8ea4..7e96d5eda13a 100644
--- a/arch/arm64/boot/dts/hisilicon/hi3670.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi3670.dtsi
@@ -673,11 +673,12 @@ its_pcie: interrupt-controller at f4000000 {
 		};
 
 		pcie at f4000000 {
-			compatible = "hisilicon,kirin970-pcie", "hisilicon,kirin960-pcie";
+			compatible = "hisilicon,kirin970-pcie";
 			reg = <0x0 0xf4000000 0x0 0x1000000>,
 			      <0x0 0xfc180000 0x0 0x1000>,
 			      <0x0 0xfc000000 0x0 0x80000>,
 			      <0x0 0xf5000000 0x0 0x2000>;
+			pci-supply = <&ldo33>;
 			reg-names = "dbi", "apb", "phy", "config";
 			bus-range = <0x0  0x1>;
 			msi-parent = <&its_pcie>;
@@ -705,19 +706,18 @@ &gic GIC_SPI 284 IRQ_TYPE_LEVEL_HIGH>,
 				 <&crg_ctrl HI3670_PCLK_GATE_PCIE_PHY>,
 				 <&crg_ctrl HI3670_PCLK_GATE_PCIE_SYS>,
 				 <&crg_ctrl HI3670_ACLK_GATE_PCIE>;
+
 			clock-names = "pcie_phy_ref", "pcie_aux",
 				      "pcie_apb_phy", "pcie_apb_sys",
 				      "pcie_aclk";
-			switch,reset-gpios = <&gpio7 0 0 >;
-			eth,reset-gpios = <&gpio25 2 0 >;
-			m_2,reset-gpios = <&gpio3 1 0 >;
-			mini1,reset-gpios = <&gpio27 4 0 >;
 
-			eth,clkreq-gpios = <&gpio20 6 0 >;
-			m_2,clkreq-gpios = <&gpio27 3 0 >;
-			mini1,clkreq-gpios = <&gpio17 0 0 >;
+			reset-gpios = <&gpio7 0 0 >, <&gpio25 2 0 >,
+				      <&gpio3 1 0 >, <&gpio27 4 0 >;
 
-			/*vboost iboost pre post main*/
+			clkreq-gpios = <&gpio20 6 0 >, <&gpio27 3 0 >,
+				       <&gpio17 0 0 >;
+
+			/* vboost iboost pre post main */
 			eye_param = <0xFFFFFFFF 0xFFFFFFFF 0xFFFFFFFF 0xFFFFFFFF 0xFFFFFFFF>;
 
 			pinctrl-names = "default";
diff --git a/arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi b/arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi
index 8cf45b962fea..49afcd7c00ce 100644
--- a/arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi
@@ -73,7 +73,6 @@ ldo33: LDO33 { /* PEX8606 */
 					regulator-name = "ldo33";
 					regulator-min-microvolt = <2500000>;
 					regulator-max-microvolt = <3300000>;
-					regulator-boot-on;
 				};
 
 				ldo34: LDO34 { /* GPS AUX IN VDD */
-- 
2.29.2