dt-bindings: soc: ti: am654-serdes-ctrl: Add simple-mfd to compatible items
Subsystems (2)
PATCH 1/2 dt-bindings: soc: ti: am654-serdes-ctrl: Add simple-mfd to compatible items
This node contains a child which is only probed if simple-mfd is in the compatible list. Add this here.
--- .../devicetree/bindings/soc/ti/ti,am654-serdes-ctrl.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/soc/ti/ti,am654-serdes-ctrl.yaml +2 -1
@@ -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 {
Signature · 1 line
2.39.2
PATCH 2/2 arm64: dts: ti: k3-am65: Add simple-mfd compatible to SerDes control nodes
The SerDes control nodes contain both a clock and clock mux, this is a simple MFD. Add this to the compatible string list.
--- arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/ti/k3-am65-main.dtsi +2 -2
@@ -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 {
Signature · 1 line
2.39.2
Re: [PATCH 2/2] arm64: dts: ti: k3-am65: Add simple-mfd compatible to SerDes control nodes
Quoted 24 lines · Andrew Davis
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 <[email protected]>Fixes da795dc4f2a0 ("arm64: dts: ti: k3-am65: Move SerDes mux nodes under the control node")Signed-off-by Andrew Davis <[email protected]>--- arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/arm64/boot/dts/ti/k3-am65-main.dtsi +1
-1@@ -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 {
arch/arm64/boot/dts/ti/k3-am65-main.dtsi serdes0_mux: mux-controller { · line 495
Quoted 8 lines
arch/arm64/boot/dts/ti/k3-am65-main.dtsi +1
-1@@ -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 {
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
Signature · 2 lines
Siemens AG, Technology Linux Expert Center
Quoted 5 lines · Andrew Davis
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 <[email protected]>---
This patch depends on https://www.spinics.net/lists/kernel/msg5253666.html
Andrew
Quoted 24 lines
.../devicetree/bindings/soc/ti/ti,am654-serdes-ctrl.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/soc/ti/ti,am654-serdes-ctrl.yaml +2
-1@@ -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 {
Quoted 9 lines · Andrew Davis
Quoted 5 lines · Andrew Davis
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 <[email protected]>---
This patch depends on https://www.spinics.net/lists/kernel/msg5253666.html
But is that patch already scheduled for 6.10 as well?
Jan
Signature · 2 lines
Siemens AG, Technology Linux Expert Center
Quoted 5 lines · Jan Kiszka
Quoted 4 lines · Andrew Davis
Quoted 3 lines · Andrew Davis
This node contains a child which is only probed if simple-mfd is in the compatible list. Add this here.
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
Signed-off-by Andrew Davis <[email protected]>---
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
Quoted 3 lines
Jan
Rob Herring
maintainerQuoted 9 lines · Andrew Davis
Quoted 8 lines · Jan Kiszka
Quoted 7 lines · Andrew Davis
Quoted 5 lines · Andrew Davis
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 <[email protected]>---
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
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
Quoted 13 lines · Rob Herring
Quoted 12 lines · Andrew Davis
Quoted 11 lines · Jan Kiszka
Quoted 9 lines · Andrew Davis
Quoted 5 lines · Andrew Davis
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 <[email protected]>---
This patch depends on https://www.spinics.net/lists/kernel/msg5253666.html
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
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
Quoted 8 lines · Andrew Davis
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 <[email protected]>--- .../devicetree/bindings/soc/ti/ti,am654-serdes-ctrl.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)