by Jens Axboe

On Fri, Aug 31, 2018 at 09:56:31AM +0200, Corentin Labbe wrote:
> On Fri, Aug 31, 2018 at 09:35:00AM +0200, Maxime Ripard wrote:
> > On Thu, Aug 30, 2018 at 09:01:16PM +0200, Corentin Labbe wrote:
> > > R40 have a sata controller which is the same as A20.
> > > This patch adds a DT node for it.
> > >
> > > Signed-off-by: Icenowy Zheng <[email protected]>
> > > Signed-off-by: Corentin Labbe <[email protected]>
> > > ---
> > > arch/arm/boot/dts/sun8i-r40.dtsi | 23 +++++++++++++++++++++++
> > > 1 file changed, 23 insertions(+)
> > >
> > > diff --git a/arch/arm/boot/dts/sun8i-r40.dtsi b/arch/arm/boot/dts/sun8i-r40.dtsi
> > > index 852c2ccc3268..d6b5820da850 100644
> > > --- a/arch/arm/boot/dts/sun8i-r40.dtsi
> > > +++ b/arch/arm/boot/dts/sun8i-r40.dtsi
> > > @@ -550,6 +550,29 @@
> > > #size-cells = <0>;
> > > };
> > >
> > > + ahci: sata@1c18000 {
> > > + compatible = "allwinner,sun8i-r40-ahci";
> > > + reg = <0x01c18000 0x1000>;
> > > + interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
> > > + clocks = <&ccu CLK_BUS_SATA>, <&ccu CLK_SATA>;
> > > + resets = <&ccu RST_BUS_SATA>;
> > > + resets-name = "ahci";
> > > + #address-cells = <1>;
> > > + #size-cells = <0>;
> > > + status = "disabled";
> > > +
> > > + sata_port: sata-port@0 {
> > > + reg = <0>;
> > > + phys = <&sata_phy>;
> > > + };
> > > + };
> > > +
> > > + sata_phy: sata-phy@1c180c0 {
> > > + compatible = "allwinner,sun8i-r40-sata-phy";
> > > + reg = <0x1c180c0 0x200>;
> >
> > Overlapping devices in the DTS is not ok.
> >
>
> I do the same than arch/arm/boot/dts/berlin2.dtsi (sata@e90000
> phy@e900a0)
>
> But since it is not a good justification, it seems that regmap is my
> only solution ?

I'm not even sure why you are moving the phy out of its original node
(and driver).

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Attachments:

(No filename) (1.92 kB)
signature.asc (849.00 B)
Download all attachments

2018-08-31 10:40:03

by Corentin Labbe

[permalink] [raw]

Subject: Re: [PATCH v4 09/13] ARM: dts: sun8i: r40: add sata node

On Fri, Aug 31, 2018 at 03:58:34PM +0800, Chen-Yu Tsai wrote:
> On Fri, Aug 31, 2018 at 3:56 PM Corentin Labbe
> <[email protected]> wrote:
> >
> > On Fri, Aug 31, 2018 at 09:35:00AM +0200, Maxime Ripard wrote:
> > > On Thu, Aug 30, 2018 at 09:01:16PM +0200, Corentin Labbe wrote:
> > > > R40 have a sata controller which is the same as A20.
> > > > This patch adds a DT node for it.
> > > >
> > > > Signed-off-by: Icenowy Zheng <[email protected]>
> > > > Signed-off-by: Corentin Labbe <[email protected]>
> > > > ---
> > > > arch/arm/boot/dts/sun8i-r40.dtsi | 23 +++++++++++++++++++++++
> > > > 1 file changed, 23 insertions(+)
> > > >
> > > > diff --git a/arch/arm/boot/dts/sun8i-r40.dtsi b/arch/arm/boot/dts/sun8i-r40.dtsi
> > > > index 852c2ccc3268..d6b5820da850 100644
> > > > --- a/arch/arm/boot/dts/sun8i-r40.dtsi
> > > > +++ b/arch/arm/boot/dts/sun8i-r40.dtsi
> > > > @@ -550,6 +550,29 @@
> > > > #size-cells = <0>;
> > > > };
> > > >
> > > > + ahci: sata@1c18000 {
> > > > + compatible = "allwinner,sun8i-r40-ahci";
> > > > + reg = <0x01c18000 0x1000>;
> > > > + interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
> > > > + clocks = <&ccu CLK_BUS_SATA>, <&ccu CLK_SATA>;
> > > > + resets = <&ccu RST_BUS_SATA>;
> > > > + resets-name = "ahci";
> > > > + #address-cells = <1>;
> > > > + #size-cells = <0>;
> > > > + status = "disabled";
> > > > +
> > > > + sata_port: sata-port@0 {
> > > > + reg = <0>;
> > > > + phys = <&sata_phy>;
> > > > + };
> > > > + };
> > > > +
> > > > + sata_phy: sata-phy@1c180c0 {
> > > > + compatible = "allwinner,sun8i-r40-sata-phy";
> > > > + reg = <0x1c180c0 0x200>;
> > >
> > > Overlapping devices in the DTS is not ok.
> > >
> >
> > I do the same than arch/arm/boot/dts/berlin2.dtsi (sata@e90000 phy@e900a0)
> > But since it is not a good justification, it seems that regmap is my only solution ?
>
> Since you are effectively splitting one device node into two, you should
> adjust the original (ahci) device nodes register range.
>

I cannot do that if I remove patch 13, iow If I keep phy init code in both place as you requested.

2018-08-31 11:07:20

On Fri, Aug 31, 2018 at 08:35:23AM -0600, Jens Axboe wrote:
> On 8/31/18 1:40 AM, Maxime Ripard wrote:
> > Hi Jens,
11;rgb:0000/2b2b/3636> >
> > On Thu, Aug 30, 2018 at 08:52:52PM -0600, Jens Axboe wrote:
> >> On 8/30/18 8:32 PM, Chen-Yu Tsai wrote:
> >>> Hi,
> >>>
> >>> On Fri, Aug 31, 2018 at 4:31 AM Jens Axboe <[email protected]> wrote:
> >>>>
> >>>> On 8/30/18 1:01 PM, Corentin Labbe wrote:
> >>>>> Hello
> >>>>>
> >>>>> This patchset add support for allwinner R40 AHCI controller.
> >>>>>
> >>>>> The whole patchset is tested on sun8i-r40-bananapi-m2-ultra and
> >>>>> on sun7i-a20-cubieboard2 which doesnt have any of the ressources added
> >>>>> by this serie, so no regression should come with it.
> >>>>>
> >>>>> The last patch(ata: ahci_sunxi: remove PHY code) should not be merged,
> >>>>> but will be resent for inclustion when all patchs will have hit linus
> >>>>> tree.
> >>>>
> >>>> Applied 1-12 with Hans's blessing, thanks Corentin.
> >>>
> >>> Please don't merge device tree ("dts") patches, i.e. patches 9-12. We will
> >>> merge them through the sunxi / armsoc tree. Having them in separate trees
> >>> introduces conflicts when we have other stuff going through our tree.
> >>
> >> OK, fair enough, I can drop those.
> >
> > And the DT bits actually have some issues that would need to change
> > the code significantly.
> >
> > Can you drop all of them please?
>
> OK, can do.

Thanks!

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Attachments:

(No filename) (1.52 kB)
signature.asc (849.00 B)
Download all attachments