Re: [PATCH v1] arm: dts: rockchip: rk3288: rename mmc nodenames

[Kever Yang]

On 2022/5/2 17:42, Johan Jonker wrote:

The boot_devices constants for rk3288 were changed to match the
binding, but the dtsi file was not synced.
Fix by renaming the rk3288 mmc node names.
Also correct the clock name for "ciu-drive".

Signed-off-by: Johan Jonker 


Reviewed-by: Kever Yang 

Thanks,
- Kever

---
  arch/arm/dts/rk3288.dtsi | 16 
  1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm/dts/rk3288.dtsi b/arch/arm/dts/rk3288.dtsi
index 5e40e741..0bfa4c39 100644
--- a/arch/arm/dts/rk3288.dtsi
+++ b/arch/arm/dts/rk3288.dtsi
@@ -150,48 +150,48 @@
ports = <&vopl_out>, <&vopb_out>;
};
  
-	sdmmc: dwmmc@ff0c {

+   sdmmc: mmc@ff0c {
compatible = "rockchip,rk3288-dw-mshc";
max-frequency = <15000>;
clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,
 <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;
-   clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
+   clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
fifo-depth = <0x100>;
interrupts = ;
reg = <0xff0c 0x4000>;
status = "disabled";
};
  
-	sdio0: dwmmc@ff0d {

+   sdio0: mmc@ff0d {
compatible = "rockchip,rk3288-dw-mshc";
max-frequency = <15000>;
clocks = <&cru HCLK_SDIO0>, <&cru SCLK_SDIO0>,
 <&cru SCLK_SDIO0_DRV>, <&cru SCLK_SDIO0_SAMPLE>;
-   clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
+   clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
fifo-depth = <0x100>;
interrupts = ;
reg = <0xff0d 0x4000>;
status = "disabled";
};
  
-	sdio1: dwmmc@ff0e {

+   sdio1: mmc@ff0e {
compatible = "rockchip,rk3288-dw-mshc";
max-frequency = <15000>;
clocks = <&cru HCLK_SDIO1>, <&cru SCLK_SDIO1>,
 <&cru SCLK_SDIO1_DRV>, <&cru SCLK_SDIO1_SAMPLE>;
-   clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
+   clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
fifo-depth = <0x100>;
interrupts = ;
reg = <0xff0e 0x4000>;
status = "disabled";
};
  
-	emmc: dwmmc@ff0f {

+   emmc: mmc@ff0f {
compatible = "rockchip,rk3288-dw-mshc";
max-frequency = <15000>;
clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
 <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
-   clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
+   clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
fifo-depth = <0x100>;
interrupts = ;
reg = <0xff0f 0x4000>;

[PATCH v1] arm: dts: rockchip: rk3288: rename mmc nodenames

[Johan Jonker]

The boot_devices constants for rk3288 were changed to match the
binding, but the dtsi file was not synced.
Fix by renaming the rk3288 mmc node names.
Also correct the clock name for "ciu-drive".

Signed-off-by: Johan Jonker 
---
 arch/arm/dts/rk3288.dtsi | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm/dts/rk3288.dtsi b/arch/arm/dts/rk3288.dtsi
index 5e40e741..0bfa4c39 100644
--- a/arch/arm/dts/rk3288.dtsi
+++ b/arch/arm/dts/rk3288.dtsi
@@ -150,48 +150,48 @@
ports = <&vopl_out>, <&vopb_out>;
};
 
-   sdmmc: dwmmc@ff0c {
+   sdmmc: mmc@ff0c {
compatible = "rockchip,rk3288-dw-mshc";
max-frequency = <15000>;
clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,
 <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;
-   clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
+   clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
fifo-depth = <0x100>;
interrupts = ;
reg = <0xff0c 0x4000>;
status = "disabled";
};
 
-   sdio0: dwmmc@ff0d {
+   sdio0: mmc@ff0d {
compatible = "rockchip,rk3288-dw-mshc";
max-frequency = <15000>;
clocks = <&cru HCLK_SDIO0>, <&cru SCLK_SDIO0>,
 <&cru SCLK_SDIO0_DRV>, <&cru SCLK_SDIO0_SAMPLE>;
-   clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
+   clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
fifo-depth = <0x100>;
interrupts = ;
reg = <0xff0d 0x4000>;
status = "disabled";
};
 
-   sdio1: dwmmc@ff0e {
+   sdio1: mmc@ff0e {
compatible = "rockchip,rk3288-dw-mshc";
max-frequency = <15000>;
clocks = <&cru HCLK_SDIO1>, <&cru SCLK_SDIO1>,
 <&cru SCLK_SDIO1_DRV>, <&cru SCLK_SDIO1_SAMPLE>;
-   clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
+   clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
fifo-depth = <0x100>;
interrupts = ;
reg = <0xff0e 0x4000>;
status = "disabled";
};
 
-   emmc: dwmmc@ff0f {
+   emmc: mmc@ff0f {
compatible = "rockchip,rk3288-dw-mshc";
max-frequency = <15000>;
clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
 <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
-   clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
+   clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
fifo-depth = <0x100>;
interrupts = ;
reg = <0xff0f 0x4000>;
-- 
2.20.1