[PATCH] powerpc/dts: Move pll0/1-div4 index

[PATCH] powerpc/dts: Move pll0/1-div4 index

[Igal.Liberman]

From: Igal Liberman <Igal.Liberman@freescale.com>

This patch updates pll0/1-div4 index to '3'.
Originally it was '2'.

The following patch adds pll0/1-div3 option:
	https://patchwork.ozlabs.org/patch/461151/
After this patch, index '2' becomes pll0/1-div3.

This patch based on top of the following:
	https://patchwork.ozlabs.org/patch/461811/

Signed-off-by: Igal Liberman <Igal.Liberman@freescale.com>
---
 arch/powerpc/boot/dts/fsl/b4si-post.dtsi    |    4 ++--
 arch/powerpc/boot/dts/fsl/t2081si-post.dtsi |    8 ++++----
 arch/powerpc/boot/dts/fsl/t4240si-post.dtsi |    8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/arch/powerpc/boot/dts/fsl/b4si-post.dtsi b/arch/powerpc/boot/dts/fsl/b4si-post.dtsi
index 8d061a4..d6c410d 100644
--- a/arch/powerpc/boot/dts/fsl/b4si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/b4si-post.dtsi
@@ -446,8 +446,8 @@
 			#clock-cells = <0>;
 			reg = <0x0 0x4>;
 			compatible = "fsl,qoriq-core-mux-2.0";
-			clocks = <&pll0 0>, <&pll0 1>, <&pll0 2>,
-				<&pll1 0>, <&pll1 1>, <&pll1 2>;
+			clocks = <&pll0 0>, <&pll0 1>, <&pll0 3>,
+				<&pll1 0>, <&pll1 1>, <&pll1 3>;
 			clock-names = "pll0", "pll0-div2", "pll0-div4",
 				"pll1", "pll1-div2", "pll1-div4";
 			clock-output-names = "cmux0";
diff --git a/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi b/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi
index 1462431..e347f2d 100644
--- a/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi
@@ -587,8 +587,8 @@
 			#clock-cells = <0>;
 			reg = <0x0 4>;
 			compatible = "fsl,qoriq-core-mux-2.0";
-			clocks = <&pll0 0>, <&pll0 1>, <&pll0 2>,
-				 <&pll1 0>, <&pll1 1>, <&pll1 2>;
+			clocks = <&pll0 0>, <&pll0 1>, <&pll0 3>,
+				 <&pll1 0>, <&pll1 1>, <&pll1 3>;
 			clock-names = "pll0", "pll0-div2", "pll0-div4",
 				"pll1", "pll1-div2", "pll1-div4";
 			clock-output-names = "cmux0";
@@ -598,8 +598,8 @@
 			#clock-cells = <0>;
 			reg = <0x20 4>;
 			compatible = "fsl,qoriq-core-mux-2.0";
-			clocks = <&pll0 0>, <&pll0 1>, <&pll0 2>,
-				 <&pll1 0>, <&pll1 1>, <&pll1 2>;
+			clocks = <&pll0 0>, <&pll0 1>, <&pll0 3>,
+				 <&pll1 0>, <&pll1 1>, <&pll1 3>;
 			clock-names = "pll0", "pll0-div2", "pll0-div4",
 				"pll1", "pll1-div2", "pll1-div4";
 			clock-output-names = "cmux1";
diff --git a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi
index 1c91d00..1fdce44 100644
--- a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi
@@ -1099,8 +1099,8 @@
 			#clock-cells = <0>;
 			reg = <0x0 0x4>;
 			compatible = "fsl,qoriq-core-mux-2.0";
-			clocks = <&pll0 0>, <&pll0 1>, <&pll0 2>,
-				<&pll1 0>, <&pll1 1>, <&pll1 2>,
+			clocks = <&pll0 0>, <&pll0 1>, <&pll0 3>,
+				<&pll1 0>, <&pll1 1>, <&pll1 3>,
 				<&pll2 0>, <&pll2 1>, <&pll2 2>;
 			clock-names = "pll0", "pll0-div2", "pll0-div4",
 				"pll1", "pll1-div2", "pll1-div4",
