Commit f39c1101 authored by Andrew Lunn's avatar Andrew Lunn

ARM: Kirkwood: Replace mrvl with marvell

It has been decided to use marvell, not mrvl, in the compatibility
property. Search & replace.
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
parent f3af1c73
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/ { / {
model = "D-Link DNS NASes (kirkwood-based)"; model = "D-Link DNS NASes (kirkwood-based)";
compatible = "dlink,dns-kirkwood", "mrvl,kirkwood-88f6281", "mrvl,kirkwood"; compatible = "dlink,dns-kirkwood", "marvell,kirkwood-88f6281", "marvell,kirkwood";
gpio_keys { gpio_keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
/ { / {
model = "Seagate GoFlex Net"; model = "Seagate GoFlex Net";
compatible = "seagate,goflexnet", "mrvl,kirkwood-88f6281", "mrvl,kirkwood"; compatible = "seagate,goflexnet", "marvell,kirkwood-88f6281", "marvell,kirkwood";
memory { memory {
device_type = "memory"; device_type = "memory";
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
/ { / {
model = "Buffalo Linkstation LS-CHLv2"; model = "Buffalo Linkstation LS-CHLv2";
compatible = "buffalo,lschlv2", "buffalo,lsxl", "mrvl,kirkwood-88f6281", "mrvl,kirkwood"; compatible = "buffalo,lschlv2", "buffalo,lsxl", "marvell,kirkwood-88f6281", "marvell,kirkwood";
memory { memory {
device_type = "memory"; device_type = "memory";
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
/ { / {
model = "Buffalo Linkstation LS-XHL"; model = "Buffalo Linkstation LS-XHL";
compatible = "buffalo,lsxhl", "buffalo,lsxl", "mrvl,kirkwood-88f6281", "mrvl,kirkwood"; compatible = "buffalo,lsxhl", "buffalo,lsxl", "marvell,kirkwood-88f6281", "marvell,kirkwood";
memory { memory {
device_type = "memory"; device_type = "memory";
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/ { / {
model = "QNAP TS219 family"; model = "QNAP TS219 family";
compatible = "qnap,ts219", "mrvl,kirkwood"; compatible = "qnap,ts219", "marvell,kirkwood";
memory { memory {
device_type = "memory"; device_type = "memory";
......
...@@ -32,7 +32,7 @@ struct of_dev_auxdata kirkwood_auxdata_lookup[] __initdata = { ...@@ -32,7 +32,7 @@ struct of_dev_auxdata kirkwood_auxdata_lookup[] __initdata = {
NULL), NULL),
OF_DEV_AUXDATA("marvell,orion-wdt", 0xf1020300, "orion_wdt", NULL), OF_DEV_AUXDATA("marvell,orion-wdt", 0xf1020300, "orion_wdt", NULL),
OF_DEV_AUXDATA("marvell,orion-sata", 0xf1080000, "sata_mv.0", NULL), OF_DEV_AUXDATA("marvell,orion-sata", 0xf1080000, "sata_mv.0", NULL),
OF_DEV_AUXDATA("mrvl,orion-nand", 0xf4000000, "orion_nand", NULL), OF_DEV_AUXDATA("marvell,orion-nand", 0xf4000000, "orion_nand", NULL),
{}, {},
}; };
......
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