staging: mt7621-dts: use valid vendor 'mediatek' instead of invalid 'mtk'

Vendor listed for mediatek in kernel vendor file 'vendor-prefixes.yaml'
contains 'mediatek' as a valid vendor string. Some nodes in the device
tree are using an invalid vendor string vfor 'mtk' instead. Fix all of
them in dts file. Update also ralink mt7621 related code to properly
match new strings. Even there are used in the device tree there are
some strings that are not referred anywhere but have been also updated
with new vendor name. These are 'mtk,mt7621-wdt', 'mtk,mt7621-nand',
'mtk,mt7621-mc', and 'mtk,mt7621-cpc'.

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Link: https://lore.kernel.org/r/20210410055059.13518-4-sergio.paracuellos@gmail.com
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/arch/mips/ralink/mt7621.c b/arch/mips/ralink/mt7621.c
index ca0ac607b0f3c923667188d66bf1f5157ffcc93c..5d74fc1c96acc18d6d44d92e15c7d34b080ac80b 100644 (file)
--- a/arch/mips/ralink/mt7621.c
+++ b/arch/mips/ralink/mt7621.c
@@ -112,8 +112,8 @@ phys_addr_t mips_cpc_default_phys_base(void)
 
 void __init ralink_of_remap(void)
 {
-       rt_sysc_membase = plat_of_remap_node("mtk,mt7621-sysc");
-       rt_memc_membase = plat_of_remap_node("mtk,mt7621-memc");
+       rt_sysc_membase = plat_of_remap_node("mediatek,mt7621-sysc");
+       rt_memc_membase = plat_of_remap_node("mediatek,mt7621-memc");
 
        if (!rt_sysc_membase || !rt_memc_membase)
                panic("Failed to remap core resources");
@@ -181,7 +181,7 @@ void prom_soc_init(struct ralink_soc_info *soc_info)
 
        if (n0 == MT7621_CHIP_NAME0 && n1 == MT7621_CHIP_NAME1) {
                name = "MT7621";
-               soc_info->compatible = "mtk,mt7621-soc";
+               soc_info->compatible = "mediatek,mt7621-soc";
        } else {
                panic("mt7621: unknown SoC, n0:%08x n1:%08x\n", n0, n1);
        }

diff --git a/drivers/staging/mt7621-dts/mt7621.dtsi b/drivers/staging/mt7621-dts/mt7621.dtsi
index b68183e7e6ad8c5dac9d6f4c559331ac66f6a485..f0c9ae757bcd9766fd335f218be8c9fd3ead876e 100644 (file)
--- a/drivers/staging/mt7621-dts/mt7621.dtsi
+++ b/drivers/staging/mt7621-dts/mt7621.dtsi
@@ -56,7 +56,7 @@
                #size-cells = <1>;
 
                sysc: sysc@0 {
-                       compatible = "mtk,mt7621-sysc", "syscon";
+                       compatible = "mediatek,mt7621-sysc", "syscon";
                        reg = <0x0 0x100>;
                        #clock-cells = <1>;
                        ralink,memctl = <&memc>;
@@ -66,7 +66,7 @@
                };
 
                wdt: wdt@100 {
-                       compatible = "mtk,mt7621-wdt";
+                       compatible = "mediatek,mt7621-wdt";
                        reg = <0x100 0x100>;
                };
 
@@ -123,17 +123,17 @@
                };
 
                memc: memc@5000 {
-                       compatible = "mtk,mt7621-memc", "syscon";
+                       compatible = "mediatek,mt7621-memc", "syscon";
                        reg = <0x5000 0x1000>;
                };
 
                cpc: cpc@1fbf0000 {
-                            compatible = "mtk,mt7621-cpc";
+                            compatible = "mediatek,mt7621-cpc";
                             reg = <0x1fbf0000 0x8000>;
                };
 
                mc: mc@1fbf8000 {
-                           compatible = "mtk,mt7621-mc";
+                           compatible = "mediatek,mt7621-mc";
                            reg = <0x1fbf8000 0x8000>;
                };
 
@@ -361,7 +361,7 @@
        nand: nand@1e003000 {
                status = "disabled";
 
-               compatible = "mtk,mt7621-nand";
+               compatible = "mediatek,mt7621-nand";
                bank-width = <2>;
                reg = <0x1e003000 0x800
                        0x1e003800 0x800>;