| Message ID | 1428560482-30938-1-git-send-email-igal.liberman@freescale.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Scott Wood |
| Headers | show |
On Thu, 2015-04-09 at 09:21 +0300, Igal.Liberman wrote: > From: Igal Liberman <Igal.Liberman@freescale.com> > > This patch is required for: https://patchwork.ozlabs.org/patch/459584/ If it's required for that patch, why aren't they part of a patchset rather than independently posted? I don't see any mention of a dependency in that patch, so how would I have known not to apply it? > Signed-off-by: Igal Liberman <Igal.Liberman@freescale.com> > --- > arch/powerpc/boot/dts/fsl/b4420si-post.dtsi | 3 ++- > arch/powerpc/boot/dts/fsl/b4860si-post.dtsi | 3 ++- > arch/powerpc/boot/dts/fsl/b4si-post.dtsi | 3 ++- > arch/powerpc/boot/dts/fsl/p2041si-post.dtsi | 3 ++- > arch/powerpc/boot/dts/fsl/p3041si-post.dtsi | 3 ++- > arch/powerpc/boot/dts/fsl/p4080si-post.dtsi | 3 ++- > arch/powerpc/boot/dts/fsl/p5020si-post.dtsi | 3 ++- > 7 files changed, 14 insertions(+), 7 deletions(-) > > diff --git a/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi b/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi > index 1ea8602..9b14f24 100644 > --- a/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi > +++ b/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi > @@ -77,7 +77,8 @@ > }; > > guts: global-utilities@e0000 { > - compatible = "fsl,b4420-device-config", "fsl,qoriq-device-config-2.0"; > + compatible = "fsl,b4420-device-config", "fsl,b4-device-config", > + "fsl,qoriq-device-config-2.0"; Why? -Scott
Regards, Igal Liberman. > -----Original Message----- > From: Wood Scott-B07421 > Sent: Thursday, April 09, 2015 8:02 PM > To: Liberman Igal-B31950 > Cc: devicetree@vger.kernel.org; linuxppc-dev@lists.ozlabs.org > Subject: Re: [PATCH] powerpc/dts: Add some SoC specific "fsl,*-device- > config" compatibles > > On Thu, 2015-04-09 at 09:21 +0300, Igal.Liberman wrote: > > From: Igal Liberman <Igal.Liberman@freescale.com> > > > > This patch is required for: https://patchwork.ozlabs.org/patch/459584/ > > If it's required for that patch, why aren't they part of a patchset rather than > independently posted? I don't see any mention of a dependency in that > patch, so how would I have known not to apply it? > This patch was left out from the original submissions. I'll add a comment in the next submission of https://patchwork.ozlabs.org/patch/459584/ > > Signed-off-by: Igal Liberman <Igal.Liberman@freescale.com> > > --- > > arch/powerpc/boot/dts/fsl/b4420si-post.dtsi | 3 ++- > > arch/powerpc/boot/dts/fsl/b4860si-post.dtsi | 3 ++- > > arch/powerpc/boot/dts/fsl/b4si-post.dtsi | 3 ++- > > arch/powerpc/boot/dts/fsl/p2041si-post.dtsi | 3 ++- > > arch/powerpc/boot/dts/fsl/p3041si-post.dtsi | 3 ++- > > arch/powerpc/boot/dts/fsl/p4080si-post.dtsi | 3 ++- > > arch/powerpc/boot/dts/fsl/p5020si-post.dtsi | 3 ++- > > 7 files changed, 14 insertions(+), 7 deletions(-) > > > > diff --git a/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi > > b/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi > > index 1ea8602..9b14f24 100644 > > --- a/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi > > +++ b/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi > > @@ -77,7 +77,8 @@ > > }; > > > > guts: global-utilities@e0000 { > > - compatible = "fsl,b4420-device-config", "fsl,qoriq-device- > config-2.0"; > > + compatible = "fsl,b4420-device-config", "fsl,b4-device- > config", > > + "fsl,qoriq-device-config-2.0"; > > Why? > We wanted to be able to determine b4 derivatives together in the FMan clock initialization (without checking b4860/b4420 compatible). > -Scott > Igal
diff --git a/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi b/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi index 1ea8602..9b14f24 100644 --- a/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi @@ -77,7 +77,8 @@ }; guts: global-utilities@e0000 { - compatible = "fsl,b4420-device-config", "fsl,qoriq-device-config-2.0"; + compatible = "fsl,b4420-device-config", "fsl,b4-device-config", + "fsl,qoriq-device-config-2.0"; }; global-utilities@e1000 { diff --git a/arch/powerpc/boot/dts/fsl/b4860si-post.dtsi b/arch/powerpc/boot/dts/fsl/b4860si-post.dtsi index 02ccde6..74a9f5f 100644 --- a/arch/powerpc/boot/dts/fsl/b4860si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/b4860si-post.dtsi @@ -248,7 +248,8 @@ }; guts: global-utilities@e0000 { - compatible = "fsl,b4860-device-config", "fsl,qoriq-device-config-2.0"; + compatible = "fsl,b4860-device-config", "fsl,b4-device-config", + "fsl,qoriq-device-config-2.0"; }; global-utilities@e1000 { diff --git a/arch/powerpc/boot/dts/fsl/b4si-post.dtsi b/arch/powerpc/boot/dts/fsl/b4si-post.dtsi index f8c325e..babb076 100644 --- a/arch/powerpc/boot/dts/fsl/b4si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/b4si-post.dtsi @@ -391,7 +391,8 @@ /include/ "qoriq-mpic4.3.dtsi" guts: global-utilities@e0000 { - compatible = "fsl,b4-device-config"; + compatible = "fsl,b4-device-config", + "fsl,qoriq-device-config-2.0"; reg = <0xe0000 0xe00>; fsl,has-rstcr; fsl,liodn-bits = <12>; diff --git a/arch/powerpc/boot/dts/fsl/p2041si-post.dtsi b/arch/powerpc/boot/dts/fsl/p2041si-post.dtsi index 1f18b8b..a7ae5ae 100644 --- a/arch/powerpc/boot/dts/fsl/p2041si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/p2041si-post.dtsi @@ -311,7 +311,8 @@ /include/ "qoriq-mpic.dtsi" guts: global-utilities@e0000 { - compatible = "fsl,qoriq-device-config-1.0"; + compatible = "fsl,p2041-device-config", + "fsl,qoriq-device-config-1.0"; reg = <0xe0000 0xe00>; fsl,has-rstcr; #sleep-cells = <1>; diff --git a/arch/powerpc/boot/dts/fsl/p3041si-post.dtsi b/arch/powerpc/boot/dts/fsl/p3041si-post.dtsi index a555d24..89d08d6 100644 --- a/arch/powerpc/boot/dts/fsl/p3041si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/p3041si-post.dtsi @@ -338,7 +338,8 @@ /include/ "qoriq-mpic.dtsi" guts: global-utilities@e0000 { - compatible = "fsl,qoriq-device-config-1.0"; + compatible = "fsl,p3041-device-config", + "fsl,qoriq-device-config-1.0"; reg = <0xe0000 0xe00>; fsl,has-rstcr; #sleep-cells = <1>; diff --git a/arch/powerpc/boot/dts/fsl/p4080si-post.dtsi b/arch/powerpc/boot/dts/fsl/p4080si-post.dtsi index 0fe7281..1863d6a 100644 --- a/arch/powerpc/boot/dts/fsl/p4080si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/p4080si-post.dtsi @@ -358,7 +358,8 @@ /include/ "qoriq-mpic.dtsi" guts: global-utilities@e0000 { - compatible = "fsl,qoriq-device-config-1.0"; + compatible = "fsl,p4080-device-config", + "fsl,qoriq-device-config-1.0"; reg = <0xe0000 0xe00>; fsl,has-rstcr; #sleep-cells = <1>; diff --git a/arch/powerpc/boot/dts/fsl/p5020si-post.dtsi b/arch/powerpc/boot/dts/fsl/p5020si-post.dtsi index a34ca20..d979d01 100644 --- a/arch/powerpc/boot/dts/fsl/p5020si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/p5020si-post.dtsi @@ -343,7 +343,8 @@ /include/ "qoriq-mpic.dtsi" guts: global-utilities@e0000 { - compatible = "fsl,qoriq-device-config-1.0"; + compatible = "fsl,p5020-device-config", + "fsl,qoriq-device-config-1.0"; reg = <0xe0000 0xe00>; fsl,has-rstcr; #sleep-cells = <1>;