From patchwork Sat Feb 18 00:32:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 9580909 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7A739600F6 for ; Sat, 18 Feb 2017 00:33:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5B661287A1 for ; Sat, 18 Feb 2017 00:33:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4EC0A287A4; Sat, 18 Feb 2017 00:33:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C7CE2287A1 for ; Sat, 18 Feb 2017 00:33:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender:Content-Type:Cc: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Subject:MIME-Version:Message-ID:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=YjSLWHHFB3nU46zaqHFwbvntm9eilYG5i2VYOaZRprM=; b=ddV wvAuuSwwrPaje0LFKAB8JABqWlMbDximYMQ9Bp7X+MH8cYEd4fny4tvyzIzaxlUE+qBl0huzCWeQs RWeZkS0uKWYo5Ty8cO9ArUKy4HIWA7EdLC6ozuq0nLcgEB4KKxyVf/HmnUNlGjEYGNO9WmboUwq04 SqcqOoCaaAihc5gAaE3VuPqAR7W8sIZYkQtS9z6QIANI90VUWaGqViz/JQauAfnkxbh9LI2DNf208 WSbtdNTgC6LiTMUMIk8d0cICIbpReklnqduuiVhcGHQH1RJ1LRosgNBK9Z9xcXSjHrVBNL368cyzQ z7oFp6B9hDlL2iD8tSr+iVrtsIFvyzw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cesxn-0000KT-UT; Sat, 18 Feb 2017 00:33:23 +0000 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cesxi-0000JX-RB for linux-arm-kernel@lists.infradead.org; Sat, 18 Feb 2017 00:33:21 +0000 Received: from ben by shadbolt.decadent.org.uk with local (Exim 4.84_2) (envelope-from ) id 1cesxH-0007Ta-Ch; Sat, 18 Feb 2017 00:32:53 +0000 Date: Sat, 18 Feb 2017 00:32:51 +0000 From: Ben Hutchings To: Andrew Lunn , linux-arm-kernel@lists.infradead.org Message-ID: <20170218003251.GC4152@decadent.org.uk> MIME-Version: 1.0 User-Agent: Mutt/1.5.23 (2014-03-12) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: ben@decadent.org.uk Subject: [PATCH] ARM: dts: kirkwood: Fix SATA pinmux-ing for TS419 X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on shadbolt.decadent.org.uk) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170217_163319_044253_BB633ED0 X-CRM114-Status: GOOD ( 10.05 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: gmbh@gazeta.pl, 855017@bugs.debian.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Tested-by: gmbh@gazeta.pl References: https://bugs.debian.org/855017 Cc: stable@vger.kernel.org # 3.15+ Fixes: 934b524b3f49 ("ARM: Kirkwood: Add DT description of QNAP 419") Signed-off-by: Ben Hutchings --- 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 = <ðphy1>; }; }; + +&pmx_sata0 { + marvell,pins = "mpp15"; +}; + +&pmx_sata1 { + marvell,pins = "mpp16"; +};