From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EEB5EC64EB1 for ; Thu, 6 Dec 2018 14:58:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B5E8220700 for ; Thu, 6 Dec 2018 14:58:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544108325; bh=oa6Duyzvd0Mgx+dUfoiglxBLoU0jULAIvbRqYr74jBA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=PmL2ZgGllWUoNeuwHXbWEWUldH0uVOgQXpQpAMqab3IMcAsJmv4XyZ2+l4CzzCwA9 4Ty/Tm8D9XcHGq98i2lHnbNWiPHJRTlsomYD5S6sP5cjyAa8pbbdd/K7fkrkjjnweS g0W0Ji9G41XfCFOxuj2Adt7rXz4kf0Yho6F+x1gw= DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B5E8220700 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726083AbeLFO6o (ORCPT ); Thu, 6 Dec 2018 09:58:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:46208 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729640AbeLFOlz (ORCPT ); Thu, 6 Dec 2018 09:41:55 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BC26E2082B; Thu, 6 Dec 2018 14:41:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544107315; bh=oa6Duyzvd0Mgx+dUfoiglxBLoU0jULAIvbRqYr74jBA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jqyVcIfu0SWJbmsz9Wk+lbWnqVlgfrNDt7aG3LD9j2aS1X1SuchL7pl7LtrZTT4fe djO/z0wwiTE+4SNdkh6bqNHCqjzLbaBQGEEUtdX5tkpFr5IF4qr8MTX1eoNvPvPyYZ sGWTbjETXvuL4ZOBj7UXt65rwZOpy+j/EE3N9a9w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kristian Evensen , Mathias Kresin , Paul Burton , John Crispin , Ralf Baechle , James Hogan , linux-mips@linux-mips.org Subject: [PATCH 4.14 15/55] MIPS: ralink: Fix mt7620 nd_sd pinmux Date: Thu, 6 Dec 2018 15:38:49 +0100 Message-Id: <20181206143002.547368132@linuxfoundation.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181206143001.749982936@linuxfoundation.org> References: <20181206143001.749982936@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mathias Kresin commit 7d35baa4e9ec4b717bc0e58a39cdb6a1c50f5465 upstream. In case the nd_sd group is set to the sd-card function, Pins 45 + 46 are configured as GPIOs. If they are blocked by the sd function, they can't be used as GPIOs. Reported-by: Kristian Evensen Signed-off-by: Mathias Kresin Signed-off-by: Paul Burton Fixes: f576fb6a0700 ("MIPS: ralink: cleanup the soc specific pinmux data") Patchwork: https://patchwork.linux-mips.org/patch/21220/ Cc: John Crispin Cc: Ralf Baechle Cc: James Hogan Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org # v3.18+ Signed-off-by: Greg Kroah-Hartman --- arch/mips/ralink/mt7620.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/mips/ralink/mt7620.c +++ b/arch/mips/ralink/mt7620.c @@ -84,7 +84,7 @@ static struct rt2880_pmx_func pcie_rst_g }; static struct rt2880_pmx_func nd_sd_grp[] = { FUNC("nand", MT7620_GPIO_MODE_NAND, 45, 15), - FUNC("sd", MT7620_GPIO_MODE_SD, 45, 15) + FUNC("sd", MT7620_GPIO_MODE_SD, 47, 13) }; static struct rt2880_pmx_group mt7620a_pinmux_data[] = {