| Message ID | 20220311210357.222830-4-linux@fw-web.de (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | Add sata nodes to rk356x | expand |
On 11-03-22, 22:03, Frank Wunderlich wrote: > From: Frank Wunderlich <frank-w@public-files.de> > > After converting the binding to yaml the node name does > not match the standard pattern, change it. > > arch/arm/boot/dts/spear1340-evb.dt.yaml: ahci@b1000000: > $nodename:0: 'ahci@b1000000' does not match '^sata(@.*)?$' > From schema: Documentation/devicetree/bindings/ata/ahci-platform.yaml > > Fixes: 07658d9a659b ("SPEAr13xx: Add dts and dtsi files") I don't think this is correct. The above patch is correct. The first patch in this series changes the names and that's where things break. I think you could have added these patches before changing to yaml and then nothing would ever have broken. Since this isn't a big deal anyway, I think you can just drop the Fixes tag here, and other dts patches you have.
Hi, thanks for for checking the spear-patch. > Gesendet: Montag, 14. März 2022 um 04:49 Uhr > Von: "Viresh Kumar" <viresh.kumar@linaro.org> > > On 11-03-22, 22:03, Frank Wunderlich wrote: > > From: Frank Wunderlich <frank-w@public-files.de> > > > > After converting the binding to yaml the node name does > > not match the standard pattern, change it. > > > > arch/arm/boot/dts/spear1340-evb.dt.yaml: ahci@b1000000: > > $nodename:0: 'ahci@b1000000' does not match '^sata(@.*)?$' > > From schema: Documentation/devicetree/bindings/ata/ahci-platform.yaml > > > > Fixes: 07658d9a659b ("SPEAr13xx: Add dts and dtsi files") > > I don't think this is correct. The above patch is correct. The first > patch in this series changes the names and that's where things break. it's right that my binding will break it, but the nodes are not named the right way. And i used the commit that introduces the wrong node-names. Maybe fixes-tag is wrong in this case. > I think you could have added these patches before changing to yaml and > then nothing would ever have broken. > > Since this isn't a big deal anyway, I think you can just drop the > Fixes tag here, and other dts patches you have. regards Frank
On Mon, Mar 14, 2022 at 04:38:56PM +0100, Frank Wunderlich wrote: > Hi, > > thanks for for checking the spear-patch. > > > Gesendet: Montag, 14. März 2022 um 04:49 Uhr > > Von: "Viresh Kumar" <viresh.kumar@linaro.org> > > > > On 11-03-22, 22:03, Frank Wunderlich wrote: > > > From: Frank Wunderlich <frank-w@public-files.de> > > > > > > After converting the binding to yaml the node name does > > > not match the standard pattern, change it. > > > > > > arch/arm/boot/dts/spear1340-evb.dt.yaml: ahci@b1000000: > > > $nodename:0: 'ahci@b1000000' does not match '^sata(@.*)?$' > > > From schema: Documentation/devicetree/bindings/ata/ahci-platform.yaml > > > > > > Fixes: 07658d9a659b ("SPEAr13xx: Add dts and dtsi files") > > > > I don't think this is correct. The above patch is correct. The first > > patch in this series changes the names and that's where things break. > > it's right that my binding will break it, but the nodes are not named the right way. > And i used the commit that introduces the wrong node-names. > Maybe fixes-tag is wrong in this case. I'm pretty sure Viresh just meant the Fixes tag is not right. Rob
On 14-03-22, 15:50, Rob Herring wrote: > On Mon, Mar 14, 2022 at 04:38:56PM +0100, Frank Wunderlich wrote: > > Hi, > > > > thanks for for checking the spear-patch. > > > > > Gesendet: Montag, 14. März 2022 um 04:49 Uhr > > > Von: "Viresh Kumar" <viresh.kumar@linaro.org> > > > > > > On 11-03-22, 22:03, Frank Wunderlich wrote: > > > > From: Frank Wunderlich <frank-w@public-files.de> > > > > > > > > After converting the binding to yaml the node name does > > > > not match the standard pattern, change it. > > > > > > > > arch/arm/boot/dts/spear1340-evb.dt.yaml: ahci@b1000000: > > > > $nodename:0: 'ahci@b1000000' does not match '^sata(@.*)?$' > > > > From schema: Documentation/devicetree/bindings/ata/ahci-platform.yaml > > > > > > > > Fixes: 07658d9a659b ("SPEAr13xx: Add dts and dtsi files") > > > > > > I don't think this is correct. The above patch is correct. The first > > > patch in this series changes the names and that's where things break. > > > > it's right that my binding will break it, but the nodes are not named the right way. > > And i used the commit that introduces the wrong node-names. > > Maybe fixes-tag is wrong in this case. The problem is that people will try and backport this patch of yours to earlier stable kernels, because it has a Fixes tag, while the kernel isn't really broken then and there is no need to backport anything. This patch (and others in series) are just fine, just drop the Fixes tag. > I'm pretty sure Viresh just meant the Fixes tag is not right. Right.
diff --git a/arch/arm/boot/dts/spear1310.dtsi b/arch/arm/boot/dts/spear1310.dtsi index 2f746a9428a7..8702c290ed8a 100644 --- a/arch/arm/boot/dts/spear1310.dtsi +++ b/arch/arm/boot/dts/spear1310.dtsi @@ -50,7 +50,7 @@ miphy2: miphy@eb808000 { status = "disabled"; }; - ahci0: ahci@b1000000 { + ahci0: sata@b1000000 { compatible = "snps,spear-ahci"; reg = <0xb1000000 0x10000>; interrupts = <0 68 0x4>; @@ -59,7 +59,7 @@ ahci0: ahci@b1000000 { status = "disabled"; }; - ahci1: ahci@b1800000 { + ahci1: sata@b1800000 { compatible = "snps,spear-ahci"; reg = <0xb1800000 0x10000>; interrupts = <0 69 0x4>; @@ -68,7 +68,7 @@ ahci1: ahci@b1800000 { status = "disabled"; }; - ahci2: ahci@b4000000 { + ahci2: sata@b4000000 { compatible = "snps,spear-ahci"; reg = <0xb4000000 0x10000>; interrupts = <0 70 0x4>; diff --git a/arch/arm/boot/dts/spear1340-evb.dts b/arch/arm/boot/dts/spear1340-evb.dts index fd194ebeedc9..65c757cd3718 100644 --- a/arch/arm/boot/dts/spear1340-evb.dts +++ b/arch/arm/boot/dts/spear1340-evb.dts @@ -112,7 +112,7 @@ pcie { }; }; - ahci@b1000000 { + sata@b1000000 { status = "okay"; }; diff --git a/arch/arm/boot/dts/spear1340.dtsi b/arch/arm/boot/dts/spear1340.dtsi index 827e887afbda..f45f3046f1c8 100644 --- a/arch/arm/boot/dts/spear1340.dtsi +++ b/arch/arm/boot/dts/spear1340.dtsi @@ -33,7 +33,7 @@ miphy0: miphy@eb800000 { status = "disabled"; }; - ahci0: ahci@b1000000 { + ahci0: sata@b1000000 { compatible = "snps,spear-ahci"; reg = <0xb1000000 0x10000>; interrupts = <0 72 0x4>;