Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d24bc314 authored by Marian Balakowicz's avatar Marian Balakowicz Committed by Grant Likely
Browse files

[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: default avatarMarian Balakowicz <m8@semihalf.com>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent c5c01c97

Documentation/powerpc/mpc52xx-device-tree-bindings.txt

+2 −2
Original line number Diff line number Diff line
@@ -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

----		-----------	----------	  -----------

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
@@ -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

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

arch/powerpc/boot/dts/lite5200.dts

+9 −17
Original line number Diff line number Diff line
@@ -70,18 +70,16 @@ 
		};



		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>;

			has-wdt;

			fsl,has-wdt;

		};



		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>;
@@ -89,8 +87,7 @@ 
		};



		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>;
@@ -98,8 +95,7 @@ 
		};



		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>;
@@ -107,8 +103,7 @@ 
		};



		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>;
@@ -116,8 +111,7 @@ 
		};



		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>;
@@ -125,8 +119,7 @@ 
		};



		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>;
@@ -134,8 +127,7 @@ 
		};



		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>;

arch/powerpc/boot/dts/lite5200b.dts

+9 −17
Original line number Diff line number Diff line
@@ -70,18 +70,16 @@ 
		};



		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>;

			has-wdt;

			fsl,has-wdt;

		};



		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>;
@@ -89,8 +87,7 @@ 
		};



		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>;
@@ -98,8 +95,7 @@ 
		};



		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>;
@@ -107,8 +103,7 @@ 
		};



		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>;
@@ -116,8 +111,7 @@ 
		};



		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>;
@@ -125,8 +119,7 @@ 
		};



		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>;
@@ -134,8 +127,7 @@ 
		};



		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>;

drivers/watchdog/mpc5200_wdt.c

+3 −0
Original line number Diff line number Diff line
@@ -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);

	if (!has_wdt)

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

	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", },

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

	{},

};

static struct of_platform_driver mpc5200_wdt_driver = {