Skip to content

L
linux
Commit a1810b44 authored by Mark A. Greer's avatar Mark A. Greer Committed by Paul Mackerras
Browse files
Options

[POWERPC] mv64x60: Fix FDT compatible names: mv64x60 => mv64360 

Compatible names should refer to a specific version of the hardware,
without wildcards.  Change each instance of mv64x60 to mv64360, which
is the oldest version we currently support.
Signed-off-by: default avatarMark A. Greer <mgreer@mvista.com>
Signed-off-by: default avatarDale Farnsworth <dale@farnsworth.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent fb9d93de
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 34 deletions
arch/powerpc/boot/dts/prpmc2800.dts
View file @ a1810b44
...@@ -46,7 +46,7 @@ mv64x60@f1000000 { /* Marvell Discovery */ ...@@ -46,7 +46,7 @@ mv64x60@f1000000 { /* Marvell Discovery */
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
model = "mv64360"; /* Default */ model = "mv64360"; /* Default */
compatible = "marvell,mv64x60"; compatible = "marvell,mv64360";
clock-frequency = <133333333>; clock-frequency = <133333333>;
reg = <0xf1000000 0x10000>; reg = <0xf1000000 0x10000>;
virtual-reg = <0xf1000000>; virtual-reg = <0xf1000000>;
...@@ -74,7 +74,7 @@ mdio { ...@@ -74,7 +74,7 @@ mdio {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
device_type = "mdio"; device_type = "mdio";
compatible = "marvell,mv64x60-mdio"; compatible = "marvell,mv64360-mdio";
PHY0: ethernet-phy@1 { PHY0: ethernet-phy@1 {
device_type = "ethernet-phy"; device_type = "ethernet-phy";
compatible = "broadcom,bcm5421"; compatible = "broadcom,bcm5421";
...@@ -95,7 +95,7 @@ ethernet@2000 { ...@@ -95,7 +95,7 @@ ethernet@2000 {
reg = <0x2000 0x2000>; reg = <0x2000 0x2000>;
eth0 { eth0 {
device_type = "network"; device_type = "network";
compatible = "marvell,mv64x60-eth"; compatible = "marvell,mv64360-eth";
block-index = <0>; block-index = <0>;
interrupts = <32>; interrupts = <32>;
interrupt-parent = <&PIC>; interrupt-parent = <&PIC>;
...@@ -104,7 +104,7 @@ eth0 { ...@@ -104,7 +104,7 @@ eth0 {
}; };
eth1 { eth1 {
device_type = "network"; device_type = "network";
compatible = "marvell,mv64x60-eth"; compatible = "marvell,mv64360-eth";
block-index = <1>; block-index = <1>;
interrupts = <33>; interrupts = <33>;
interrupt-parent = <&PIC>; interrupt-parent = <&PIC>;
...@@ -115,7 +115,7 @@ eth1 { ...@@ -115,7 +115,7 @@ eth1 {
SDMA0: sdma@4000 { SDMA0: sdma@4000 {
device_type = "dma"; device_type = "dma";
compatible = "marvell,mv64x60-sdma"; compatible = "marvell,mv64360-sdma";
reg = <0x4000 0xc18>; reg = <0x4000 0xc18>;
virtual-reg = <0xf1004000>; virtual-reg = <0xf1004000>;
interrupt-base = <0>; interrupt-base = <0>;
...@@ -125,7 +125,7 @@ SDMA0: sdma@4000 { ...@@ -125,7 +125,7 @@ SDMA0: sdma@4000 {
SDMA1: sdma@6000 { SDMA1: sdma@6000 {
device_type = "dma"; device_type = "dma";
compatible = "marvell,mv64x60-sdma"; compatible = "marvell,mv64360-sdma";
reg = <0x6000 0xc18>; reg = <0x6000 0xc18>;
virtual-reg = <0xf1006000>; virtual-reg = <0xf1006000>;
interrupt-base = <0>; interrupt-base = <0>;
...@@ -134,7 +134,7 @@ SDMA1: sdma@6000 { ...@@ -134,7 +134,7 @@ SDMA1: sdma@6000 {
}; };
BRG0: brg@b200 { BRG0: brg@b200 {
compatible = "marvell,mv64x60-brg"; compatible = "marvell,mv64360-brg";
reg = <0xb200 0x8>; reg = <0xb200 0x8>;
clock-src = <8>; clock-src = <8>;
clock-frequency = <133333333>; clock-frequency = <133333333>;
...@@ -143,7 +143,7 @@ BRG0: brg@b200 { ...@@ -143,7 +143,7 @@ BRG0: brg@b200 {
}; };
BRG1: brg@b208 { BRG1: brg@b208 {
compatible = "marvell,mv64x60-brg"; compatible = "marvell,mv64360-brg";
reg = <0xb208 0x8>; reg = <0xb208 0x8>;
clock-src = <8>; clock-src = <8>;
clock-frequency = <133333333>; clock-frequency = <133333333>;
...@@ -166,7 +166,7 @@ MPSCINTR: mpscintr@b800 { ...@@ -166,7 +166,7 @@ MPSCINTR: mpscintr@b800 {
MPSC0: mpsc@8000 { MPSC0: mpsc@8000 {
device_type = "serial"; device_type = "serial";
compatible = "marvell,mpsc"; compatible = "marvell,mv64360-mpsc";
reg = <0x8000 0x38>; reg = <0x8000 0x38>;
virtual-reg = <0xf1008000>; virtual-reg = <0xf1008000>;
sdma = <&SDMA0>; sdma = <&SDMA0>;
...@@ -186,7 +186,7 @@ MPSC0: mpsc@8000 { ...@@ -186,7 +186,7 @@ MPSC0: mpsc@8000 {
MPSC1: mpsc@9000 { MPSC1: mpsc@9000 {
device_type = "serial"; device_type = "serial";
compatible = "marvell,mpsc"; compatible = "marvell,mv64360-mpsc";
reg = <0x9000 0x38>; reg = <0x9000 0x38>;
virtual-reg = <0xf1009000>; virtual-reg = <0xf1009000>;
sdma = <&SDMA1>; sdma = <&SDMA1>;
...@@ -205,14 +205,14 @@ MPSC1: mpsc@9000 { ...@@ -205,14 +205,14 @@ MPSC1: mpsc@9000 {
}; };
wdt@b410 { /* watchdog timer */ wdt@b410 { /* watchdog timer */
compatible = "marvell,mv64x60-wdt"; compatible = "marvell,mv64360-wdt";
reg = <0xb410 0x8>; reg = <0xb410 0x8>;
timeout = <10>; /* wdt timeout in seconds */ timeout = <10>; /* wdt timeout in seconds */
}; };
i2c@c000 { i2c@c000 {
device_type = "i2c"; device_type = "i2c";
compatible = "marvell,mv64x60-i2c"; compatible = "marvell,mv64360-i2c";
reg = <0xc000 0x20>; reg = <0xc000 0x20>;
virtual-reg = <0xf100c000>; virtual-reg = <0xf100c000>;
freq_m = <8>; freq_m = <8>;
...@@ -226,18 +226,18 @@ i2c@c000 { ...@@ -226,18 +226,18 @@ i2c@c000 {
PIC: pic { PIC: pic {
#interrupt-cells = <1>; #interrupt-cells = <1>;
#address-cells = <0>; #address-cells = <0>;
compatible = "marvell,mv64x60-pic"; compatible = "marvell,mv64360-pic";
reg = <0x0 0x88>; reg = <0x0 0x88>;
interrupt-controller; interrupt-controller;
}; };
mpp@f000 { mpp@f000 {
compatible = "marvell,mv64x60-mpp"; compatible = "marvell,mv64360-mpp";
reg = <0xf000 0x10>; reg = <0xf000 0x10>;
}; };
gpp@f100 { gpp@f100 {
compatible = "marvell,mv64x60-gpp"; compatible = "marvell,mv64360-gpp";
reg = <0xf100 0x20>; reg = <0xf100 0x20>;
}; };
...@@ -246,7 +246,7 @@ pci@80000000 { ...@@ -246,7 +246,7 @@ pci@80000000 {
#size-cells = <2>; #size-cells = <2>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
device_type = "pci"; device_type = "pci";
compatible = "marvell,mv64x60-pci"; compatible = "marvell,mv64360-pci";
reg = <0xcf8 0x8>; reg = <0xcf8 0x8>;
ranges = <0x01000000 0x0 0x0 ranges = <0x01000000 0x0 0x0
0x88000000 0x0 0x01000000 0x88000000 0x0 0x01000000
...@@ -285,28 +285,28 @@ pci@80000000 { ...@@ -285,28 +285,28 @@ pci@80000000 {
}; };
cpu-error@0070 { cpu-error@0070 {
compatible = "marvell,mv64x60-cpu-error"; compatible = "marvell,mv64360-cpu-error";
reg = <0x70 0x10 0x128 0x28>; reg = <0x70 0x10 0x128 0x28>;
interrupts = <3>; interrupts = <3>;
interrupt-parent = <&PIC>; interrupt-parent = <&PIC>;
}; };
sram-ctrl@0380 { sram-ctrl@0380 {
compatible = "marvell,mv64x60-sram-ctrl"; compatible = "marvell,mv64360-sram-ctrl";
reg = <0x380 0x80>; reg = <0x380 0x80>;
interrupts = <13>; interrupts = <13>;
interrupt-parent = <&PIC>; interrupt-parent = <&PIC>;
}; };
pci-error@1d40 { pci-error@1d40 {
compatible = "marvell,mv64x60-pci-error"; compatible = "marvell,mv64360-pci-error";
reg = <0x1d40 0x40 0xc28 0x4>; reg = <0x1d40 0x40 0xc28 0x4>;
interrupts = <12>; interrupts = <12>;
interrupt-parent = <&PIC>; interrupt-parent = <&PIC>;
}; };
mem-ctrl@1400 { mem-ctrl@1400 {
compatible = "marvell,mv64x60-mem-ctrl"; compatible = "marvell,mv64360-mem-ctrl";
reg = <0x1400 0x60>; reg = <0x1400 0x60>;
interrupts = <17>; interrupts = <17>;
interrupt-parent = <&PIC>; interrupt-parent = <&PIC>;
......
arch/powerpc/boot/serial.c
View file @ a1810b44
...@@ -119,7 +119,7 @@ int serial_console_init(void) ...@@ -119,7 +119,7 @@ int serial_console_init(void)
if (dt_is_compatible(devp, "ns16550")) if (dt_is_compatible(devp, "ns16550"))
rc = ns16550_console_init(devp, &serial_cd); rc = ns16550_console_init(devp, &serial_cd);
else if (dt_is_compatible(devp, "marvell,mpsc")) else if (dt_is_compatible(devp, "marvell,mv64360-mpsc"))
rc = mpsc_console_init(devp, &serial_cd); rc = mpsc_console_init(devp, &serial_cd);
else if (dt_is_compatible(devp, "fsl,cpm1-scc-uart") || else if (dt_is_compatible(devp, "fsl,cpm1-scc-uart") ||
dt_is_compatible(devp, "fsl,cpm1-smc-uart") || dt_is_compatible(devp, "fsl,cpm1-smc-uart") ||
......
arch/powerpc/platforms/embedded6xx/prpmc2800.c
View file @ a1810b44
...@@ -49,13 +49,13 @@ static void __init prpmc2800_setup_arch(void) ...@@ -49,13 +49,13 @@ static void __init prpmc2800_setup_arch(void)
* ioremap mpp and gpp registers in case they are later * ioremap mpp and gpp registers in case they are later
* needed by prpmc2800_reset_board(). * needed by prpmc2800_reset_board().
*/ */
np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60-mpp"); np = of_find_compatible_node(NULL, NULL, "marvell,mv64360-mpp");
reg = of_get_property(np, "reg", NULL); reg = of_get_property(np, "reg", NULL);
paddr = of_translate_address(np, reg); paddr = of_translate_address(np, reg);
of_node_put(np); of_node_put(np);
mv64x60_mpp_reg_base = ioremap(paddr, reg[1]); mv64x60_mpp_reg_base = ioremap(paddr, reg[1]);
np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60-gpp"); np = of_find_compatible_node(NULL, NULL, "marvell,mv64360-gpp");
reg = of_get_property(np, "reg", NULL); reg = of_get_property(np, "reg", NULL);
paddr = of_translate_address(np, reg); paddr = of_translate_address(np, reg);
of_node_put(np); of_node_put(np);
......
arch/powerpc/sysdev/mv64x60_dev.c
View file @ a1810b44
...@@ -446,22 +446,22 @@ static int __init mv64x60_device_setup(void) ...@@ -446,22 +446,22 @@ static int __init mv64x60_device_setup(void)
int err; int err;
id = 0; id = 0;
for_each_compatible_node(np, "serial", "marvell,mpsc") for_each_compatible_node(np, "serial", "marvell,mv64360-mpsc")
if ((err = mv64x60_mpsc_device_setup(np, id++))) if ((err = mv64x60_mpsc_device_setup(np, id++)))
goto error; goto error;
id = 0; id = 0;
for_each_compatible_node(np, "network", "marvell,mv64x60-eth") for_each_compatible_node(np, "network", "marvell,mv64360-eth")
if ((err = mv64x60_eth_device_setup(np, id++))) if ((err = mv64x60_eth_device_setup(np, id++)))
goto error; goto error;
id = 0; id = 0;
for_each_compatible_node(np, "i2c", "marvell,mv64x60-i2c") for_each_compatible_node(np, "i2c", "marvell,mv64360-i2c")
if ((err = mv64x60_i2c_device_setup(np, id++))) if ((err = mv64x60_i2c_device_setup(np, id++)))
goto error; goto error;
/* support up to one watchdog timer */ /* support up to one watchdog timer */
np = of_find_compatible_node(np, NULL, "marvell,mv64x60-wdt"); np = of_find_compatible_node(np, NULL, "marvell,mv64360-wdt");
if (np) { if (np) {
if ((err = mv64x60_wdt_device_setup(np, id))) if ((err = mv64x60_wdt_device_setup(np, id)))
goto error; goto error;
...@@ -489,7 +489,7 @@ static int __init mv64x60_add_mpsc_console(void) ...@@ -489,7 +489,7 @@ static int __init mv64x60_add_mpsc_console(void)
if (!np) if (!np)
goto not_mpsc; goto not_mpsc;
if (!of_device_is_compatible(np, "marvell,mpsc")) if (!of_device_is_compatible(np, "marvell,mv64360-mpsc"))
goto not_mpsc; goto not_mpsc;
prop = of_get_property(np, "block-index", NULL); prop = of_get_property(np, "block-index", NULL);
......
arch/powerpc/sysdev/mv64x60_pci.c
View file @ a1810b44
...@@ -86,14 +86,14 @@ static int __init mv64x60_sysfs_init(void) ...@@ -86,14 +86,14 @@ static int __init mv64x60_sysfs_init(void)
struct platform_device *pdev; struct platform_device *pdev;
const unsigned int *prop; const unsigned int *prop;
np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60"); np = of_find_compatible_node(NULL, NULL, "marvell,mv64360");
if (!np) if (!np)
return 0; return 0;
prop = of_get_property(np, "hs_reg_valid", NULL); prop = of_get_property(np, "hs_reg_valid", NULL);
of_node_put(np); of_node_put(np);
pdev = platform_device_register_simple("marvell,mv64x60", 0, NULL, 0); pdev = platform_device_register_simple("marvell,mv64360", 0, NULL, 0);
if (IS_ERR(pdev)) if (IS_ERR(pdev))
return PTR_ERR(pdev); return PTR_ERR(pdev);
...@@ -166,6 +166,6 @@ void __init mv64x60_pci_init(void) ...@@ -166,6 +166,6 @@ void __init mv64x60_pci_init(void)
{ {
struct device_node *np; struct device_node *np;
for_each_compatible_node(np, "pci", "marvell,mv64x60-pci") for_each_compatible_node(np, "pci", "marvell,mv64360-pci")
mv64x60_add_bridge(np); mv64x60_add_bridge(np);
} }
arch/powerpc/sysdev/mv64x60_pic.c
View file @ a1810b44
...@@ -238,13 +238,13 @@ void __init mv64x60_init_irq(void) ...@@ -238,13 +238,13 @@ void __init mv64x60_init_irq(void)
const unsigned int *reg; const unsigned int *reg;
unsigned long flags; unsigned long flags;
np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60-gpp"); np = of_find_compatible_node(NULL, NULL, "marvell,mv64360-gpp");
reg = of_get_property(np, "reg", &size); reg = of_get_property(np, "reg", &size);
paddr = of_translate_address(np, reg); paddr = of_translate_address(np, reg);
mv64x60_gpp_reg_base = ioremap(paddr, reg[1]); mv64x60_gpp_reg_base = ioremap(paddr, reg[1]);
of_node_put(np); of_node_put(np);
np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60-pic"); np = of_find_compatible_node(NULL, NULL, "marvell,mv64360-pic");
reg = of_get_property(np, "reg", &size); reg = of_get_property(np, "reg", &size);
paddr = of_translate_address(np, reg); paddr = of_translate_address(np, reg);
mv64x60_irq_reg_base = ioremap(paddr, reg[1]); mv64x60_irq_reg_base = ioremap(paddr, reg[1]);
......
arch/powerpc/sysdev/mv64x60_udbg.c
View file @ a1810b44
...@@ -85,7 +85,7 @@ static void mv64x60_udbg_init(void) ...@@ -85,7 +85,7 @@ static void mv64x60_udbg_init(void)
if (!stdout) if (!stdout)
return; return;
for_each_compatible_node(np, "serial", "marvell,mpsc") { for_each_compatible_node(np, "serial", "marvell,mv64360-mpsc") {
if (np == stdout) if (np == stdout)
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7