[POWERPC] Update device tree binding for mpc5200 gpt

Add 'fsl,' prefix to 'compatible' property for gpt nodes.
Add 'fsl,' prefix to empty, GPT0 specific 'has-wdt' property.
The fsl, prefix is being added to better match the convention of prefixing
manufacturer specific properties and values with the vendors name.

Signed-off-by: Marian Balakowicz <m8@semihalf.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

diff --git a/Documentation/powerpc/mpc52xx-device-tree-bindings.txt b/Documentation/powerpc/mpc52xx-device-tree-bindings.txt
index 5f7d536cb0c60351eae676c1fe5dd81407ae55ef..5e03610e186f986c5cc3a21a5e4f9bbac3ee4332 100644 (file)
--- a/Documentation/powerpc/mpc52xx-device-tree-bindings.txt
+++ b/Documentation/powerpc/mpc52xx-device-tree-bindings.txt
@@ -185,7 +185,7 @@ bestcomm@<addr>     dma-controller          mpc5200-bestcomm 5200 pic also requires
 Recommended soc5200 child nodes; populate as needed for your board
 name           device_type     compatible        Description
 ----           -----------     ----------        -----------
 Recommended soc5200 child nodes; populate as needed for your board
 name           device_type     compatible        Description
 ----           -----------     ----------        -----------

-gpt@<addr>     gpt             mpc5200-gpt       General purpose timers
+gpt@<addr>     gpt             fsl,mpc5200-gpt   General purpose timers

 rtc@<addr>     rtc             mpc5200-rtc       Real time clock
 mscan@<addr>   mscan           mpc5200-mscan     CAN bus controller
 pci@<addr>     pci             mpc5200-pci       PCI bridge
 rtc@<addr>     rtc             mpc5200-rtc       Real time clock
 mscan@<addr>   mscan           mpc5200-mscan     CAN bus controller
 pci@<addr>     pci             mpc5200-pci       PCI bridge


@@ -213,7 +213,7 @@ cell-index  int             When multiple devices are present, is the
 5) General Purpose Timer nodes (child of soc5200 node)
 On the mpc5200 and 5200b, GPT0 has a watchdog timer function.  If the board
 design supports the internal wdt, then the device node for GPT0 should
 5) General Purpose Timer nodes (child of soc5200 node)
 On the mpc5200 and 5200b, GPT0 has a watchdog timer function.  If the board
 design supports the internal wdt, then the device node for GPT0 should

-include the empty property 'has-wdt'.
+include the empty property 'fsl,has-wdt'.

 
 6) PSC nodes (child of soc5200 node)
 PSC nodes can define the optional 'port-number' property to force assignment
 
 6) PSC nodes (child of soc5200 node)
 PSC nodes can define the optional 'port-number' property to force assignment

