Skip to contentSkip to conversation

ARM: dts: kirkwood: Fix SATA pinmux-ing for TS419

PATCH New Ben Hutchings 3 participants 7 messages Feb 18, 2017 – Mar 7, 2017 Device tree bindings

lore
Share & tools
lore

Ben Hutchings

author
#0 lore raw

PATCH 1/1 ARM: dts: kirkwood: Fix SATA pinmux-ing for TS419

The old board code for the TS419 assigns MPP pins 15 and 16 as SATA activity signals (and none as SATA presence signals). Currently the device tree assigns the SoC's default pinmux groups for SATA, which conflict with the second Ethernet port.

Reported-by: gmbh at gazeta.pl
Tested-by: gmbh at gazeta.pl
References: https://bugs.debian.org/855017

Cc stable at vger.kernel.org # 3.15+
Fixes 934b524b3f49 ("ARM: Kirkwood: Add DT description of QNAP 419")
Signed-off-by Ben Hutchings <[email protected]>
---
 arch/arm/boot/dts/kirkwood-ts419.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm/boot/dts/kirkwood-ts419.dtsi +8 -0
index 02bd53762705..532506cb0f4a 100644
@@ -73,3 +73,11 @@
 		phy-handle = <&ethphy1>;
 	};
 };
+
+&pmx_sata0 {
+	marvell,pins = "mpp15";
+};
+
+&pmx_sata1 {
+	marvell,pins = "mpp16";
+};

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 811 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170218/7d56af58/attachment.sig>

#1 lore raw

PATCH 1/1 ARM: dts: kirkwood: Fix SATA pinmux-ing for TS419

Hello,

Adding in Cc all the maintainers of the Kirkwood platforms.

arch/arm/boot/dts/kirkwood-ts419.dtsi line 83

Quoted 7 lines · Ben Hutchings

+&pmx_sata0 {

arch/arm/boot/dts/kirkwood-ts419.dtsi +6 -0
+	marvell,pins = "mpp15";
+};
+
+&pmx_sata1 {
+	marvell,pins = "mpp16";
+};

This is not only muxing mpp15 as sata0 and mpp16 as sata1, but also removes the muxing of sata0/sata1 pins described in kirkwood-6282.dtsi:

                        pmx_sata0: pmx-sata0 {
                                marvell,pins = "mpp5", "mpp21", "mpp23";
                                marvell,function = "sata0";
                        };
                        pmx_sata1: pmx-sata1 {
                                marvell,pins = "mpp4", "mpp20", "mpp22";
                                marvell,function = "sata1";
                        };

So it means that MPP 4, 5, 20, 21, 22 and 23 will no longer be muxed as sata0/sata1. Is this really what you want?

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
author
#2 lore raw

PATCH 1/1 ARM: dts: kirkwood: Fix SATA pinmux-ing for TS419

Quoted 26 lines · Thomas Petazzoni

Hello,

Adding in Cc all the maintainers of the Kirkwood platforms.

arch/arm/boot/dts/kirkwood-ts419.dtsi line 83

Quoted 7 lines · Ben Hutchings

+&pmx_sata0 {

arch/arm/boot/dts/kirkwood-ts419.dtsi +6 -0
+	marvell,pins = "mpp15";
+};
+
+&pmx_sata1 {
+	marvell,pins = "mpp16";
+};

This is not only muxing mpp15 as sata0 and mpp16 as sata1, but also removes the muxing of sata0/sata1 pins described in kirkwood-6282.dtsi:

????????????????????????pmx_sata0: pmx-sata0 { ????????????????????????????????marvell,pins = "mpp5", "mpp21", "mpp23"; ????????????????????????????????marvell,function = "sata0"; ????????????????????????}; ????????????????????????pmx_sata1: pmx-sata1 { ????????????????????????????????marvell,pins = "mpp4", "mpp20", "mpp22"; ????????????????????????????????marvell,function = "sata1"; ????????????????????????};

Quoted 2 lines

So it means that MPP 4, 5, 20, 21, 22 and 23 will no longer be muxed as sata0/sata1. Is this really what you want?

