| Message ID | 20181115145013.3378-9-paul.kocialkowski@bootlin.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Cedrus support for the Allwinner H5 and A64 platforms | expand |
On Thu, Nov 15, 2018 at 03:50:06PM +0100, Paul Kocialkowski wrote: > Now that we have specific nodes for the H3 and H5 system-controller > that allow proper access to the EMAC clock configuration register, > we no longer need a common dummy syscon node. > > Switch the syscon label over to each platform's dtsi file. > > Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > --- > arch/arm/boot/dts/sun8i-h3.dtsi | 2 +- > arch/arm/boot/dts/sunxi-h3-h5.dtsi | 6 ------ > arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 2 +- > 3 files changed, 2 insertions(+), 8 deletions(-) > > diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi > index 7157d954fb8c..b337a9282783 100644 > --- a/arch/arm/boot/dts/sun8i-h3.dtsi > +++ b/arch/arm/boot/dts/sun8i-h3.dtsi > @@ -134,7 +134,7 @@ > }; > > soc { > - system-control@1c00000 { > + syscon: system-control@1c00000 { > compatible = "allwinner,sun8i-h3-system-control"; > reg = <0x01c00000 0x1000>; > #address-cells = <1>; > diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi > index 4b1530ebe427..9175ff0fb59a 100644 > --- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi > +++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi > @@ -152,12 +152,6 @@ > }; > }; > > - syscon: syscon@1c00000 { > - compatible = "allwinner,sun8i-h3-system-controller", > - "syscon"; > - reg = <0x01c00000 0x1000>; > - }; > - You're also dropping the syscon compatible there. But I'm not sure how it could work with the H3 EMAC driver that would overwrite the compatible already. Maxime
On Fri, Nov 16, 2018 at 5:39 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote: > > On Thu, Nov 15, 2018 at 03:50:06PM +0100, Paul Kocialkowski wrote: > > Now that we have specific nodes for the H3 and H5 system-controller > > that allow proper access to the EMAC clock configuration register, > > we no longer need a common dummy syscon node. > > > > Switch the syscon label over to each platform's dtsi file. > > > > Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > --- > > arch/arm/boot/dts/sun8i-h3.dtsi | 2 +- > > arch/arm/boot/dts/sunxi-h3-h5.dtsi | 6 ------ > > arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 2 +- > > 3 files changed, 2 insertions(+), 8 deletions(-) > > > > diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi > > index 7157d954fb8c..b337a9282783 100644 > > --- a/arch/arm/boot/dts/sun8i-h3.dtsi > > +++ b/arch/arm/boot/dts/sun8i-h3.dtsi > > @@ -134,7 +134,7 @@ > > }; > > > > soc { > > - system-control@1c00000 { > > + syscon: system-control@1c00000 { > > compatible = "allwinner,sun8i-h3-system-control"; > > reg = <0x01c00000 0x1000>; > > #address-cells = <1>; > > diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi > > index 4b1530ebe427..9175ff0fb59a 100644 > > --- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi > > +++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi > > @@ -152,12 +152,6 @@ > > }; > > }; > > > > - syscon: syscon@1c00000 { > > - compatible = "allwinner,sun8i-h3-system-controller", > > - "syscon"; > > - reg = <0x01c00000 0x1000>; > > - }; > > - > > You're also dropping the syscon compatible there. But I'm not sure how > it could work with the H3 EMAC driver that would overwrite the > compatible already. I assume you are referring to the previous patch? The node names are not the same, hence the previous patch is adding another node for the system controller, and this patch removes the old one with the "syscon" compatible. We already patched the EMAC driver to support the new SRAM controller based regmap, so other than making people unhappy about having to update their DT, I don't think there would be any problems. This also means H3 in -next currently has _two_ syscon nodes. ChenYu
Hi, Le vendredi 16 novembre 2018 à 17:47 +0800, Chen-Yu Tsai a écrit : > On Fri, Nov 16, 2018 at 5:39 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote: > > On Thu, Nov 15, 2018 at 03:50:06PM +0100, Paul Kocialkowski wrote: > > > Now that we have specific nodes for the H3 and H5 system-controller > > > that allow proper access to the EMAC clock configuration register, > > > we no longer need a common dummy syscon node. > > > > > > Switch the syscon label over to each platform's dtsi file. > > > > > > Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > > --- > > > arch/arm/boot/dts/sun8i-h3.dtsi | 2 +- > > > arch/arm/boot/dts/sunxi-h3-h5.dtsi | 6 ------ > > > arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 2 +- > > > 3 files changed, 2 insertions(+), 8 deletions(-) > > > > > > diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi > > > index 7157d954fb8c..b337a9282783 100644 > > > --- a/arch/arm/boot/dts/sun8i-h3.dtsi > > > +++ b/arch/arm/boot/dts/sun8i-h3.dtsi > > > @@ -134,7 +134,7 @@ > > > }; > > > > > > soc { > > > - system-control@1c00000 { > > > + syscon: system-control@1c00000 { > > > compatible = "allwinner,sun8i-h3-system-control"; > > > reg = <0x01c00000 0x1000>; > > > #address-cells = <1>; > > > diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi > > > index 4b1530ebe427..9175ff0fb59a 100644 > > > --- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi > > > +++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi > > > @@ -152,12 +152,6 @@ > > > }; > > > }; > > > > > > - syscon: syscon@1c00000 { > > > - compatible = "allwinner,sun8i-h3-system-controller", > > > - "syscon"; > > > - reg = <0x01c00000 0x1000>; > > > - }; > > > - > > > > You're also dropping the syscon compatible there. But I'm not sure how > > it could work with the H3 EMAC driver that would overwrite the > > compatible already. > > I assume you are referring to the previous patch? The node names are not > the same, hence the previous patch is adding another node for the system > controller, and this patch removes the old one with the "syscon" compatible. > > We already patched the EMAC driver to support the new SRAM controller based > regmap, so other than making people unhappy about having to update their > DT, I don't think there would be any problems. This also means H3 in -next > currently has _two_ syscon nodes. Yes, the point is indeed to only have a single node per platform (in the platform dtsi) instead of two (one in the common h3-h5 dtsi and one in the platform dtsi). I guess updating the dt is not even a hard requirement after this series: things will keep working with the dummy syscon node for giving the EMAC driver access to the syscon registers. Cheers, Paul
Hi, On Fri, Nov 16, 2018 at 05:47:50PM +0800, Chen-Yu Tsai wrote: > On Fri, Nov 16, 2018 at 5:39 PM Maxime Ripard <maxime.ripard@bootlin.com> wrote: > > > > On Thu, Nov 15, 2018 at 03:50:06PM +0100, Paul Kocialkowski wrote: > > > Now that we have specific nodes for the H3 and H5 system-controller > > > that allow proper access to the EMAC clock configuration register, > > > we no longer need a common dummy syscon node. > > > > > > Switch the syscon label over to each platform's dtsi file. > > > > > > Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > > --- > > > arch/arm/boot/dts/sun8i-h3.dtsi | 2 +- > > > arch/arm/boot/dts/sunxi-h3-h5.dtsi | 6 ------ > > > arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 2 +- > > > 3 files changed, 2 insertions(+), 8 deletions(-) > > > > > > diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi > > > index 7157d954fb8c..b337a9282783 100644 > > > --- a/arch/arm/boot/dts/sun8i-h3.dtsi > > > +++ b/arch/arm/boot/dts/sun8i-h3.dtsi > > > @@ -134,7 +134,7 @@ > > > }; > > > > > > soc { > > > - system-control@1c00000 { > > > + syscon: system-control@1c00000 { > > > compatible = "allwinner,sun8i-h3-system-control"; > > > reg = <0x01c00000 0x1000>; > > > #address-cells = <1>; > > > diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi > > > index 4b1530ebe427..9175ff0fb59a 100644 > > > --- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi > > > +++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi > > > @@ -152,12 +152,6 @@ > > > }; > > > }; > > > > > > - syscon: syscon@1c00000 { > > > - compatible = "allwinner,sun8i-h3-system-controller", > > > - "syscon"; > > > - reg = <0x01c00000 0x1000>; > > > - }; > > > - > > > > You're also dropping the syscon compatible there. But I'm not sure how > > it could work with the H3 EMAC driver that would overwrite the > > compatible already. > > I assume you are referring to the previous patch? The node names are not > the same, hence the previous patch is adding another node for the system > controller, and this patch removes the old one with the "syscon" compatible. > > We already patched the EMAC driver to support the new SRAM controller based > regmap, so other than making people unhappy about having to update their > DT, I don't think there would be any problems. This also means H3 in -next > currently has _two_ syscon nodes. Ah, indeed, I missed that. Pointing that out in the commit log could be nice though. Thanks! Maxime
diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi index 7157d954fb8c..b337a9282783 100644 --- a/arch/arm/boot/dts/sun8i-h3.dtsi +++ b/arch/arm/boot/dts/sun8i-h3.dtsi @@ -134,7 +134,7 @@ }; soc { - system-control@1c00000 { + syscon: system-control@1c00000 { compatible = "allwinner,sun8i-h3-system-control"; reg = <0x01c00000 0x1000>; #address-cells = <1>; diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi index 4b1530ebe427..9175ff0fb59a 100644 --- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi +++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi @@ -152,12 +152,6 @@ }; }; - syscon: syscon@1c00000 { - compatible = "allwinner,sun8i-h3-system-controller", - "syscon"; - reg = <0x01c00000 0x1000>; - }; - dma: dma-controller@1c02000 { compatible = "allwinner,sun8i-h3-dma"; reg = <0x01c02000 0x1000>; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi index c2d14b22b8c1..4f0e2df875ba 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi @@ -94,7 +94,7 @@ }; soc { - system-control@1c00000 { + syscon: system-control@1c00000 { compatible = "allwinner,sun50i-h5-system-control"; reg = <0x01c00000 0x1000>; #address-cells = <1>;
Now that we have specific nodes for the H3 and H5 system-controller that allow proper access to the EMAC clock configuration register, we no longer need a common dummy syscon node. Switch the syscon label over to each platform's dtsi file. Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> --- arch/arm/boot/dts/sun8i-h3.dtsi | 2 +- arch/arm/boot/dts/sunxi-h3-h5.dtsi | 6 ------ arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-)