lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests 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 baffab28b1
commit 778435045a
9 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/devicetree/bindings/mtd/orion-nand.txt
View File

@@ -1,7 +1,7 @@
NAND support for Marvell Orion SoC platforms NAND support for Marvell Orion SoC platforms
Required properties: Required properties:
- compatible : "mrvl,orion-nand". - compatible : "marvell,orion-nand".
- reg : Base physical address of the NAND and length of memory mapped - reg : Base physical address of the NAND and length of memory mapped
region region
@@ -24,7 +24,7 @@ nand@f4000000 {
ale = <1>; ale = <1>;
bank-width = <1>; bank-width = <1>;
chip-delay = <25>; chip-delay = <25>;
compatible = "mrvl,orion-nand"; compatible = "marvell,orion-nand";
reg = <0xf4000000 0x400>; reg = <0xf4000000 0x400>;
partition@0 { partition@0 {

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

@@ -4,7 +4,7 @@
/ { / {
model = "D-Link DNS-320 NAS (Rev A1)"; model = "D-Link DNS-320 NAS (Rev A1)";
compatible = "dlink,dns-320-a1", "dlink,dns-320", "dlink,dns-kirkwood", "mrvl,kirkwood-88f6281", "mrvl,kirkwood"; compatible = "dlink,dns-320-a1", "dlink,dns-320", "dlink,dns-kirkwood", "marvell,kirkwood-88f6281", "marvell,kirkwood";
memory { memory {
device_type = "memory"; device_type = "memory";

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

@@ -4,7 +4,7 @@
/ { / {
model = "D-Link DNS-325 NAS (Rev A1)"; model = "D-Link DNS-325 NAS (Rev A1)";
compatible = "dlink,dns-325-a1", "dlink,dns-325", "dlink,dns-kirkwood", "mrvl,kirkwood-88f6281", "mrvl,kirkwood"; compatible = "dlink,dns-325-a1", "dlink,dns-325", "dlink,dns-kirkwood", "marvell,kirkwood-88f6281", "marvell,kirkwood";
memory { memory {
device_type = "memory"; device_type = "memory";

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

@@ -4,7 +4,7 @@
/ { / {
model = "Globalscale Technologies Dreamplug"; model = "Globalscale Technologies Dreamplug";
compatible = "globalscale,dreamplug-003-ds2001", "globalscale,dreamplug", "mrvl,kirkwood-88f6281", "mrvl,kirkwood"; compatible = "globalscale,dreamplug-003-ds2001", "globalscale,dreamplug", "marvell,kirkwood-88f6281", "marvell,kirkwood";
memory { memory {
device_type = "memory"; device_type = "memory";

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

@@ -4,7 +4,7 @@
/ { / {
model = "RaidSonic ICY BOX IB-NAS62x0 (Rev B)"; model = "RaidSonic ICY BOX IB-NAS62x0 (Rev B)";
compatible = "raidsonic,ib-nas6210-b", "raidsonic,ib-nas6220-b", "raidsonic,ib-nas6210", "raidsonic,ib-nas6220", "raidsonic,ib-nas62x0", "mrvl,kirkwood-88f6281", "mrvl,kirkwood"; compatible = "raidsonic,ib-nas6210-b", "raidsonic,ib-nas6220-b", "raidsonic,ib-nas6210", "raidsonic,ib-nas6220", "raidsonic,ib-nas62x0", "marvell,kirkwood-88f6281", "marvell,kirkwood";
memory { memory {
device_type = "memory"; device_type = "memory";

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

@@ -4,7 +4,7 @@
/ { / {
model = "Iomega Iconnect"; model = "Iomega Iconnect";
compatible = "iom,iconnect-1.1", "iom,iconnect", "mrvl,kirkwood-88f6281", "mrvl,kirkwood"; compatible = "iom,iconnect-1.1", "iom,iconnect", "marvell,kirkwood-88f6281", "marvell,kirkwood";
memory { memory {
device_type = "memory"; device_type = "memory";

6
arch/arm/boot/dts/kirkwood.dtsi
View File

@@ -1,7 +1,7 @@
/include/ "skeleton.dtsi" /include/ "skeleton.dtsi"
/ { / {
compatible = "mrvl,kirkwood"; compatible = "marvell,kirkwood";
ocp@f1000000 { ocp@f1000000 {
compatible = "simple-bus"; compatible = "simple-bus";
@@ -28,7 +28,7 @@
}; };
rtc@10300 { rtc@10300 {
compatible = "mrvl,kirkwood-rtc", "mrvl,orion-rtc"; compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
reg = <0x10300 0x20>; reg = <0x10300 0x20>;
interrupts = <53>; interrupts = <53>;
}; };
@@ -39,7 +39,7 @@
cle = <0>; cle = <0>;
ale = <1>; ale = <1>;
bank-width = <1>; bank-width = <1>;
compatible = "mrvl,orion-nand"; compatible = "marvell,orion-nand";
reg = <0x3000000 0x400>; reg = <0x3000000 0x400>;
chip-delay = <25>; chip-delay = <25>;
/* set partition map and/or chip-delay in board dts */ /* set partition map and/or chip-delay in board dts */

2
drivers/mtd/nand/orion_nand.c
View File

@@ -218,7 +218,7 @@ static int __devexit orion_nand_remove(struct platform_device *pdev)
#ifdef CONFIG_OF #ifdef CONFIG_OF
static struct of_device_id orion_nand_of_match_table[] = { static struct of_device_id orion_nand_of_match_table[] = {
{ .compatible = "mrvl,orion-nand", }, { .compatible = "marvell,orion-nand", },
{}, {},
}; };
#endif #endif

2
drivers/rtc/rtc-mv.c
View File

@@ -297,7 +297,7 @@ static int __exit mv_rtc_remove(struct platform_device *pdev)
#ifdef CONFIG_OF #ifdef CONFIG_OF
static struct of_device_id rtc_mv_of_match_table[] = { static struct of_device_id rtc_mv_of_match_table[] = {
{ .compatible = "mrvl,orion-rtc", }, { .compatible = "marvell,orion-rtc", },
{} {}
}; };
#endif #endif