realtek: dts: fix up the wrong soc compatibles

Some rtl9302 based boards use the realtek,rtl838x-soc compatible
in their device tree instead of the correct realtek,rtl9302-soc.

This is also the case for main rtl931x and rtl930x device tree files.

In preperation for utilizing device data in the board-realtek, fix
this up now so that these boards don't end up breaking due to incorrect
prom initialization caused by rtl838x-soc compatible.

Signed-off-by: Rustam Adilov <adilov@tutamail.com>
Link: https://github.com/openwrt/openwrt/pull/24588
Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>

diff --git a/target/linux/realtek/dts/rtl9302_plasmacloud_psx10.dts b/target/linux/realtek/dts/rtl9302_plasmacloud_psx10.dts
index a3791363b00d2c768decd4e03be095b9ee11cf17..77a8f2a646e8235abb93c6eea71de1d3920be7ac 100644 (file)
--- a/target/linux/realtek/dts/rtl9302_plasmacloud_psx10.dts
+++ b/target/linux/realtek/dts/rtl9302_plasmacloud_psx10.dts
@@ -4,7 +4,7 @@
 #include "rtl9302_plasmacloud_common.dtsi"
 
 / {
-       compatible = "plasmacloud,psx10", "realtek,rtl838x-soc";
+       compatible = "plasmacloud,psx10", "realtek,rtl9302-soc";
        model = "Plasma Cloud PSX10";
 
        i2c1: i2c-gpio1 {

diff --git a/target/linux/realtek/dts/rtl9302_plasmacloud_psx8.dts b/target/linux/realtek/dts/rtl9302_plasmacloud_psx8.dts
index 227a5dc8169e6d8ae12ad8bab8972cb65ff46d59..b524096e8ce6b13279515c2949af0a01b3d2ab0f 100644 (file)
--- a/target/linux/realtek/dts/rtl9302_plasmacloud_psx8.dts
+++ b/target/linux/realtek/dts/rtl9302_plasmacloud_psx8.dts
@@ -4,7 +4,7 @@
 #include "rtl9302_plasmacloud_common.dtsi"
 
 / {
-       compatible = "plasmacloud,psx8", "realtek,rtl838x-soc";
+       compatible = "plasmacloud,psx8", "realtek,rtl9302-soc";
        model = "Plasma Cloud PSX8";
 };
 

diff --git a/target/linux/realtek/dts/rtl9302_zyxel_xgs1210-12-a1.dts b/target/linux/realtek/dts/rtl9302_zyxel_xgs1210-12-a1.dts
index e0fd7b23f03747a2b285b46081ec9eda67a076e7..91747a3a084e39700c5407d4bc38d66b11a4000f 100644 (file)
--- a/target/linux/realtek/dts/rtl9302_zyxel_xgs1210-12-a1.dts
+++ b/target/linux/realtek/dts/rtl9302_zyxel_xgs1210-12-a1.dts
@@ -4,7 +4,7 @@
 #include "rtl9302_zyxel_xgs1210-12-common.dtsi"
 
 / {
-       compatible = "zyxel,xgs1210-12-a1", "realtek,rtl838x-soc";
+       compatible = "zyxel,xgs1210-12-a1", "realtek,rtl9302-soc";
        model = "Zyxel XGS1210-12 A1 Switch";
 };
 

diff --git a/target/linux/realtek/dts/rtl9302_zyxel_xgs1210-12-b1.dts b/target/linux/realtek/dts/rtl9302_zyxel_xgs1210-12-b1.dts
index 33e97fe44e2af5702350babfe14c25e437c9352c..516a64051d1411714b7f7eb4ef6d4ecc0ee5fa66 100644 (file)
--- a/target/linux/realtek/dts/rtl9302_zyxel_xgs1210-12-b1.dts
+++ b/target/linux/realtek/dts/rtl9302_zyxel_xgs1210-12-b1.dts
@@ -4,7 +4,7 @@
 #include "rtl9302_zyxel_xgs1210-12-common.dtsi"
 
 / {
-       compatible = "zyxel,xgs1210-12-b1", "realtek,rtl838x-soc";
+       compatible = "zyxel,xgs1210-12-b1", "realtek,rtl9302-soc";
        model = "Zyxel XGS1210-12 B1 Switch";
 };
 

diff --git a/target/linux/realtek/dts/rtl9302_zyxel_xgs1250-12-a1.dts b/target/linux/realtek/dts/rtl9302_zyxel_xgs1250-12-a1.dts
index 62ce19730eaf19ff19a9dc2ac3254db797d4c212..0302cda43e75176b7fe12822e98730708de4bd36 100644 (file)
--- a/target/linux/realtek/dts/rtl9302_zyxel_xgs1250-12-a1.dts
+++ b/target/linux/realtek/dts/rtl9302_zyxel_xgs1250-12-a1.dts
@@ -4,7 +4,7 @@
 #include "rtl9302_zyxel_xgs1250-12-common.dtsi"
 
 / {
-       compatible = "zyxel,xgs1250-12-a1", "realtek,rtl838x-soc";
+       compatible = "zyxel,xgs1250-12-a1", "realtek,rtl9302-soc";
        model = "Zyxel XGS1250-12 A1 Switch";
 };
 

diff --git a/target/linux/realtek/dts/rtl9302_zyxel_xgs1250-12-b1.dts b/target/linux/realtek/dts/rtl9302_zyxel_xgs1250-12-b1.dts
index 6ee2dc25a6a10e1c696b26283d65431ffe69b26b..1042a5344a5ef982d40e61dcd3e10186a6d6c531 100644 (file)
--- a/target/linux/realtek/dts/rtl9302_zyxel_xgs1250-12-b1.dts
+++ b/target/linux/realtek/dts/rtl9302_zyxel_xgs1250-12-b1.dts
@@ -4,7 +4,7 @@
 #include "rtl9302_zyxel_xgs1250-12-common.dtsi"
 
 / {
-       compatible = "zyxel,xgs1250-12-b1", "realtek,rtl838x-soc";
+       compatible = "zyxel,xgs1250-12-b1", "realtek,rtl9302-soc";
        model = "Zyxel XGS1250-12 B1 Switch";
 };
 

diff --git a/target/linux/realtek/dts/rtl930x.dtsi b/target/linux/realtek/dts/rtl930x.dtsi
index 10507b1d389a92c7ae634ec410b1798fee099b5b..fc7acde349d42929d24eec9309d05821442ba096 100644 (file)
--- a/target/linux/realtek/dts/rtl930x.dtsi
+++ b/target/linux/realtek/dts/rtl930x.dtsi
@@ -8,7 +8,7 @@
        #address-cells = <1>;
        #size-cells = <1>;
 
-       compatible = "realtek,rtl838x-soc";
+       compatible = "realtek,rtl930x-soc";
 
        cpus {
                #address-cells = <1>;

diff --git a/target/linux/realtek/dts/rtl931x.dtsi b/target/linux/realtek/dts/rtl931x.dtsi
index a26bfc6d5546f1637931a73013dfa9715285093d..8fe331cc38af6916783e09fb90d40ff35cea80c4 100644 (file)
--- a/target/linux/realtek/dts/rtl931x.dtsi
+++ b/target/linux/realtek/dts/rtl931x.dtsi
@@ -9,7 +9,7 @@
        #address-cells = <1>;
        #size-cells = <1>;
 
-       compatible = "realtek,rtl838x-soc";
+       compatible = "realtek,rtl931x-soc";
 
        cpus {
                #address-cells = <1>;