diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2012-07-18 19:22:54 +0200 |
|---|---|---|
| committer | Andrew Lunn <andrew@lunn.ch> | 2012-07-27 16:50:57 +0200 |
| commit | f39c1101dd4489bca966974624fe19af1c8ebe23 (patch) | |
| tree | 9c60bbb611a8c16db1a50f3c8b4ceebde1ee446a | |
| parent | f3af1c73f0dde5848d1da50372979c784f2aa34a (diff) | |
| download | op-kernel-dev-f39c1101dd4489bca966974624fe19af1c8ebe23.zip op-kernel-dev-f39c1101dd4489bca966974624fe19af1c8ebe23.tar.gz | |
ARM: Kirkwood: Replace mrvl with marvell
It has been decided to use marvell, not mrvl, in the compatibility
property. Search & replace.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-dnskw.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-goflexnet.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-lschlv2.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-lsxhl.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-ts219.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/mach-kirkwood/board-dt.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/kirkwood-dnskw.dtsi b/arch/arm/boot/dts/kirkwood-dnskw.dtsi index 2bad626..7408655 100644 --- a/arch/arm/boot/dts/kirkwood-dnskw.dtsi +++ b/arch/arm/boot/dts/kirkwood-dnskw.dtsi @@ -2,7 +2,7 @@ / { 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 { compatible = "gpio-keys"; diff --git a/arch/arm/boot/dts/kirkwood-goflexnet.dts b/arch/arm/boot/dts/kirkwood-goflexnet.dts index f6974d1..7c8238f 100644 --- a/arch/arm/boot/dts/kirkwood-goflexnet.dts +++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts @@ -4,7 +4,7 @@ / { model = "Seagate GoFlex Net"; - compatible = "seagate,goflexnet", "mrvl,kirkwood-88f6281", "mrvl,kirkwood"; + compatible = "seagate,goflexnet", "marvell,kirkwood-88f6281", "marvell,kirkwood"; memory { device_type = "memory"; diff --git a/arch/arm/boot/dts/kirkwood-lschlv2.dts b/arch/arm/boot/dts/kirkwood-lschlv2.dts index 37649b5..9510c9e 100644 --- a/arch/arm/boot/dts/kirkwood-lschlv2.dts +++ b/arch/arm/boot/dts/kirkwood-lschlv2.dts @@ -4,7 +4,7 @@ / { 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 { device_type = "memory"; diff --git a/arch/arm/boot/dts/kirkwood-lsxhl.dts b/arch/arm/boot/dts/kirkwood-lsxhl.dts index eb3c071..739019c 100644 --- a/arch/arm/boot/dts/kirkwood-lsxhl.dts +++ b/arch/arm/boot/dts/kirkwood-lsxhl.dts @@ -4,7 +4,7 @@ / { 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 { device_type = "memory"; diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi index b4a789a..64ea27c 100644 --- a/arch/arm/boot/dts/kirkwood-ts219.dtsi +++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi @@ -2,7 +2,7 @@ / { model = "QNAP TS219 family"; - compatible = "qnap,ts219", "mrvl,kirkwood"; + compatible = "qnap,ts219", "marvell,kirkwood"; memory { device_type = "memory"; diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c index 43142cf..e4eb450 100644 --- a/arch/arm/mach-kirkwood/board-dt.c +++ b/arch/arm/mach-kirkwood/board-dt.c @@ -32,7 +32,7 @@ struct of_dev_auxdata kirkwood_auxdata_lookup[] __initdata = { 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("mrvl,orion-nand", 0xf4000000, "orion_nand", NULL), + OF_DEV_AUXDATA("marvell,orion-nand", 0xf4000000, "orion_nand", NULL), {}, }; |
