From patchwork Mon Jul 15 16:46:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 11044519 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1709E1800 for ; Mon, 15 Jul 2019 16:47:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0370326B39 for ; Mon, 15 Jul 2019 16:47:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EA49C26E3D; Mon, 15 Jul 2019 16:47:03 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 9462026B39 for ; Mon, 15 Jul 2019 16:47:03 +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-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=6tcJkOfHwnHBVSyNmnJHr2f8RUcMNafUE40WcUj+cBA=; b=tep3o/xWe+2BZ9 dDUY0+oUWpXF/JgNeHELcpWl2SDlrxuRWX+RjETmILp0vyNAYBq7jQAldV2lKoVW0ZYhjuPXvqZ5c ET0pc4uXj5EmNsTZy3J0/jd9q8cMZpjRKAOwzgR+ALte4HW+eXmxOmBRUPVofmfD1zCYyuNFMYjqH NvPCC09XsKXAPVEf2SwI766TRc5AVsipJJqyEF6d52iAFXFrB8zRjstJDLkDJK+9eWXRyU29aQ+l4 HmzYOAvEh2O/89JQJTG7+fO6pRBFmGHtJowX7YbnhrZagL6DOIgZ1L4unVATW5vvA5J9/yMd0Dcw8 j07Zwq5Yk7IJdP/K7VAA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hn47x-0008Sz-PJ; Mon, 15 Jul 2019 16:47:01 +0000 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hn47u-0008Qh-EG for linux-arm-kernel@lists.infradead.org; Mon, 15 Jul 2019 16:46:59 +0000 Received: by mail-lj1-x243.google.com with SMTP id t28so16949158lje.9 for ; Mon, 15 Jul 2019 09:46:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=s01qK3uxx7mnUo5yTLfmogyNz5i6I9WLEPs8T+BH3IY=; b=DbhUu9uOoUXeWcINAdNW82uFlZSjjuoqo+bNaAllLINGwKFYGexLs8II3qAw1dKMK+ xyX/Y201I9J391osgqyWs/NMFDYVC5S2T7EVWuHfWadUF4a8ymAWZkIbJUPyaOe1X0yL RYkaDlAk1yS1kCH/CgIcNSq37OBS26zLhe7kJUvcI7+xGsLiTBcVziXLUcAj8PbYyFuS ljo7KWGztLEXPGYufW0V6HNQYpj1WrLTrVEeyOQBZ4GT6BaqnMWD3dh2u3Vmw8Ql7p0p pABxV8osiA2OipTjuJnkqLJaThsdh2l3X7zm0t3JmT0w29F0Vb72bjYamF7ch5ajuk17 v/3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=s01qK3uxx7mnUo5yTLfmogyNz5i6I9WLEPs8T+BH3IY=; b=VnP9r5IU0UIj2rVflVR6AlGazmnKf0A6/762vzIK+jsOySzrh5MwZID/Wpq6wPggZY ibkA3vASLTFdwQB4zjk4K1QbjpO0RT08uvxohIYbMw7jf3IucIROffQ8N3SueOTUdalQ 4cZsVx6hYtKbW5TIumTSxMf9e2RQwTvnv+Na6DmojIkcJOUCukzcgeAmBZSbl1Vyouk4 p8ZZ/wgRlywWfQrM40d7Pfz3BoJIOvWHYRq7/dEL2FBCmv9F7JjWXXzKwAKDU+Zkw3S/ Z+pLmKryI2wD6D0DIdMflQ9Q5GP5nXk/ugiMbH11wqS+kSEdahdqAyMdzJWYwWf5x9/+ 6TJw== X-Gm-Message-State: APjAAAUcBZziZsAeNb9F1XC3EgdVkG9cohxZsWCt147M4GBdRHQTCY0b uioednsWGBw+efTCPs6gjB+lA1W6J8o= X-Google-Smtp-Source: APXvYqxN2EiRgDcHeNBBeImwb4enBRCl4pW/DzO31aUvfNg6C/CwfoGFxUZ5+Qo+zdYhRQpgXtpTYA== X-Received: by 2002:a05:651c:95:: with SMTP id 21mr14708819ljq.128.1563209215595; Mon, 15 Jul 2019 09:46:55 -0700 (PDT) Received: from localhost.bredbandsbolaget (c-22cd225c.014-348-6c756e10.bbcust.telenor.se. [92.34.205.34]) by smtp.gmail.com with ESMTPSA id e87sm3628329ljf.54.2019.07.15.09.46.54 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 15 Jul 2019 09:46:54 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Hans Ulli Kroll Subject: [PATCH 1/3] ARM: dts: gemini: Fix up confused pin settings Date: Mon, 15 Jul 2019 18:46:48 +0200 Message-Id: <20190715164650.2883-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190715_094658_548613_FCE7B110 X-CRM114-Status: GOOD ( 12.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linus Walleij , Florian Fainelli 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 SL93512r board has its pin muxing set up for the wrong ASIC: SL3516 instead of SL3512 that it is using. Fix it up and reference the right GPIO for the WPS button. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/gemini-sl93512r.dts | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/gemini-sl93512r.dts b/arch/arm/boot/dts/gemini-sl93512r.dts index 2bb953440793..afe655593b28 100644 --- a/arch/arm/boot/dts/gemini-sl93512r.dts +++ b/arch/arm/boot/dts/gemini-sl93512r.dts @@ -36,8 +36,8 @@ wakeup-source; linux,code = ; label = "WPS"; - /* Conflict with NAND flash */ - gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; + /* Conflicts with TVC and extended flash */ + gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; }; button-setup { @@ -180,17 +180,20 @@ syscon: syscon@40000000 { pinctrl { /* - * gpio0egrp cover line 16 used by HD LED - * gpio0fgrp cover line 17, 18 used by wireless LED and reset button - * gpio0hgrp cover line 21, 22 used by MDIO for Marvell PHY - * gpio0kgrp cover line 31 used by USB LED + * gpio0agrp cover line 0, used by WPS button + * gpio0fgrp cover line 16 used by HD LED + * gpio0ggrp cover line 17, 18 used by wireless LAN LED and + * reset button OR USB ID select on 17 and USB VBUS select + * on 18. (Confusing.) + * gpio0igrp cover line 21, 22 used by MDIO for Marvell PHY */ gpio0_default_pins: pinctrl-gpio0 { mux { function = "gpio0"; - groups = "gpio0egrp", + groups = "gpio0agrp", "gpio0fgrp", - "gpio0hgrp"; + "gpio0ggrp", + "gpio0igrp"; }; }; /*