| Message ID | 20240124184722.150615-2-afd@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/11] arm64: dts: ti: k3-am64: Convert serdes_ln_ctrl node into reg-mux | expand |
On 1/24/24 12:47 PM, Andrew Davis wrote: > This removes a dependency on the parent node being a syscon node. > Convert from mmio-mux to reg-mux adjusting node name and properties > as needed. > > Signed-off-by: Andrew Davis <afd@ti.com> > --- This one patch is not needed, I'm going to fix this for AM65 in a slightly different way. The rest of the series is still fine. Andrew > arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi > index fcea544656360..a18edd34283c7 100644 > --- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi > +++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi > @@ -492,11 +492,12 @@ serdes1_clk: clock@4090 { > reg = <0x00004090 0x4>; > }; > > - serdes_mux: mux-controller { > - compatible = "mmio-mux"; > + serdes_mux: mux-controller@4080 { > + compatible = "reg-mux"; > + reg = <0x4080 0x14>; > #mux-control-cells = <1>; > - mux-reg-masks = <0x4080 0x3>, /* SERDES0 lane select */ > - <0x4090 0x3>; /* SERDES1 lane select */ > + mux-reg-masks = <0x0 0x3>, /* SERDES0 lane select */ > + <0x10 0x3>; /* SERDES1 lane select */ > }; > > dss_oldi_io_ctrl: dss-oldi-io-ctrl@41e0 {
diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi index fcea544656360..a18edd34283c7 100644 --- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi @@ -492,11 +492,12 @@ serdes1_clk: clock@4090 { reg = <0x00004090 0x4>; }; - serdes_mux: mux-controller { - compatible = "mmio-mux"; + serdes_mux: mux-controller@4080 { + compatible = "reg-mux"; + reg = <0x4080 0x14>; #mux-control-cells = <1>; - mux-reg-masks = <0x4080 0x3>, /* SERDES0 lane select */ - <0x4090 0x3>; /* SERDES1 lane select */ + mux-reg-masks = <0x0 0x3>, /* SERDES0 lane select */ + <0x10 0x3>; /* SERDES1 lane select */ }; dss_oldi_io_ctrl: dss-oldi-io-ctrl@41e0 {
This removes a dependency on the parent node being a syscon node. Convert from mmio-mux to reg-mux adjusting node name and properties as needed. Signed-off-by: Andrew Davis <afd@ti.com> --- arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)