diff options
| -rw-r--r-- | Documentation/devicetree/bindings/marvell.txt | 2 | ||||
| -rw-r--r-- | arch/powerpc/boot/dts/c2k.dts | 2 | ||||
| -rw-r--r-- | arch/powerpc/boot/dts/prpmc2800.dts | 2 | ||||
| -rw-r--r-- | arch/powerpc/sysdev/mv64x60_dev.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/sysdev/mv64x60_udbg.c | 2 |
5 files changed, 2 insertions, 8 deletions
diff --git a/Documentation/devicetree/bindings/marvell.txt b/Documentation/devicetree/bindings/marvell.txt index bc287efea475..ea2b16ced49b 100644 --- a/Documentation/devicetree/bindings/marvell.txt +++ b/Documentation/devicetree/bindings/marvell.txt | |||
| @@ -265,7 +265,6 @@ prefixed with the string "marvell,", for Marvell Technology Group Ltd. | |||
| 265 | serial port. | 265 | serial port. |
| 266 | 266 | ||
| 267 | Required properties: | 267 | Required properties: |
| 268 | - device_type : "serial" | ||
| 269 | - compatible : "marvell,mv64360-mpsc" | 268 | - compatible : "marvell,mv64360-mpsc" |
| 270 | - reg : Offset and length of the register set for this device | 269 | - reg : Offset and length of the register set for this device |
| 271 | - sdma : the phandle for the SDMA node used by this port | 270 | - sdma : the phandle for the SDMA node used by this port |
| @@ -282,7 +281,6 @@ prefixed with the string "marvell,", for Marvell Technology Group Ltd. | |||
| 282 | 281 | ||
| 283 | Example Discovery MPSCINTR node: | 282 | Example Discovery MPSCINTR node: |
| 284 | mpsc@8000 { | 283 | mpsc@8000 { |
| 285 | device_type = "serial"; | ||
| 286 | compatible = "marvell,mv64360-mpsc"; | 284 | compatible = "marvell,mv64360-mpsc"; |
| 287 | reg = <0x8000 0x38>; | 285 | reg = <0x8000 0x38>; |
| 288 | virtual-reg = <0xf1008000>; | 286 | virtual-reg = <0xf1008000>; |
diff --git a/arch/powerpc/boot/dts/c2k.dts b/arch/powerpc/boot/dts/c2k.dts index de2044b33336..1e32903cb0a8 100644 --- a/arch/powerpc/boot/dts/c2k.dts +++ b/arch/powerpc/boot/dts/c2k.dts | |||
| @@ -171,7 +171,6 @@ | |||
| 171 | }; | 171 | }; |
| 172 | 172 | ||
| 173 | MPSC0: mpsc@8000 { | 173 | MPSC0: mpsc@8000 { |
| 174 | device_type = "serial"; | ||
| 175 | compatible = "marvell,mv64360-mpsc"; | 174 | compatible = "marvell,mv64360-mpsc"; |
| 176 | reg = <0x8000 0x38>; | 175 | reg = <0x8000 0x38>; |
| 177 | virtual-reg = <0xd8008000>; | 176 | virtual-reg = <0xd8008000>; |
| @@ -186,7 +185,6 @@ | |||
| 186 | }; | 185 | }; |
| 187 | 186 | ||
| 188 | MPSC1: mpsc@9000 { | 187 | MPSC1: mpsc@9000 { |
| 189 | device_type = "serial"; | ||
| 190 | compatible = "marvell,mv64360-mpsc"; | 188 | compatible = "marvell,mv64360-mpsc"; |
| 191 | reg = <0x9000 0x38>; | 189 | reg = <0x9000 0x38>; |
| 192 | virtual-reg = <0xd8009000>; | 190 | virtual-reg = <0xd8009000>; |
diff --git a/arch/powerpc/boot/dts/prpmc2800.dts b/arch/powerpc/boot/dts/prpmc2800.dts index 77c8db238d1c..00afaacf8c8c 100644 --- a/arch/powerpc/boot/dts/prpmc2800.dts +++ b/arch/powerpc/boot/dts/prpmc2800.dts | |||
| @@ -159,7 +159,6 @@ | |||
| 159 | }; | 159 | }; |
| 160 | 160 | ||
| 161 | MPSC0: mpsc@8000 { | 161 | MPSC0: mpsc@8000 { |
| 162 | device_type = "serial"; | ||
| 163 | compatible = "marvell,mv64360-mpsc"; | 162 | compatible = "marvell,mv64360-mpsc"; |
| 164 | reg = <0x8000 0x38>; | 163 | reg = <0x8000 0x38>; |
| 165 | virtual-reg = <0xf1008000>; | 164 | virtual-reg = <0xf1008000>; |
| @@ -174,7 +173,6 @@ | |||
| 174 | }; | 173 | }; |
| 175 | 174 | ||
| 176 | MPSC1: mpsc@9000 { | 175 | MPSC1: mpsc@9000 { |
| 177 | device_type = "serial"; | ||
| 178 | compatible = "marvell,mv64360-mpsc"; | 176 | compatible = "marvell,mv64360-mpsc"; |
| 179 | reg = <0x9000 0x38>; | 177 | reg = <0x9000 0x38>; |
| 180 | virtual-reg = <0xf1009000>; | 178 | virtual-reg = <0xf1009000>; |
diff --git a/arch/powerpc/sysdev/mv64x60_dev.c b/arch/powerpc/sysdev/mv64x60_dev.c index a3a8fad8537d..c2dba7db71ad 100644 --- a/arch/powerpc/sysdev/mv64x60_dev.c +++ b/arch/powerpc/sysdev/mv64x60_dev.c | |||
| @@ -448,7 +448,7 @@ static int __init mv64x60_device_setup(void) | |||
| 448 | int err; | 448 | int err; |
| 449 | 449 | ||
| 450 | id = 0; | 450 | id = 0; |
| 451 | for_each_compatible_node(np, "serial", "marvell,mv64360-mpsc") { | 451 | for_each_compatible_node(np, NULL, "marvell,mv64360-mpsc") { |
| 452 | err = mv64x60_mpsc_device_setup(np, id++); | 452 | err = mv64x60_mpsc_device_setup(np, id++); |
| 453 | if (err) | 453 | if (err) |
| 454 | printk(KERN_ERR "Failed to initialize MV64x60 " | 454 | printk(KERN_ERR "Failed to initialize MV64x60 " |
diff --git a/arch/powerpc/sysdev/mv64x60_udbg.c b/arch/powerpc/sysdev/mv64x60_udbg.c index 50a81387e9b1..3b8734b870e9 100644 --- a/arch/powerpc/sysdev/mv64x60_udbg.c +++ b/arch/powerpc/sysdev/mv64x60_udbg.c | |||
| @@ -85,7 +85,7 @@ static void mv64x60_udbg_init(void) | |||
| 85 | if (!stdout) | 85 | if (!stdout) |
| 86 | return; | 86 | return; |
| 87 | 87 | ||
| 88 | for_each_compatible_node(np, "serial", "marvell,mv64360-mpsc") { | 88 | for_each_compatible_node(np, NULL, "marvell,mv64360-mpsc") { |
| 89 | if (np == stdout) | 89 | if (np == stdout) |
| 90 | break; | 90 | break; |
| 91 | } | 91 | } |
