From e1b85848b3ffc33d7dabc7a742c9d9c9e09f5b7f Mon Sep 17 00:00:00 2001
From: Tao Huang <huangtao@rock-chips.com>
Date: Wed, 2 Dec 2020 10:17:36 +0800
Subject: [PATCH] ARM: dts: rockchip: rename sdio pinctrl name for rv1126

sdmmc1 -> sdio

Change-Id: Ic5273f3023c200f23d9c400a521d5a96fcd58338
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
---
 arch/arm/boot/dts/rv1126-pinctrl.dtsi | 74 ++++++++++++++-------------
 arch/arm/boot/dts/rv1126.dtsi         |  2 +-
 2 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/arch/arm/boot/dts/rv1126-pinctrl.dtsi b/arch/arm/boot/dts/rv1126-pinctrl.dtsi
index 4248a01dce9e..520b725c0700 100644
--- a/arch/arm/boot/dts/rv1126-pinctrl.dtsi
+++ b/arch/arm/boot/dts/rv1126-pinctrl.dtsi
@@ -1308,6 +1308,44 @@
 				<2 RK_PC5 2 &pcfg_pull_none>;
 		};
 	};
+	sdio {
+		/omit-if-no-ref/
+		sdio_bus4: sdio-bus4 {
+			rockchip,pins =
+				/* sdio_d0 */
+				<1 RK_PB4 1 &pcfg_pull_up_drv_level_2>,
+				/* sdio_d1 */
+				<1 RK_PB5 1 &pcfg_pull_up_drv_level_2>,
+				/* sdio_d2 */
+				<1 RK_PB6 1 &pcfg_pull_up_drv_level_2>,
+				/* sdio_d3 */
+				<1 RK_PB7 1 &pcfg_pull_up_drv_level_2>;
+		};
+		/omit-if-no-ref/
+		sdio_clk: sdio-clk {
+			rockchip,pins =
+				/* sdio_clk */
+				<1 RK_PB2 1 &pcfg_pull_up_drv_level_2>;
+		};
+		/omit-if-no-ref/
+		sdio_cmd: sdio-cmd {
+			rockchip,pins =
+				/* sdio_cmd */
+				<1 RK_PB3 1 &pcfg_pull_up_drv_level_2>;
+		};
+		/omit-if-no-ref/
+		sdio_det: sdio-det {
+			rockchip,pins =
+				/* sdio_det */
+				<1 RK_PD0 2 &pcfg_pull_none>;
+		};
+		/omit-if-no-ref/
+		sdio_pwr: sdio-pwr {
+			rockchip,pins =
+				/* sdio_pwr */
+				<1 RK_PD1 2 &pcfg_pull_none>;
+		};
+	};
 	sdmmc0 {
 		/omit-if-no-ref/
 		sdmmc0_bus4: sdmmc0-bus4 {
@@ -1344,42 +1382,6 @@
 				<0 RK_PC0 1 &pcfg_pull_none>;
 		};
 	};
-	sdmmc1 {
-		/omit-if-no-ref/
-		sdmmc1_bus4: sdmmc1-bus4 {
-			rockchip,pins =
-				/* sdmmc1_d0 */
-				<1 RK_PB4 1 &pcfg_pull_up_drv_level_2>,
-				/* sdmmc1_d1 */
-				<1 RK_PB5 1 &pcfg_pull_up_drv_level_2>,
-				/* sdmmc1_d2 */
-				<1 RK_PB6 1 &pcfg_pull_up_drv_level_2>,
-				/* sdmmc1_d3 */
-				<1 RK_PB7 1 &pcfg_pull_up_drv_level_2>;
-		};
-		/omit-if-no-ref/
-		sdmmc1_clk: sdmmc1-clk {
-			rockchip,pins =
-				/* sdmmc1_clk */
-				<1 RK_PB2 1 &pcfg_pull_up_drv_level_2>;
-		};
-		/omit-if-no-ref/
-		sdmmc1_cmd: sdmmc1-cmd {
-			rockchip,pins =
-				/* sdmmc1_cmd */
-				<1 RK_PB3 1 &pcfg_pull_up_drv_level_2>;
-		};
-		/omit-if-no-ref/
-		sdmmc1_det: sdmmc1-det {
-			rockchip,pins =
-				<1 RK_PD0 2 &pcfg_pull_none>;
-		};
-		/omit-if-no-ref/
-		sdmmc1_pwr: sdmmc1-pwr {
-			rockchip,pins =
-				<1 RK_PD1 2 &pcfg_pull_none>;
-		};
-	};
 	spi0 {
 		/omit-if-no-ref/
 		spi0m0_clk: spi0m0-clk {
diff --git a/arch/arm/boot/dts/rv1126.dtsi b/arch/arm/boot/dts/rv1126.dtsi
index 18707f627957..32414cd634dd 100644
--- a/arch/arm/boot/dts/rv1126.dtsi
+++ b/arch/arm/boot/dts/rv1126.dtsi
@@ -2314,7 +2314,7 @@
 		fifo-depth = <0x100>;
 		max-frequency = <200000000>;
 		pinctrl-names = "default";
-		pinctrl-0 = <&sdmmc1_clk &sdmmc1_cmd &sdmmc1_bus4>;
+		pinctrl-0 = <&sdio_clk &sdio_cmd &sdio_bus4>;
 		power-domains = <&power RV1126_PD_SDIO>;
 		status = "disabled";
 	};