| Message ID | 20180830190120.722-1-clabbe.montjoie@gmail.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | ata: ahci_platform: support allwinner R40 AHCI | expand |
Hi, On 30-08-18 21:01, 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. Thank you for your work on this, the entire series looks good to me: Reviewed-by: Hans de Goede <hdegoede@redhat.com> Note I've one remark for the final do-not-merge patch I will reply to that patch separately. Regards, Hans > > Changes since v3: > - Moved PHY code to a new sun4i-a10-phy-sata driver > - Removed reset code since ahci_platform support now reset controller. > > Changes since V2 > - Moved all ressources management to ahci_platform > > Corentin Labbe (13): > dt-bindings: ata: ahci-platform: fix indentation of target-supply > ata: ahci_platform: add support for AHCI controller regulator > dt-bindings: ata: ahci-platform: document ahci-supply > phy: Add sun4i-a10-phy-sata driver > dt-bindings: phy: document sun4i-a10-sata-phy > dt-bindings: ata: update ahci_sunxi bindings > ata: ahci_sunxi: Bypass PHY init when using the new binding > ata: ahci_sunxi: add support for r40 > ARM: dts: sun8i: r40: add sata node > ARM: dts: sun8i: sun8i-r40-bananapi-m2-ultra: enable AHCI > ARM: dts: sun7i: a20: add sata-port/sata-phy nodes > ARM: dts: sun4i: a10: add sata-port/sata-phy nodes > ata: ahci_sunxi: remove PHY code > > .../devicetree/bindings/ata/ahci-platform.txt | 11 +- > .../devicetree/bindings/phy/sun4i-sata-phy.txt | 20 ++ > arch/arm/boot/dts/sun4i-a10.dtsi | 13 ++ > arch/arm/boot/dts/sun7i-a20.dtsi | 13 ++ > arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 21 +++ > arch/arm/boot/dts/sun8i-r40.dtsi | 23 +++ > drivers/ata/ahci.h | 1 + > drivers/ata/ahci_sunxi.c | 87 +-------- > drivers/ata/libahci_platform.c | 26 ++- > drivers/phy/allwinner/Kconfig | 7 + > drivers/phy/allwinner/Makefile | 1 + > drivers/phy/allwinner/phy-sun4i-sata.c | 208 +++++++++++++++++++++ > 12 files changed, 343 insertions(+), 88 deletions(-) > create mode 100644 Documentation/devicetree/bindings/phy/sun4i-sata-phy.txt > create mode 100644 drivers/phy/allwinner/phy-sun4i-sata.c >
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.
Hi, On Fri, Aug 31, 2018 at 4:31 AM Jens Axboe <axboe@kernel.dk> 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. Corentin, it's best to lay out the plan to get patches merges in the cover letter, specifically which maintainer should take which patches, or if an immutable tag/branch is preferred, when things can't be separated cleanly. This helps other subsystem maintainers that don't routinely deal with armsoc. Also, we probably can't merge the last patch that removes the PHY code, since we have to support old device trees. Thanks ChenYu
On 8/30/18 8:32 PM, Chen-Yu Tsai wrote: > Hi, > > On Fri, Aug 31, 2018 at 4:31 AM Jens Axboe <axboe@kernel.dk> 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.
Hi Jens, 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 <axboe@kernel.dk> 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? Thanks! Maxmie
On 8/31/18 1:40 AM, Maxime Ripard wrote: > Hi Jens, > > 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 <axboe@kernel.dk> 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. Corentin, please resend when everybody is happy with it.
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 <axboe@kernel.dk> 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