dts: starfive: Fix overlay-rgb2hdmi gpio conflict

Signed-off-by: Jianlong Huang <jianlong.huang@starfivetech.com>

diff --git a/arch/riscv/boot/dts/starfive/evb-overlay/Makefile b/arch/riscv/boot/dts/starfive/evb-overlay/Makefile
index 53c958e..305c762 100644 (file)
--- a/arch/riscv/boot/dts/starfive/evb-overlay/Makefile
+++ b/arch/riscv/boot/dts/starfive/evb-overlay/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
-dtb-$(CONFIG_SOC_STARFIVE_JH7110) += jh7110-evb-overlay-pcie.dtbo      \
-                               jh7110-evb-overlay-audio.dtbo           \
+dtb-$(CONFIG_SOC_STARFIVE_JH7110) += jh7110-evb-overlay-can.dtbo       \
+                               jh7110-evb-overlay-sdio.dtbo            \
                                jh7110-evb-overlay-spi.dtbo             \
                                jh7110-evb-overlay-uart4-emmc.dtbo      \
                                jh7110-evb-overlay-uart5-pwm.dtbo       \

diff --git a/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-audio.dts b/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-can.dts
similarity index 52%
rename from arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-audio.dts
rename to arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-can.dts
index 68d519b..af133a2 100644 (file)
--- a/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-audio.dts
+++ b/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-can.dts
@@ -20,30 +20,6 @@
                        status = "okay";
                };
        };
-
-       //i2srx_mst
-       fragment@2 {
-               target-path = "/soc/i2srx_mst@100e0000";
-               __overlay__ {
-                       status = "okay";
-               };
-       };
-
-       //pdm
-       fragment@3 {
-               target-path = "/soc/pdm@100d0000";
-               __overlay__ {
-                       status = "okay";
-               };
-       };
-
-       //pwmdac
-       fragment@4 {
-               target-path = "/soc/pwmdac@100b0000";
-               __overlay__ {
-                       status = "okay";
-               };
-       };
 };
 
  

diff --git a/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-rgb2hdmi.dts b/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-rgb2hdmi.dts
index baf03f2..1593bc2 100644 (file)
--- a/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-rgb2hdmi.dts
+++ b/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-rgb2hdmi.dts
@@ -5,22 +5,6 @@
 / {
        compatible = "starfive,jh7110";
 
-       //i2c3
-       fragment@0 {
-               target-path = "/soc/i2c@12030000";
-               __overlay__ {
-                       status = "okay";
-               };
-       };
-
-       //dc8200
-       fragment@1 {
-               target-path = "/soc/dc8200@29400000";
-               __overlay__ {
-                       status = "okay";
-               };
-       };
-
        //hdmi_output
        fragment@2 {
                target-path = "/soc/tda988x_pin";

diff --git a/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-pcie.dts b/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-sdio.dts
similarity index 92%
rename from arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-pcie.dts
rename to arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-sdio.dts
index 2889088..80b7256 100644 (file)
--- a/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-pcie.dts
+++ b/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-sdio.dts
@@ -106,22 +106,6 @@
                        status = "okay";
                };
        };
-
-       //i2srx_3ch
-       fragment@7 {
-               target-path = "/soc/i2srx_3ch@100e0000";
-               __overlay__ {
-                       status = "okay";
-               };
-       };
-
-       //i2stx_4ch1
-       fragment@8 {
-               target-path = "/soc/i2stx_4ch0@120b0000";
-               __overlay__ {
-                       status = "okay";
-               };
-       };
 };
 
  

diff --git a/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-uart5-pwm.dts b/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-uart5-pwm.dts
index bf91e84..feb6d29 100644 (file)
--- a/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-uart5-pwm.dts
+++ b/arch/riscv/boot/dts/starfive/evb-overlay/jh7110-evb-overlay-uart5-pwm.dts
@@ -85,16 +85,8 @@
                };
        };
 
-       //tdm
-       fragment@4 {
-               target-path = "/soc/tdm@10090000";
-               __overlay__ {
-                       status = "okay";
-               };
-       };
-
        //i2c0
-       fragment@5 {
+       fragment@4 {
                target-path = "/soc/i2c@10030000";
                __overlay__ {
                        status = "okay";
@@ -102,7 +94,7 @@
        };
 
        //i2c1
-       fragment@6 {
+       fragment@5 {
                target-path = "/soc/i2c@10040000";
                __overlay__ {
                        status = "okay";
@@ -110,7 +102,7 @@
        };
 
        //i2c3
-       fragment@7 {
+       fragment@6 {
                target-path = "/soc/i2c@12030000";
                __overlay__ {
                        status = "okay";

diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb-dvp-rgb2hdmi.dts b/arch/riscv/boot/dts/starfive/jh7110-evb-dvp-rgb2hdmi.dts
index 8f7e9f6..f6d3ee2 100644 (file)
--- a/arch/riscv/boot/dts/starfive/jh7110-evb-dvp-rgb2hdmi.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-evb-dvp-rgb2hdmi.dts
@@ -26,9 +26,13 @@
 };
 
 &encoder {
-       status = "diabled";
+       status = "disabled";
 };
 
 &mipi_dsi {
-       status = "diabled";
+       status = "disabled";
+};
+
+&mipi_dphy {
+       status = "disabled";
 };

diff --git a/arch/riscv/boot/dts/starfive/jh7110-evb-uart1-rgb2hdmi.dts b/arch/riscv/boot/dts/starfive/jh7110-evb-uart1-rgb2hdmi.dts
index 29fdb5a..f6d67f5 100644 (file)
--- a/arch/riscv/boot/dts/starfive/jh7110-evb-uart1-rgb2hdmi.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-evb-uart1-rgb2hdmi.dts
@@ -48,9 +48,13 @@
 };
 
 &encoder {
-       status = "diabled";
+       status = "disabled";
 };
 
 &mipi_dsi {
-       status = "diabled";
+       status = "disabled";
+};
+
+&mipi_dphy {
+       status = "disabled";
 };