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: Grant 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>

diff --git a/Documentation/devicetree/bindings/marvell.txt b/Documentation/devicetree/bindings/marvell.txt
index bc287efea4756ec6a29c15e18b810e8d4f834811..ea2b16ced49bb271fbf8193bbb017808bf4f8d1b 100644 (file)
--- 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.
    serial port.
 
    Required properties:
-     - device_type : "serial"
      - compatible : "marvell,mv64360-mpsc"
      - reg : Offset and length of the register set for this device
      - 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.
 
    Example Discovery MPSCINTR node:
      mpsc@8000 {
-            device_type = "serial";
             compatible = "marvell,mv64360-mpsc";
             reg = <0x8000 0x38>;
             virtual-reg = <0xf1008000>;

diff --git a/arch/powerpc/boot/dts/c2k.dts b/arch/powerpc/boot/dts/c2k.dts
index de2044b33336e208e20a31b831cca0f2774e139d..1e32903cb0a891391b846dd6ecc51c2b48dd69be 100644 (file)
--- a/arch/powerpc/boot/dts/c2k.dts
+++ b/arch/powerpc/boot/dts/c2k.dts
@@ -171,7 +171,6 @@
                };
 
                MPSC0: mpsc@8000 {
-                       device_type = "serial";
                        compatible = "marvell,mv64360-mpsc";
                        reg = <0x8000 0x38>;
                        virtual-reg = <0xd8008000>;
@@ -186,7 +185,6 @@
                };
 
                MPSC1: mpsc@9000 {
-                       device_type = "serial";
                        compatible = "marvell,mv64360-mpsc";
                        reg = <0x9000 0x38>;
                        virtual-reg = <0xd8009000>;

diff --git a/arch/powerpc/boot/dts/prpmc2800.dts b/arch/powerpc/boot/dts/prpmc2800.dts
index 77c8db238d1cc699f6390c395a67bbcdc0a71812..00afaacf8c8ce334c4707a5360f04ade1c947896 100644 (file)
--- a/arch/powerpc/boot/dts/prpmc2800.dts
+++ b/arch/powerpc/boot/dts/prpmc2800.dts
@@ -159,7 +159,6 @@
                };
 
                MPSC0: mpsc@8000 {
-                       device_type = "serial";
                        compatible = "marvell,mv64360-mpsc";
                        reg = <0x8000 0x38>;
                        virtual-reg = <0xf1008000>;
@@ -174,7 +173,6 @@
                };
 
                MPSC1: mpsc@9000 {
-                       device_type = "serial";
                        compatible = "marvell,mv64360-mpsc";
                        reg = <0x9000 0x38>;
                        virtual-reg = <0xf1009000>;

diff --git a/arch/powerpc/sysdev/mv64x60_dev.c b/arch/powerpc/sysdev/mv64x60_dev.c
index a3a8fad8537d10c4efff7f17b515e8b20cab4947..c2dba7db71ad533bf15b20739646f1369013033f 100644 (file)
--- 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)
        int err;
 
        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++);
                if (err)
                        printk(KERN_ERR "Failed to initialize MV64x60 "

diff --git a/arch/powerpc/sysdev/mv64x60_udbg.c b/arch/powerpc/sysdev/mv64x60_udbg.c
index 50a81387e9b1537f70f195037319f395869d4cfb..3b8734b870e9c7a5facbf8580f58e9daf05c0c92 100644 (file)
--- a/arch/powerpc/sysdev/mv64x60_udbg.c
+++ b/arch/powerpc/sysdev/mv64x60_udbg.c
@@ -85,7 +85,7 @@ static void mv64x60_udbg_init(void)
        if (!stdout)
                return;
 
-       for_each_compatible_node(np, "serial", "marvell,mv64360-mpsc") {
+       for_each_compatible_node(np, NULL, "marvell,mv64360-mpsc") {
                if (np == stdout)
                        break;
        }