@@ -1112,8 +1112,8 @@
 			#clock-cells = <0>;
 			reg = <0x20 0x4>;
 			compatible = "fsl,qoriq-core-mux-2.0";
-			clocks = <&pll0 0>, <&pll0 1>, <&pll0 2>,
-				<&pll1 0>, <&pll1 1>, <&pll1 2>,
+			clocks = <&pll0 0>, <&pll0 1>, <&pll0 3>,
+				<&pll1 0>, <&pll1 1>, <&pll1 3>,
 				<&pll2 0>, <&pll2 1>, <&pll2 2>;
 			clock-names = "pll0", "pll0-div2", "pll0-div4",
 				"pll1", "pll1-div2", "pll1-div4",
-- 
1.7.9.5

Re: [PATCH] powerpc/dts: Move pll0/1-div4 index

[Scott Wood]

On Thu, 2015-04-16 at 15:08 +0300, Igal.Liberman wrote:
> From: Igal Liberman <Igal.Liberman@freescale.com>
> 
> This patch updates pll0/1-div4 index to '3'.
> Originally it was '2'.
> 
> The following patch adds pll0/1-div3 option:
> 	https://patchwork.ozlabs.org/patch/461151/
> After this patch, index '2' becomes pll0/1-div3.
> 
> This patch based on top of the following:
> 	https://patchwork.ozlabs.org/patch/461811/
> 
> Signed-off-by: Igal Liberman <Igal.Liberman@freescale.com>

This needs to be done in the same patch as the provider change, to avoid
a buggy intermediate state.

Will there be a new binding patch coming?

-Scott

RE: [PATCH] powerpc/dts: Move pll0/1-div4 index

[Igal.Liberman]

