| Message ID | 20240625164528.183107-1-afd@ti.com |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [1/2] dt-bindings: soc: ti: am654-serdes-ctrl: Add simple-mfd to compatible items | expand |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | success | |
| robh/patch-applied | fail | build log |
On 6/25/24 11:45 AM, Andrew Davis wrote: > This node contains a child which is only probed if simple-mfd is in the > compatible list. Add this here. > > Signed-off-by: Andrew Davis <afd@ti.com> > --- This patch depends on https://www.spinics.net/lists/kernel/msg5253666.html Andrew > .../devicetree/bindings/soc/ti/ti,am654-serdes-ctrl.yaml | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/soc/ti/ti,am654-serdes-ctrl.yaml b/Documentation/devicetree/bindings/soc/ti/ti,am654-serdes-ctrl.yaml > index a10a3b89ae05e..94b36943a50ff 100644 > --- a/Documentation/devicetree/bindings/soc/ti/ti,am654-serdes-ctrl.yaml > +++ b/Documentation/devicetree/bindings/soc/ti/ti,am654-serdes-ctrl.yaml > @@ -14,6 +14,7 @@ properties: > items: > - const: ti,am654-serdes-ctrl > - const: syscon > + - const: simple-mfd > > reg: > maxItems: 1 > @@ -31,7 +32,7 @@ additionalProperties: false > examples: > - | > clock@4080 { > - compatible = "ti,am654-serdes-ctrl", "syscon"; > + compatible = "ti,am654-serdes-ctrl", "syscon", "simple-mfd"; > reg = <0x4080 0x4>; > > mux-controller {
On 25.06.24 18:49, Andrew Davis wrote: > On 6/25/24 11:45 AM, Andrew Davis wrote: >> This node contains a child which is only probed if simple-mfd is in the >> compatible list. Add this here. >> >> Signed-off-by: Andrew Davis <afd@ti.com> >> --- > > This patch depends on https://www.spinics.net/lists/kernel/msg5253666.html > But is that patch already scheduled for 6.10 as well? Jan
On 25.06.24 18:45, Andrew Davis wrote: > The SerDes control nodes contain both a clock and clock mux, this is > a simple MFD. Add this to the compatible string list. > > Reported-by: Jan Kiszka <jan.kiszka@siemens.com> > Fixes: da795dc4f2a0 ("arm64: dts: ti: k3-am65: Move SerDes mux nodes under the control node") > Signed-off-by: Andrew Davis <afd@ti.com> > --- > arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi > index 1af3dedde1f67..06ed74197f893 100644 > --- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi > +++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi > @@ -478,7 +478,7 @@ scm_conf: scm-conf@100000 { > ranges = <0x0 0x0 0x00100000 0x1c000>; > > serdes0_clk: clock@4080 { > - compatible = "ti,am654-serdes-ctrl", "syscon"; > + compatible = "ti,am654-serdes-ctrl", "syscon", "simple-mfd"; > reg = <0x4080 0x4>; > > serdes0_mux: mux-controller { > @@ -489,7 +489,7 @@ serdes0_mux: mux-controller { > }; > > serdes1_clk: clock@4090 { > - compatible = "ti,am654-serdes-ctrl", "syscon"; > + compatible = "ti,am654-serdes-ctrl", "syscon", "simple-mfd"; > reg = <0x4090 0x4>; > > serdes1_mux: mux-controller { Tested-by: Jan Kiszka <jan.kiszka@siemens.com> Was briefly nervous as the fix initially no longer worked. But I had switched devices in the meantime, ending up on a SR1.0 variant. And for that, we are still missing a PCI errata workaround from your SDK in mainline... Jan
On 6/25/24 2:46 PM, Jan Kiszka wrote: > On 25.06.24 18:49, Andrew Davis wrote: >> On 6/25/24 11:45 AM, Andrew Davis wrote: >>> This node contains a child which is only probed if simple-mfd is in the >>> compatible list. Add this here. >>> >>> Signed-off-by: Andrew Davis <afd@ti.com> >>> --- >> >> This patch depends on https://www.spinics.net/lists/kernel/msg5253666.html >> > > But is that patch already scheduled for 6.10 as well? I don't think so.. But only [patch 2/2] from this series needs applied back to 6.10 to fix the issue. This one [Patch 1/2] just removes a dts warning. Andrew > > Jan >
On Tue, Jun 25, 2024 at 05:23:22PM -0500, Andrew Davis wrote: > On 6/25/24 2:46 PM, Jan Kiszka wrote: > > On 25.06.24 18:49, Andrew Davis wrote: > > > On 6/25/24 11:45 AM, Andrew Davis wrote: > > > > This node contains a child which is only probed if simple-mfd is in the > > > > compatible list. Add this here. > > > > > > > > Signed-off-by: Andrew Davis <afd@ti.com> > > > > --- > > > > > > This patch depends on https://www.spinics.net/lists/kernel/msg5253666.html > > > > > > > But is that patch already scheduled for 6.10 as well? > > I don't think so.. But only [patch 2/2] from this series needs applied > back to 6.10 to fix the issue. This one [Patch 1/2] just removes a dts warning. Both or none should be applied... Rob
On Tue, 25 Jun 2024 11:45:27 -0500, Andrew Davis wrote: > This node contains a child which is only probed if simple-mfd is in the > compatible list. Add this here. > > Signed-off-by: Andrew Davis <afd@ti.com> > --- > .../devicetree/bindings/soc/ti/ti,am654-serdes-ctrl.yaml | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > Acked-by: Rob Herring (Arm) <robh@kernel.org>
On 6/28/24 4:38 PM, Rob Herring wrote: > On Tue, Jun 25, 2024 at 05:23:22PM -0500, Andrew Davis wrote: >> On 6/25/24 2:46 PM, Jan Kiszka wrote: >>> On 25.06.24 18:49, Andrew Davis wrote: >>>> On 6/25/24 11:45 AM, Andrew Davis wrote: >>>>> This node contains a child which is only probed if simple-mfd is in the >>>>> compatible list. Add this here. >>>>> >>>>> Signed-off-by: Andrew Davis <afd@ti.com> >>>>> --- >>>> >>>> This patch depends on https://www.spinics.net/lists/kernel/msg5253666.html >>>> >>> >>> But is that patch already scheduled for 6.10 as well? >> >> I don't think so.. But only [patch 2/2] from this series needs applied >> back to 6.10 to fix the issue. This one [Patch 1/2] just removes a dts warning. > > Both or none should be applied... > Both should be applied to master. Only [2/2] is a fix that should then be backported to v6.10.x to fix an issue in v6.10. [1/2] has a dependency on a patch that will not be in v6.10 so it cannot be backported, but luckily [1/2] is just a fix for a DTB check warning. [2/2] doesn't depend on [1/2]. So no issue there, [2/2] should backport cleanly all by itself. Andrew
diff --git a/Documentation/devicetree/bindings/soc/ti/ti,am654-serdes-ctrl.yaml b/Documentation/devicetree/bindings/soc/ti/ti,am654-serdes-ctrl.yaml index a10a3b89ae05e..94b36943a50ff 100644 --- a/Documentation/devicetree/bindings/soc/ti/ti,am654-serdes-ctrl.yaml +++ b/Documentation/devicetree/bindings/soc/ti/ti,am654-serdes-ctrl.yaml @@ -14,6 +14,7 @@ properties: items: - const: ti,am654-serdes-ctrl - const: syscon + - const: simple-mfd reg: maxItems: 1 @@ -31,7 +32,7 @@ additionalProperties: false examples: - | clock@4080 { - compatible = "ti,am654-serdes-ctrl", "syscon"; + compatible = "ti,am654-serdes-ctrl", "syscon", "simple-mfd"; reg = <0x4080 0x4>; mux-controller {
This node contains a child which is only probed if simple-mfd is in the compatible list. Add this here. Signed-off-by: Andrew Davis <afd@ti.com> --- .../devicetree/bindings/soc/ti/ti,am654-serdes-ctrl.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)