That is precisely what I intended. 20-23 are used by the second Ethernet port. The old board code doesn't assign 4 or 5 at all.

Ben.

Signature · 10 lines
Ben Hutchings
If at first you don't succeed, you're doing about average.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170220/13dad357/attachment.sig>
#3 lore raw

PATCH 1/1 ARM: dts: kirkwood: Fix SATA pinmux-ing for TS419

Hello,

Quoted 2 lines · Ben Hutchings

That is precisely what I intended. 20-23 are used by the second Ethernet port. The old board code doesn't assign 4 or 5 at all.

Then I believe it would be more explicit to have separate pin muxing configurations for SATA on this board.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
author
#4 lore raw

PATCH 1/1 ARM: dts: kirkwood: Fix SATA pinmux-ing for TS419

Quoted 9 lines · Thomas Petazzoni

Hello,

Quoted 2 lines · Ben Hutchings

That is precisely what I intended.??20-23 are used by the second Ethernet port.??The old board code doesn't assign 4 or 5 at all.

Then I believe it would be more explicit to have separate pin muxing configurations for SATA on this board.

You mean, define additional pinmux nodes and override the pinctrl-0 property of &sata? More like this:

arch/arm/boot/dts/kirkwood-ts419.dtsi +16 -0
@@ -73,3 +73,19 @@
 		phy-handle = <&ethphy1>;
 	};
 };
+
+&pinctrl {
+	pmx_sata0_ts419: pmx-sata0-ts419 {
+		marvell,pins = "mpp15";
+		marvell,function = "sata0";
+	};
+
+	pmx_sata1_ts419: pmx-sata1-ts419 {
+		marvell,pins = "mpp16";
+		marvell,function = "sata1";
+	};
+};
+
+&sata {
+	pinctrl-0 = <&pmx_sata0_ts419 &pmx_sata1_ts419>;
+};

--- END ---

Ben.

Signature · 9 lines
Ben Hutchings
If at first you don't succeed, you're doing about average.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170220/f795a5b5/attachment-0001.sig>
#5 lore raw

PATCH 1/1 ARM: dts: kirkwood: Fix SATA pinmux-ing for TS419

Hello,

Quoted 2 lines · Ben Hutchings

You mean, define additional pinmux nodes and override the pinctrl-0 property of &sata? More like this:

Yes, exactly.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
#6 lore raw

PATCH 1/1 ARM: dts: kirkwood: Fix SATA pinmux-ing for TS419

In reply to Ben Hutchings

Hi Ben,

Quoted 27 lines · Ben Hutchings
Quoted 9 lines · Thomas Petazzoni

Hello,

Quoted 2 lines · Ben Hutchings

That is precisely what I intended.??20-23 are used by the second Ethernet port.??The old board code doesn't assign 4 or 5 at all.

Then I believe it would be more explicit to have separate pin muxing configurations for SATA on this board.

You mean, define additional pinmux nodes and override the pinctrl-0 property of &sata? More like this:

arch/arm/boot/dts/kirkwood-ts419.dtsi +7 -0
@@ -73,3 +73,19 @@
 		phy-handle = <&ethphy1>;
 	};
 };
+
+&pinctrl {
+	pmx_sata0_ts419: pmx-sata0-ts419 {
+		marvell,pins = "mpp15";
+		marvell,function = "sata0";
+	};
+

arch/arm/boot/dts/kirkwood-ts419.dtsi

Quoted 10 lines
arch/arm/boot/dts/kirkwood-ts419.dtsi +9 -1
+	pmx_sata1_ts419: pmx-sata1-ts419 {
+		marvell,pins = "mpp16";
+		marvell,function = "sata1";
+	};
+};
+
+&sata {
+	pinctrl-0 = <&pmx_sata0_ts419 &pmx_sata1_ts419>;
+};
--- END ---

If you send a new version of your patch, then I will be able to apply it on mvebu/dt.

Thanks,

Gregory

Quoted 10 lines

Ben.

Signature · 6 lines
Ben Hutchings
If at first you don't succeed, you're doing about average.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Signature · 4 lines
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com