DQoNClJlZ2FyZHMsDQpJZ2FsIExpYmVybWFuLg0KDQo+IC0tLS0tT3JpZ2luYWwgTWVzc2FnZS0t
LS0tDQo+IEZyb206IFdvb2QgU2NvdHQtQjA3NDIxDQo+IFNlbnQ6IEZyaWRheSwgQXByaWwgMTcs
IDIwMTUgODo0MiBBTQ0KPiBUbzogTGliZXJtYW4gSWdhbC1CMzE5NTANCj4gQ2M6IGRldmljZXRy
ZWVAdmdlci5rZXJuZWwub3JnOyBsaW51eHBwYy1kZXZAbGlzdHMub3psYWJzLm9yZw0KPiBTdWJq
ZWN0OiBSZTogW1BBVENIXSBwb3dlcnBjL2R0czogTW92ZSBwbGwwLzEtZGl2NCBpbmRleA0KPiAN
Cj4gT24gVGh1LCAyMDE1LTA0LTE2IGF0IDE1OjA4ICswMzAwLCBJZ2FsLkxpYmVybWFuIHdyb3Rl
Og0KPiA+IEZyb206IElnYWwgTGliZXJtYW4gPElnYWwuTGliZXJtYW5AZnJlZXNjYWxlLmNvbT4N
Cj4gPg0KPiA+IFRoaXMgcGF0Y2ggdXBkYXRlcyBwbGwwLzEtZGl2NCBpbmRleCB0byAnMycuDQo+
ID4gT3JpZ2luYWxseSBpdCB3YXMgJzInLg0KPiA+DQo+ID4gVGhlIGZvbGxvd2luZyBwYXRjaCBh
ZGRzIHBsbDAvMS1kaXYzIG9wdGlvbjoNCj4gPiAJaHR0cHM6Ly9wYXRjaHdvcmsub3psYWJzLm9y
Zy9wYXRjaC80NjExNTEvDQo+ID4gQWZ0ZXIgdGhpcyBwYXRjaCwgaW5kZXggJzInIGJlY29tZXMg
cGxsMC8xLWRpdjMuDQo+ID4NCj4gPiBUaGlzIHBhdGNoIGJhc2VkIG9uIHRvcCBvZiB0aGUgZm9s
bG93aW5nOg0KPiA+IAlodHRwczovL3BhdGNod29yay5vemxhYnMub3JnL3BhdGNoLzQ2MTgxMS8N
Cj4gPg0KPiA+IFNpZ25lZC1vZmYtYnk6IElnYWwgTGliZXJtYW4gPElnYWwuTGliZXJtYW5AZnJl
ZXNjYWxlLmNvbT4NCj4gDQo+IFRoaXMgbmVlZHMgdG8gYmUgZG9uZSBpbiB0aGUgc2FtZSBwYXRj
aCBhcyB0aGUgcHJvdmlkZXIgY2hhbmdlLCB0byBhdm9pZCBhDQo+IGJ1Z2d5IGludGVybWVkaWF0
ZSBzdGF0ZS4NCj4gDQo+IFdpbGwgdGhlcmUgYmUgYSBuZXcgYmluZGluZyBwYXRjaCBjb21pbmc/
DQo+IA0KDQpPSywgSSdsbCBhZGQgdGhvc2UgY2hhbmdlcyBhcyBvbiBwYXRjaC4NCg0KUmVnYXJk
aW5nIHRoZSBiaW5kaW5nLA0KSSBhbHJlYWR5IHN1Ym1pdHRlZCBodHRwczovL3BhdGNod29yay5v
emxhYnMub3JnL3BhdGNoLzQ2MTE1MC8NCkRvIHlvdSBtZWFuIHRoYXQgSSBzaG91bGQgYWRkIGNv
bW1lbnQgdGhhdCB0aGUgZHJpdmVyIHBhcnNlcyB0aGUgbm9kZSBieSByZWFkaW5nIHRoZSBudW1i
ZXIgb2YgaW5wdXQgY2xvY2tzIGFuZCBub3QgdGhlIGNvbXBhdGlibGU/DQoNCj4gLVNjb3R0DQo+
IA0KDQpJZ2FsDQoNCg==

Re: [PATCH] powerpc/dts: Move pll0/1-div4 index

[Scott Wood]

On Mon, 2015-04-20 at 06:10 -0500, Liberman Igal-B31950 wrote:
> 
> 
> Regards,
> Igal Liberman.
> 
> > -----Original Message-----
> > From: Wood Scott-B07421
> > Sent: Friday, April 17, 2015 8:42 AM
> > To: Liberman Igal-B31950
> > Cc: devicetree@vger.kernel.org; linuxppc-dev@lists.ozlabs.org
> > Subject: Re: [PATCH] powerpc/dts: Move pll0/1-div4 index
> > 
> > On Thu, 2015-04-16 at 15:08 +0300, Igal.Liberman wrote:
> > > From: Igal Liberman <Igal.Liberman@freescale.com>
> > >
> > > This patch updates pll0/1-div4 index to '3'.
> > > Originally it was '2'.
> > >
> > > The following patch adds pll0/1-div3 option:
> > > 	https://patchwork.ozlabs.org/patch/461151/
> > > After this patch, index '2' becomes pll0/1-div3.
> > >
> > > This patch based on top of the following:
> > > 	https://patchwork.ozlabs.org/patch/461811/
> > >
> > > Signed-off-by: Igal Liberman <Igal.Liberman@freescale.com>
> > 
> > This needs to be done in the same patch as the provider change, to avoid a
> > buggy intermediate state.
> > 
> > Will there be a new binding patch coming?
> > 
> 
> OK, I'll add those changes as on patch.
> 
> Regarding the binding,
> I already submitted https://patchwork.ozlabs.org/patch/461150/

Which is an incompatible change as I noted in a comment on a different
patch.

> Do you mean that I should add comment that the driver parses the node by reading the number of input clocks and not the compatible?

No, you should make the binding document reflect how things currently
work.

-Scott