From patchwork Thu May 18 19:49:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mirko Parthey X-Patchwork-Id: 764161 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wTMHf6f7yz9s4s for ; Fri, 19 May 2017 05:50:54 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="JLcQZCZb"; dkim-atps=neutral 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7AzPuFmkiX/5loFs2gcQ3yWp7LXJklnyxprxcEHR+9w=; b=JLcQZCZbnfQB1U DOU4vAKKRdfBVw4+tGfgPYHMEL/+A+gJFyX9cuvL117CKDRWqIkqI3pctEKeYnorY+6M3R1bz8Oq/ JtyZ7cseWv0UOL1Z+/VUUa0oS4HcUhRortgGjI/Hu8kRRDOBFkgj5ByU2ehUfgEPA/etJRetxZL9W DmJgyMTHueGJZat/lHa47HdXzqo+Ti4jdVMlSC1Vj8reI1gXdDoaI1OWvCLPFJtN7E+rqjLULiTFH 0w/gaoNNPFtINmUSjHafly0IXu4jkGUFynB1HEgtRaktbbPD7zDUxT6FtA2Qg2oQZmpSffwnCAEIW w1P9ZEMzMOYj+BuiVD2A==; 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 1dBRRd-0003X2-VS; Thu, 18 May 2017 19:50:45 +0000 Received: from mout.web.de ([212.227.17.12]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dBRRL-00023s-VR for lede-dev@lists.infradead.org; Thu, 18 May 2017 19:50:30 +0000 Received: from guitar.localdomain ([94.134.203.212]) by smtp.web.de (mrweb102 [213.165.67.124]) with ESMTPSA (Nemesis) id 0Lr2Zb-1dgMH42XXX-00eZXg; Thu, 18 May 2017 21:50:01 +0200 From: Mirko Parthey To: lede-dev@lists.infradead.org Date: Thu, 18 May 2017 21:49:03 +0200 Message-Id: <1495136944-8880-3-git-send-email-mirko.parthey@web.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1495136944-8880-1-git-send-email-mirko.parthey@web.de> References: <1495136944-8880-1-git-send-email-mirko.parthey@web.de> X-Provags-ID: V03:K0:DE60Pvt8lhiDEUeIBXpiew9i5a4X+HmHJL4HRuQCqaryXuFOHXQ tkmWlO71XRQPXWVMa2KTBsGsm9B1qRbaRDsDSdaHWQvZAmo2N0Aa9QEeNao/yulCR+O716H o3KVyw5A/tSILEVroDzcLQEfbsQL3lDKPPZVvkENcXZJo0KO/dcFcGZ/pDL32VKv5hJx+hc HDvSj2Kpi54aahKIcpYqQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:mi8aoftH/+Q=:AunB3D9eYDoXZpuqOS/0WR vodAwS6+uvA7/cbzNJrjIROfOSNy8NgmlrKi9sNbX9AT10wQer7nK+WFLqtnWekaICkTEpCIE zTbeXnJ5SqHD2elq3HAt+ZCYOAGhr4K2fkPGNbPIOebg18jiHoDzg+Yu/DJt2vFKtaX3P+rQG R/G27au8kJjBFyzEl0yaz0KvIDTlwszaRvx15EN3isdc7f+c3e3jm4eMuR7unZizWe9OyRQ6M SJO5ND0rTjyzdaYftLoOL3f1UyBzt7l5k2f8BYzelM0+bp/+4GBNLS52wuTIPqQPbfJwOqal2 iPPxeetyg5ceTZOvkYRKCSCVhax53s67+adABkkNTK332fNi8wT1cuQ5c2UV/3bXOHdRukQyI prVqGMK209ZyHrs/7V6+/uoETWOAieqcf2gR+M4Qpr/rP3cdhYuwgD9tDBK4RiwCLbRxkKQNu 711+wbMntJYt4EOM5mmVuO4akqM3jgj3iSpgzCSZRuGd6u8qIHW8hCAT302/yYYXjTwe5y8cr dmqIWnGZ8d7d2qgJEYcwL1CbYIFHdjCQovB3UWfeFBwyEGaqshuMMzBqNsY9skznyyf2t69Cx LkdIPVHLWke7pOLQnPwGK34b9shDevOSv/Gwsxfvgg9rFyRee4M4V8v3cIWdRtGKgjn7XB1F5 OJgVTEutkHOo1YZ9Os4AUjy3JKezpdgKPODiyO1MZivuQA9YnN+xGgXlR+F+rwry5IDQqs6j8 YwD6rfxO5tdHWISF+H+BiBQ+eqMpFHlU4hihsio+2GaO91AuDJEL5eBtXtU= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170518_125028_341011_D25AA75F X-CRM114-Status: UNSURE ( 9.20 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (mirko.parthey[at]web.de) -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [212.227.17.12 listed in wl.mailspike.net] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [212.227.17.12 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Subject: [LEDE-DEV] [PATCH 2/3] brcm47xx: resolve GPIO conflict for WRT54GSv1 X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mirko Parthey MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org On the Linksys WRT54GSv1, the adm6996 switch driver and the gpio_button_hotplug module both claim GPIO 6, which is connected to the Reset button. When the switch driver's request wins, the Reset button cannot work. This makes it impossible to enter failsafe mode without a serial console. Stop requesting the "adm_rc" GPIO in the switch driver, since it is not used anywhere. Fixes FS#792. Signed-off-by: Mirko Parthey --- target/linux/generic/files/drivers/net/phy/adm6996.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/target/linux/generic/files/drivers/net/phy/adm6996.c b/target/linux/generic/files/drivers/net/phy/adm6996.c index 25776b836651..0a1b303ab1c0 100644 --- a/target/linux/generic/files/drivers/net/phy/adm6996.c +++ b/target/linux/generic/files/drivers/net/phy/adm6996.c @@ -1154,12 +1154,13 @@ static int adm6996_gpio_probe(struct platform_device *pdev) ret = devm_gpio_request(&pdev->dev, priv->eedi, "adm_eedi"); if (ret) return ret; - ret = devm_gpio_request(&pdev->dev, priv->eerc, "adm_eerc"); - if (ret) - return ret; ret = devm_gpio_request(&pdev->dev, priv->eesk, "adm_eesk"); if (ret) return ret; + /* + * We do not request the "adm_rc" GPIO here. The driver does not use it, + * and it conflicts with the Reset button GPIO on the Linksys WRT54GSv1. + */ ret = adm6996_switch_init(priv, dev_name(&pdev->dev), NULL); if (ret < 0)