Skip to content

Commit 49268e2

Browse files
parakabebarino
authored andcommitted
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 <[email protected]> Acked-by: Thomas Bogendoerfer <[email protected]> Signed-off-by: Sergio Paracuellos <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Stephen Boyd <[email protected]>
1 parent b2f471a commit 49268e2

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

arch/mips/ralink/mt7621.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ phys_addr_t mips_cpc_default_phys_base(void)
112112

113113
void __init ralink_of_remap(void)
114114
{
115-
rt_sysc_membase = plat_of_remap_node("mtk,mt7621-sysc");
116-
rt_memc_membase = plat_of_remap_node("mtk,mt7621-memc");
115+
rt_sysc_membase = plat_of_remap_node("mediatek,mt7621-sysc");
116+
rt_memc_membase = plat_of_remap_node("mediatek,mt7621-memc");
117117

118118
if (!rt_sysc_membase || !rt_memc_membase)
119119
panic("Failed to remap core resources");
@@ -181,7 +181,7 @@ void prom_soc_init(struct ralink_soc_info *soc_info)
181181

182182
if (n0 == MT7621_CHIP_NAME0 && n1 == MT7621_CHIP_NAME1) {
183183
name = "MT7621";
184-
soc_info->compatible = "mtk,mt7621-soc";
184+
soc_info->compatible = "mediatek,mt7621-soc";
185185
} else {
186186
panic("mt7621: unknown SoC, n0:%08x n1:%08x\n", n0, n1);
187187
}

drivers/staging/mt7621-dts/mt7621.dtsi

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
#size-cells = <1>;
5757

5858
sysc: sysc@0 {
59-
compatible = "mtk,mt7621-sysc", "syscon";
59+
compatible = "mediatek,mt7621-sysc", "syscon";
6060
reg = <0x0 0x100>;
6161
#clock-cells = <1>;
6262
ralink,memctl = <&memc>;
@@ -66,7 +66,7 @@
6666
};
6767

6868
wdt: wdt@100 {
69-
compatible = "mtk,mt7621-wdt";
69+
compatible = "mediatek,mt7621-wdt";
7070
reg = <0x100 0x100>;
7171
};
7272

@@ -123,17 +123,17 @@
123123
};
124124

125125
memc: memc@5000 {
126-
compatible = "mtk,mt7621-memc", "syscon";
126+
compatible = "mediatek,mt7621-memc", "syscon";
127127
reg = <0x5000 0x1000>;
128128
};
129129

130130
cpc: cpc@1fbf0000 {
131-
compatible = "mtk,mt7621-cpc";
131+
compatible = "mediatek,mt7621-cpc";
132132
reg = <0x1fbf0000 0x8000>;
133133
};
134134

135135
mc: mc@1fbf8000 {
136-
compatible = "mtk,mt7621-mc";
136+
compatible = "mediatek,mt7621-mc";
137137
reg = <0x1fbf8000 0x8000>;
138138
};
139139

@@ -361,7 +361,7 @@
361361
nand: nand@1e003000 {
362362
status = "disabled";
363363

364-
compatible = "mtk,mt7621-nand";
364+
compatible = "mediatek,mt7621-nand";
365365
bank-width = <2>;
366366
reg = <0x1e003000 0x800
367367
0x1e003800 0x800>;

0 commit comments

Comments
 (0)