diff --git a/arch/powerpc/boot/dts/lite5200.dts b/arch/powerpc/boot/dts/lite5200.dts
index bc45f5fbb0609f924fbb9a92c9211b1cdc0c47e0..6731763f028248d2569987d7f4f0c3585d5ae2c9 100644 (file)
--- a/arch/powerpc/boot/dts/lite5200.dts
+++ b/arch/powerpc/boot/dts/lite5200.dts
@@ -70,18 +70,16 @@
                };
 
                gpt@600 {       // General Purpose Timer
                };
 
                gpt@600 {       // General Purpose Timer

-                       compatible = "mpc5200-gpt";
-                       device_type = "gpt";
+                       compatible = "fsl,mpc5200-gpt";

                        cell-index = <0>;
                        reg = <600 10>;
                        interrupts = <1 9 0>;
                        interrupt-parent = <&mpc5200_pic>;
                        cell-index = <0>;
                        reg = <600 10>;
                        interrupts = <1 9 0>;
                        interrupt-parent = <&mpc5200_pic>;

-                       has-wdt;
+                       fsl,has-wdt;

                };
 
                gpt@610 {       // General Purpose Timer
                };
 
                gpt@610 {       // General Purpose Timer

-                       compatible = "mpc5200-gpt";
-                       device_type = "gpt";
+                       compatible = "fsl,mpc5200-gpt";

                        cell-index = <1>;
                        reg = <610 10>;
                        interrupts = <1 a 0>;
                        cell-index = <1>;
                        reg = <610 10>;
                        interrupts = <1 a 0>;


@@ -89,8 +87,7 @@
                };
 
                gpt@620 {       // General Purpose Timer
                };
 
                gpt@620 {       // General Purpose Timer

-                       compatible = "mpc5200-gpt";
-                       device_type = "gpt";
+                       compatible = "fsl,mpc5200-gpt";

                        cell-index = <2>;
                        reg = <620 10>;
                        interrupts = <1 b 0>;
                        cell-index = <2>;
                        reg = <620 10>;
                        interrupts = <1 b 0>;


@@ -98,8 +95,7 @@
                };
 
                gpt@630 {       // General Purpose Timer
                };
 
                gpt@630 {       // General Purpose Timer

-                       compatible = "mpc5200-gpt";
-                       device_type = "gpt";
+                       compatible = "fsl,mpc5200-gpt";

                        cell-index = <3>;
                        reg = <630 10>;
                        interrupts = <1 c 0>;
                        cell-index = <3>;
                        reg = <630 10>;
                        interrupts = <1 c 0>;


@@ -107,8 +103,7 @@
                };
 
                gpt@640 {       // General Purpose Timer
                };
 
                gpt@640 {       // General Purpose Timer

-                       compatible = "mpc5200-gpt";
-                       device_type = "gpt";
+                       compatible = "fsl,mpc5200-gpt";

                        cell-index = <4>;
                        reg = <640 10>;
                        interrupts = <1 d 0>;
                        cell-index = <4>;
                        reg = <640 10>;
                        interrupts = <1 d 0>;


@@ -116,8 +111,7 @@
                };
 
                gpt@650 {       // General Purpose Timer
                };
 
                gpt@650 {       // General Purpose Timer

-                       compatible = "mpc5200-gpt";
-                       device_type = "gpt";
+                       compatible = "fsl,mpc5200-gpt";

                        cell-index = <5>;
                        reg = <650 10>;
                        interrupts = <1 e 0>;
                        cell-index = <5>;
                        reg = <650 10>;
                        interrupts = <1 e 0>;


@@ -125,8 +119,7 @@
                };
 
                gpt@660 {       // General Purpose Timer
                };
 
                gpt@660 {       // General Purpose Timer

-                       compatible = "mpc5200-gpt";
-                       device_type = "gpt";
+                       compatible = "fsl,mpc5200-gpt";

                        cell-index = <6>;
                        reg = <660 10>;
                        interrupts = <1 f 0>;
                        cell-index = <6>;
                        reg = <660 10>;
                        interrupts = <1 f 0>;


@@ -134,8 +127,7 @@
                };
 
                gpt@670 {       // General Purpose Timer
                };
 
                gpt@670 {       // General Purpose Timer

-                       compatible = "mpc5200-gpt";
-                       device_type = "gpt";
+                       compatible = "fsl,mpc5200-gpt";

                        cell-index = <7>;
                        reg = <670 10>;
                        interrupts = <1 10 0>;
                        cell-index = <7>;
                        reg = <670 10>;
                        interrupts = <1 10 0>;

diff --git a/arch/powerpc/boot/dts/lite5200b.dts b/arch/powerpc/boot/dts/lite5200b.dts
index 6582c9a39b27aacee6f539619fab4ddf25248a6e..b540388c608c4ec9addf0a3d66c9664f6d2d5ac6 100644 (file)
--- a/arch/powerpc/boot/dts/lite5200b.dts
+++ b/arch/powerpc/boot/dts/lite5200b.dts
@@ -70,18 +70,16 @@
                };
 
                gpt@600 {       // General Purpose Timer
                };
 
                gpt@600 {       // General Purpose Timer

-                       compatible = "mpc5200b-gpt","mpc5200-gpt";
-                       device_type = "gpt";
+                       compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";

                        cell-index = <0>;
                        reg = <600 10>;
                        interrupts = <1 9 0>;
                        interrupt-parent = <&mpc5200_pic>;
                        cell-index = <0>;
                        reg = <600 10>;
                        interrupts = <1 9 0>;
                        interrupt-parent = <&mpc5200_pic>;

-                       has-wdt;
+                       fsl,has-wdt;

                };
 
                gpt@610 {       // General Purpose Timer
                };
 
                gpt@610 {       // General Purpose Timer

-                       compatible = "mpc5200b-gpt","mpc5200-gpt";
-                       device_type = "gpt";
+                       compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";

                        cell-index = <1>;
                        reg = <610 10>;
                        interrupts = <1 a 0>;
                        cell-index = <1>;
                        reg = <610 10>;
                        interrupts = <1 a 0>;


@@ -89,8 +87,7 @@
                };
 
                gpt@620 {       // General Purpose Timer
                };
 
                gpt@620 {       // General Purpose Timer

-                       compatible = "mpc5200b-gpt","mpc5200-gpt";
-                       device_type = "gpt";
+                       compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";

                        cell-index = <2>;
                        reg = <620 10>;
                        interrupts = <1 b 0>;
                        cell-index = <2>;
                        reg = <620 10>;
                        interrupts = <1 b 0>;


@@ -98,8 +95,7 @@
                };
 
                gpt@630 {       // General Purpose Timer
                };
 
                gpt@630 {       // General Purpose Timer

-                       compatible = "mpc5200b-gpt","mpc5200-gpt";
-                       device_type = "gpt";
+                       compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";

                        cell-index = <3>;
                        reg = <630 10>;
                        interrupts = <1 c 0>;
                        cell-index = <3>;
                        reg = <630 10>;
                        interrupts = <1 c 0>;


@@ -107,8 +103,7 @@
                };
 
                gpt@640 {       // General Purpose Timer
                };
 
                gpt@640 {       // General Purpose Timer

-                       compatible = "mpc5200b-gpt","mpc5200-gpt";
-                       device_type = "gpt";
+                       compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";

                        cell-index = <4>;
                        reg = <640 10>;
                        interrupts = <1 d 0>;
                        cell-index = <4>;
                        reg = <640 10>;
                        interrupts = <1 d 0>;


@@ -116,8 +111,7 @@
                };
 
                gpt@650 {       // General Purpose Timer
                };
 
                gpt@650 {       // General Purpose Timer

-                       compatible = "mpc5200b-gpt","mpc5200-gpt";
-                       device_type = "gpt";
+                       compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";

                        cell-index = <5>;
                        reg = <650 10>;
                        interrupts = <1 e 0>;
                        cell-index = <5>;
                        reg = <650 10>;
                        interrupts = <1 e 0>;


@@ -125,8 +119,7 @@
                };
 
                gpt@660 {       // General Purpose Timer
                };
 
                gpt@660 {       // General Purpose Timer

-                       compatible = "mpc5200b-gpt","mpc5200-gpt";
-                       device_type = "gpt";
+                       compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";

                        cell-index = <6>;
                        reg = <660 10>;
                        interrupts = <1 f 0>;
                        cell-index = <6>;
                        reg = <660 10>;
                        interrupts = <1 f 0>;


@@ -134,8 +127,7 @@
                };
 
                gpt@670 {       // General Purpose Timer
                };
 
                gpt@670 {       // General Purpose Timer

-                       compatible = "mpc5200b-gpt","mpc5200-gpt";
-                       device_type = "gpt";
+                       compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";

                        cell-index = <7>;
                        reg = <670 10>;
                        interrupts = <1 10 0>;
                        cell-index = <7>;
                        reg = <670 10>;
                        interrupts = <1 10 0>;

diff --git a/drivers/watchdog/mpc5200_wdt.c b/drivers/watchdog/mpc5200_wdt.c
index 9cfb9757662361cb64b770764aa1fa66a4be29f8..11f6a111e75b750dc6716bb19ba2aedb4cdc98aa 100644 (file)
--- a/drivers/watchdog/mpc5200_wdt.c
+++ b/drivers/watchdog/mpc5200_wdt.c
@@ -175,6 +175,8 @@ static int mpc5200_wdt_probe(struct of_device *op, const struct of_device_id *ma
        int size;
 
        has_wdt = of_get_property(op->node, "has-wdt", NULL);
        int size;
 
        has_wdt = of_get_property(op->node, "has-wdt", NULL);

+       if (!has_wdt)
+               has_wdt = of_get_property(op->node, "fsl,has-wdt", NULL);

        if (!has_wdt)
                return -ENODEV;
 
        if (!has_wdt)
                return -ENODEV;
 


@@ -254,6 +256,7 @@ static int mpc5200_wdt_shutdown(struct of_device *op)
 
 static struct of_device_id mpc5200_wdt_match[] = {
        { .compatible = "mpc5200-gpt", },
 
 static struct of_device_id mpc5200_wdt_match[] = {
        { .compatible = "mpc5200-gpt", },

+       { .compatible = "fsl,mpc5200-gpt", },

        {},
 };
 static struct of_platform_driver mpc5200_wdt_driver = {
        {},
 };
 static struct of_platform_driver mpc5200_wdt_driver = {