Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-11 08:18:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ARM: Kirkwood: Replace mrvl with marvell

Browse Source 
It has been decided to use marvell, not mrvl, in the compatibility
property. Search & replace.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
This commit is contained in:
Andrew Lunn 2012-07-18 19:22:54 +02:00
parent f3af1c73f0
commit f39c1101dd
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/kirkwood-dnskw.dtsi
View File

@ -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";

2
arch/arm/boot/dts/kirkwood-goflexnet.dts
View File

@ -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";

2
arch/arm/boot/dts/kirkwood-lschlv2.dts
View File

@ -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";

2
arch/arm/boot/dts/kirkwood-lsxhl.dts
View File

@ -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
arch/arm/boot/dts/kirkwood-ts219.dtsi
View File

@ -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";

2
arch/arm/mach-kirkwood/board-dt.c
View File

@ -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),
{}, {},
}; };