| Message ID | 20180830190120.722-13-clabbe.montjoie@gmail.com |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
| Series | ata: ahci_platform: support allwinner R40 AHCI | expand |
On Thu, Aug 30, 2018 at 09:01:19PM +0200, Corentin Labbe wrote: > This patch convert sun4i-a10 sata to the new binding which use a sata > phy node. > > Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> > --- > arch/arm/boot/dts/sun4i-a10.dtsi | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi > index 3d62a8950720..52d5c2e79499 100644 > --- a/arch/arm/boot/dts/sun4i-a10.dtsi > +++ b/arch/arm/boot/dts/sun4i-a10.dtsi > @@ -556,7 +556,20 @@ > reg = <0x01c18000 0x1000>; > interrupts = <56>; > clocks = <&ccu CLK_AHB_SATA>, <&ccu CLK_SATA>; > + #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,sun4i-a10-sata-phy"; > + reg = <0x01c180c0 0x200>; > + #phy-cells = <0>; > }; This patch, together with the following one, breaks the DT ABI, this isn't something we can do anymore. Maxime
On Fri, Aug 31, 2018 at 09:37:24AM +0200, Maxime Ripard wrote: > On Thu, Aug 30, 2018 at 09:01:19PM +0200, Corentin Labbe wrote: > > This patch convert sun4i-a10 sata to the new binding which use a sata > > phy node. > > > > Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> > > --- > > arch/arm/boot/dts/sun4i-a10.dtsi | 13 +++++++++++++ > > 1 file changed, 13 insertions(+) > > > > diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi > > index 3d62a8950720..52d5c2e79499 100644 > > --- a/arch/arm/boot/dts/sun4i-a10.dtsi > > +++ b/arch/arm/boot/dts/sun4i-a10.dtsi > > @@ -556,7 +556,20 @@ > > reg = <0x01c18000 0x1000>; > > interrupts = <56>; > > clocks = <&ccu CLK_AHB_SATA>, <&ccu CLK_SATA>; > > + #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,sun4i-a10-sata-phy"; > > + reg = <0x01c180c0 0x200>; > > + #phy-cells = <0>; > > }; > > This patch, together with the following one, breaks the DT ABI, this > isn't something we can do anymore. > So what can I do ? Keep the DT in place and drop the patch 13 like wens suggested ? Regards
On Fri, Aug 31, 2018 at 09:53:50AM +0200, Corentin Labbe wrote: > On Fri, Aug 31, 2018 at 09:37:24AM +0200, Maxime Ripard wrote: > > On Thu, Aug 30, 2018 at 09:01:19PM +0200, Corentin Labbe wrote: > > > This patch convert sun4i-a10 sata to the new binding which use a sata > > > phy node. > > > > > > Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> > > > --- > > > arch/arm/boot/dts/sun4i-a10.dtsi | 13 +++++++++++++ > > > 1 file changed, 13 insertions(+) > > > > > > diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi > > > index 3d62a8950720..52d5c2e79499 100644 > > > --- a/arch/arm/boot/dts/sun4i-a10.dtsi > > > +++ b/arch/arm/boot/dts/sun4i-a10.dtsi > > > @@ -556,7 +556,20 @@ > > > reg = <0x01c18000 0x1000>; > > > interrupts = <56>; > > > clocks = <&ccu CLK_AHB_SATA>, <&ccu CLK_SATA>; > > > + #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,sun4i-a10-sata-phy"; > > > + reg = <0x01c180c0 0x200>; > > > + #phy-cells = <0>; > > > }; > > > > This patch, together with the following one, breaks the DT ABI, this > > isn't something we can do anymore. > > So what can I do ? Well, you always have the option of not doing anything. Maxime
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index 3d62a8950720..52d5c2e79499 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -556,7 +556,20 @@ reg = <0x01c18000 0x1000>; interrupts = <56>; clocks = <&ccu CLK_AHB_SATA>, <&ccu CLK_SATA>; + #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,sun4i-a10-sata-phy"; + reg = <0x01c180c0 0x200>; + #phy-cells = <0>; }; ehci1: usb@1c1c000 {
This patch convert sun4i-a10 sata to the new binding which use a sata phy node. Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> --- arch/arm/boot/dts/sun4i-a10.dtsi | 13 +++++++++++++ 1 file changed, 13 insertions(+)