Bug#855017: linux-image-4.9.0-1-marvell: eth1 not detected/available on QNAP TS-419pII

[Ben Hutchings <ben@decadent.org.uk>]

Control: tag -1 upstream patch moreinfo

On Mon, Feb 13, 2017 at 11:07:03AM +0100, gmbh@gazeta.pl wrote:
[...]
> Upgrading of existing Debian from Jessie to Stretch on QNAP TS-419pII
> device, then booting into new kernel
> 
>    * What was the outcome of this action?
> 
> eth1 is no longer detected, dmesg shows:
> 
> [   36.243254] kirkwood-pinctrl f1010000.pin-controller: pin PIN20
> already requested by f1080000.sata; cannot claim for
> f1076000.ethernet-controller
> [   36.399719] kirkwood-pinctrl f1010000.pin-controller: pin-20
> (f1076000.ethernet-controller) status -22
> [   36.511281] kirkwood-pinctrl f1010000.pin-controller: could not
> request pin 20 (PIN20) from group mpp20  on device f1010000.pin-controller
> [   36.660310] mv643xx_eth f1076000.ethernet-controller: Error applying
> setting, reverse things back
[...]

This seems to be a bug in the device tree for the TS419 - it doesn't
quite match the board code it replaced.  Should be easy to fix.

Please can you test the fix by:

1. Installing the attached device tree files under
   /usr/lib/linux-image-4.9.0-1-marvell (replacing the versions
   already installed there)
2. Run: flash-kernel 4.9.0-1-marvell
3. Reboot

(For reference, the source patch is included below.)

Ben.

---
From: Ben Hutchings <ben@decadent.org.uk>
Date: Fri, 17 Feb 2017 01:30:30 +0000
Subject: 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@gazeta.pl
References: https://bugs.debian.org/855017
Fixes: 934b524b3f49 ("ARM: Kirkwood: Add DT description of QNAP 419")
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 arch/arm/boot/dts/kirkwood-ts419.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm/boot/dts/kirkwood-ts419.dtsi b/arch/arm/boot/dts/kirkwood-ts419.dtsi
index 02bd53762705..532506cb0f4a 100644
--- a/arch/arm/boot/dts/kirkwood-ts419.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts419.dtsi
@@ -73,3 +73,11 @@
 		phy-handle = <&ethphy1>;
 	};
 };
+
+&pmx_sata0 {
+	marvell,pins = "mpp15";
+};
+
+&pmx_sata1 {
+	marvell,pins = "mpp16";
+};

-- 
Ben Hutchings
Larkinson's Law: All laws are basically false.

Attachment: kirkwood-ts419-6281.dtb
Description: Binary data

Attachment: kirkwood-ts419-6282.dtb
Description: Binary data

Attachment: signature.asc
Description: Digital signature