Commit 482c4341 authored by Grant Likely's avatar Grant Likely

dt/bindings: Remove device_type "serial" from marvell,mv64360-mpsc

device_type is deprecated. There is no need to check for it in device
driver code and no need to specify it in the device tree. Remove the
property from stock .dts files and remove the check for it from device
drivers. This change should be 100% backwards compatible with old device
trees.
Signed-off-by: default avatarGrant Likely <grant.likely@linaro.org>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: Kumar Gala <galak@codeaurora.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
parent 35129175
...@@ -265,7 +265,6 @@ prefixed with the string "marvell,", for Marvell Technology Group Ltd. ...@@ -265,7 +265,6 @@ prefixed with the string "marvell,", for Marvell Technology Group Ltd.
serial port. serial port.
Required properties: Required properties:
- device_type : "serial"
- compatible : "marvell,mv64360-mpsc" - compatible : "marvell,mv64360-mpsc"
- reg : Offset and length of the register set for this device - reg : Offset and length of the register set for this device
- sdma : the phandle for the SDMA node used by this port - 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,7 +281,6 @@ prefixed with the string "marvell,", for Marvell Technology Group Ltd.
Example Discovery MPSCINTR node: Example Discovery MPSCINTR node:
mpsc@8000 { mpsc@8000 {
device_type = "serial";
compatible = "marvell,mv64360-mpsc"; compatible = "marvell,mv64360-mpsc";
reg = <0x8000 0x38>; reg = <0x8000 0x38>;
virtual-reg = <0xf1008000>; virtual-reg = <0xf1008000>;
......
...@@ -171,7 +171,6 @@ MPSCINTR: mpscintr@b800 { ...@@ -171,7 +171,6 @@ MPSCINTR: mpscintr@b800 {
}; };
MPSC0: mpsc@8000 { MPSC0: mpsc@8000 {
device_type = "serial";
compatible = "marvell,mv64360-mpsc"; compatible = "marvell,mv64360-mpsc";
reg = <0x8000 0x38>; reg = <0x8000 0x38>;
virtual-reg = <0xd8008000>; virtual-reg = <0xd8008000>;
...@@ -186,7 +185,6 @@ MPSC0: mpsc@8000 { ...@@ -186,7 +185,6 @@ MPSC0: mpsc@8000 {
}; };
MPSC1: mpsc@9000 { MPSC1: mpsc@9000 {
device_type = "serial";
compatible = "marvell,mv64360-mpsc"; compatible = "marvell,mv64360-mpsc";
reg = <0x9000 0x38>; reg = <0x9000 0x38>;
virtual-reg = <0xd8009000>; virtual-reg = <0xd8009000>;
......
...@@ -159,7 +159,6 @@ MPSCINTR: mpscintr@b800 { ...@@ -159,7 +159,6 @@ MPSCINTR: mpscintr@b800 {
}; };
MPSC0: mpsc@8000 { MPSC0: mpsc@8000 {
device_type = "serial";
compatible = "marvell,mv64360-mpsc"; compatible = "marvell,mv64360-mpsc";
reg = <0x8000 0x38>; reg = <0x8000 0x38>;
virtual-reg = <0xf1008000>; virtual-reg = <0xf1008000>;
...@@ -174,7 +173,6 @@ MPSC0: mpsc@8000 { ...@@ -174,7 +173,6 @@ MPSC0: mpsc@8000 {
}; };
MPSC1: mpsc@9000 { MPSC1: mpsc@9000 {
device_type = "serial";
compatible = "marvell,mv64360-mpsc"; compatible = "marvell,mv64360-mpsc";
reg = <0x9000 0x38>; reg = <0x9000 0x38>;
virtual-reg = <0xf1009000>; virtual-reg = <0xf1009000>;
......
...@@ -448,7 +448,7 @@ static int __init mv64x60_device_setup(void) ...@@ -448,7 +448,7 @@ static int __init mv64x60_device_setup(void)
int err; int err;
id = 0; id = 0;
for_each_compatible_node(np, "serial", "marvell,mv64360-mpsc") { for_each_compatible_node(np, NULL, "marvell,mv64360-mpsc") {
err = mv64x60_mpsc_device_setup(np, id++); err = mv64x60_mpsc_device_setup(np, id++);
if (err) if (err)
printk(KERN_ERR "Failed to initialize MV64x60 " printk(KERN_ERR "Failed to initialize MV64x60 "
......
...@@ -85,7 +85,7 @@ static void mv64x60_udbg_init(void) ...@@ -85,7 +85,7 @@ static void mv64x60_udbg_init(void)
if (!stdout) if (!stdout)
return; return;
for_each_compatible_node(np, "serial", "marvell,mv64360-mpsc") { for_each_compatible_node(np, NULL, "marvell,mv64360-mpsc") {
if (np == stdout) if (np == stdout)
break; break;
} }
......
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