From patchwork Sat Jan 23 00:10:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Clark X-Patchwork-Id: 572025 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 324C0140A98 for ; Sat, 23 Jan 2016 11:10:49 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Sh25TaZr; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id E8A4228BFF6; Sat, 23 Jan 2016 01:10:01 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 00FA22877E0 for ; Sat, 23 Jan 2016 01:09:53 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .gmail. - helo: .mail-qg0-f66.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -8.5 Received: from mail-qg0-f66.google.com (mail-qg0-f66.google.com [209.85.192.66]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Sat, 23 Jan 2016 01:09:53 +0100 (CET) Received: by mail-qg0-f66.google.com with SMTP id 94so6046031qgt.1 for ; Fri, 22 Jan 2016 16:10:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=40CLW8t+4NB3Gaq9mIDu9ohO5DQgjYlMgQUcP/IO0qQ=; b=Sh25TaZrv9I+l5b+iF5goiFV3z86MHza1neH0s5EUnp6k7hKHjwEnaMdaeUO47VNVN /+f7xfZCR8C2uGvZw0ea7FevPHu7A6WNwqitcHmkxvR3MrkGH6/TtC+Ex6AcKSpvTZsU b3VIc7P7uMOCPbUISKhs6bxTaUMpvt2aGu2++sVjGi5xhcSKLwbHu6GIrdWm34GgO8LA KHAb7YoaqXAmF645T50KXyMHBn3ENqSQfO2i169AlVzdL2oB/+2Suy5t1nT3pYDGADym q6alKSyBr84/T5zoRy+oAK1ty1ci9x9wa8zGuQZYPZ9Q+TGn30hsKB2MY015FUu1vKMK 0x2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=40CLW8t+4NB3Gaq9mIDu9ohO5DQgjYlMgQUcP/IO0qQ=; b=O4RoGzN6N3MMjxX7MUHH7ekzwSUCAJ6ZUldLopxHgiV+XrfLWmy1uWiwe/y+jfxOqN se4J3Hms0+fG/Iv5nT8v52f+gkvhTn7JPQBm/UZh9XTFn2TDOaVLo+Nj+RLmGT05l/vb Y8qE5WEBfE0qcUfpSfBysuvR4oI4O+G9QM6NOFYa/HN1Xr/Xxbj/ubXf9Hn2+nC0J9BS SoPSilnGc8l22PWsOL2z0ZSyjOejljih1rAo3ptijLUGT5AWjZXuTRu7sBcLxWCb8LRt 4c7l4SDezH/JCr+nQOuY/O+UY0nVCFgCMKHgDnzkci69tNWqxBzpTXNWXzeOtfZP8fpM uwmg== X-Gm-Message-State: AG10YORccFUoQKpm5gLjES1ypndrOjeqi9N7FgXJnXllmU0cOTq85cF+vhUmIUKuC8vLjA== X-Received: by 10.141.0.4 with SMTP id b4mr7740930qhd.23.1453507833848; Fri, 22 Jan 2016 16:10:33 -0800 (PST) Received: from ip-192-168-74-100.ec2.internal (ec2-52-20-192-9.compute-1.amazonaws.com. [52.20.192.9]) by smtp.gmail.com with ESMTPSA id b34sm3817754qgb.31.2016.01.22.16.10.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jan 2016 16:10:33 -0800 (PST) From: John Clark To: openwrt-devel@lists.openwrt.org Date: Sat, 23 Jan 2016 00:10:19 +0000 Message-Id: <1453507819-6283-1-git-send-email-inindev@gmail.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1453495247-5883-4-git-send-email-inindev@gmail.com> References: <1453495247-5883-4-git-send-email-inindev@gmail.com> Subject: Re: [OpenWrt-Devel] [PATCH 4/4] ramips: HLK-RM04 - Enable GPIO14 for WPS button X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" The top half of UARTF on the HLK-RM04 is used for GPIO. mode 1 mode 2 RIN GPIO14 DSR_N GPIO13 DCD_N GPIO12 DTR_N GPIO11 RXD GPIO10 CTS_N GPIO09 TXD GPIO08 RTS_N GPIO07 This patch applies 3'b101 mode to UARTF: GPIO14 GPIO13 GPIO12 GPIO11 RXD CTS_N TXD RTS_N Because the base rt5350.dtsi file forces 3'b000 mode, remove the pin setting from this file and apply it directly to the files that inherit from it (WIZFI630A.dts and WT1520.dtsi). This change makes the rt5350.dtsi file consistent with the mt7620a.dtsi file. Signed-off-by: John Clark --- sending again to fix typo in the original patch request comment target/linux/ramips/dts/HLKRM04.dts | 5 +++++ target/linux/ramips/dts/WIZFI630A.dts | 2 ++ target/linux/ramips/dts/WT1520.dtsi | 2 ++ target/linux/ramips/dts/rt5350.dtsi | 3 --- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/target/linux/ramips/dts/HLKRM04.dts b/target/linux/ramips/dts/HLKRM04.dts index 713b51f..3c9a93c 100644 --- a/target/linux/ramips/dts/HLKRM04.dts +++ b/target/linux/ramips/dts/HLKRM04.dts @@ -63,6 +63,11 @@ ralink,group = "i2c", "jtag"; ralink,function = "gpio"; }; + + uartf_gpio { + ralink,group = "uartf"; + ralink,function = "gpio uartf"; + }; }; }; diff --git a/target/linux/ramips/dts/WIZFI630A.dts b/target/linux/ramips/dts/WIZFI630A.dts index 39d68c3..e2a51ec 100644 --- a/target/linux/ramips/dts/WIZFI630A.dts +++ b/target/linux/ramips/dts/WIZFI630A.dts @@ -59,6 +59,8 @@ interrupt-parent = <&intc>; interrupts = <5>; reg-shift = <2>; + pinctrl-names = "default"; + pinctrl-0 = <&uartf_pins>; status = "okay"; }; diff --git a/target/linux/ramips/dts/WT1520.dtsi b/target/linux/ramips/dts/WT1520.dtsi index b8c4e0a..13ff268 100644 --- a/target/linux/ramips/dts/WT1520.dtsi +++ b/target/linux/ramips/dts/WT1520.dtsi @@ -15,6 +15,8 @@ palmbus@10000000 { uart@500 { + pinctrl-names = "default"; + pinctrl-0 = <&uartf_pins>; status = "okay"; }; }; diff --git a/target/linux/ramips/dts/rt5350.dtsi b/target/linux/ramips/dts/rt5350.dtsi index 27f7bf6..b8712e9 100644 --- a/target/linux/ramips/dts/rt5350.dtsi +++ b/target/linux/ramips/dts/rt5350.dtsi @@ -94,9 +94,6 @@ reg-shift = <2>; - pinctrl-names = "default"; - pinctrl-0 = <&uartf_pins>; - status = "disabled"; };