From patchwork Tue Jun 12 20:54:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Maclean X-Patchwork-Id: 928529 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=monkeh.net Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="b/NOulUu"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="kmgFsi8P"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::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 4154GR0hRnz9s3C for ; Wed, 13 Jun 2018 08:25:50 +1000 (AEST) 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:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id:Date:To: From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=pA0KFr1xEPQoRrDeB85ybsGe//5lKcDlx7z+tNgrrrI=; b=b/NOulUuLSMX4+ E7Tlc3d1eVk2TqlJCZyYlG1xYJoiBR3FPVuIGSubhsH2bW27gtBwEerDe6ZHBO+NaIkaZaDjosLKk 8PGNg1TzLr7vxT8gAutIdbz9RSh1y3zgURwzzwgd8SQKrHFHP/5a5pZ+EWHi705+ZPSntAuas2eh+ 76i6Nu6sjwnO1QlosYc090f5zRYsl/+dk/JjT0jhJaw5IN7sUQk0AMKhnwNyR3fLItYnnYU0OGg+q oM5Iq+PPtNlRSLzpilahyra72dFJA5wImBdAbDXw7gGJKenToa8AZi84AIK60rkUL8hU126XmcP0m C5Mhsj0v3JXTSe/xNYhA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fSrjF-0003b0-Bx; Tue, 12 Jun 2018 22:25:29 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fSrio-0002Y9-Nq for openwrt-devel@bombadil.infradead.org; Tue, 12 Jun 2018 22:25:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Message-Id:Date:Subject:To:From:Sender: Reply-To:Cc:MIME-Version:Content-Type: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-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=dCYS0E4zIbb2/crlRs84YvKieNZdT7vmLgBFaNYqLl0=; b=kmgFsi8PWQsYM4uHXpdYIrMgMi clKB1W8xoxp/AEkNxWARJ/1KMSLasRBSkDSIj24/E6EhyyEARRZYFuTUguWUsXX59SBrDtq7acyLg 16u1DSu+qihhpiL5BM8TbLQ+kF01i48jdjHKoSOHwRnRwthYEM+dmqzvqLH2RlvFqa2XhWhZE6zCq gmYL3LlbFUyVFSdfACGn6+xIWhUhWV+wuR6xJa2gYPMFkzt1hYP5fnvctQSfRxBhegnaCrNGSu4Oy cbmDWtSbLF8LEuJ2D7SkSFMxUL1gFScXNkrx5KqluIxUDP8ZWDyRAOXn10NJMuOoC9V5wgZWmQQPh fjKnOFWA==; Received: from monkeh.net ([88.97.98.50] helo=mail.monkeh.net) by merlin.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fSqLO-0007Ju-UV for openwrt-devel@lists.openwrt.org; Tue, 12 Jun 2018 20:56:47 +0000 Received: from terra.home.monkeh.net (unknown [172.16.0.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: monkeh@monkeh.net) by mail.monkeh.net (Postfix) with ESMTPSA id 4D9E430A59B for ; Tue, 12 Jun 2018 20:56:25 +0000 (UTC) From: Alex Maclean To: openwrt-devel@lists.openwrt.org Date: Tue, 12 Jun 2018 21:54:52 +0100 Message-Id: <20180612205452.29857-1-monkeh@monkeh.net> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180612_165647_091053_FB733059 X-CRM114-Status: UNSURE ( 8.21 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.1 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record Subject: [OpenWrt-Devel] [PATCH] ath79: fixup TL-WR703N/TL-MR10U split X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Readd SoC compatible strings and correct model names mangled in a51078f7354fac9e31f6956cbddc77aaef02c67b, cleanup dts to remove duplication, rename dtsi for clarity, use correct GPIO for TL-MR10U USB power. Tested only on TL-WR703N due to lack of a TL-MR10U. Signed-off-by: Alex Maclean --- target/linux/ath79/dts/ar9331_tl-mr10u.dts | 18 ++++++------------ target/linux/ath79/dts/ar9331_tl-wr703n.dts | 10 +++++++--- ...03n.dtsi => ar9331_tl-wr703n_tl-mr10u.dtsi} | 4 ---- 3 files changed, 13 insertions(+), 19 deletions(-) rename target/linux/ath79/dts/{ar9331_tl-wr703n.dtsi => ar9331_tl-wr703n_tl-mr10u.dtsi} (94%) diff --git a/target/linux/ath79/dts/ar9331_tl-mr10u.dts b/target/linux/ath79/dts/ar9331_tl-mr10u.dts index 9a6947c951..d92b5623ba 100644 --- a/target/linux/ath79/dts/ar9331_tl-mr10u.dts +++ b/target/linux/ath79/dts/ar9331_tl-mr10u.dts @@ -1,19 +1,13 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "ar9331_tl-wr703n.dtsi" +#include "ar9331_tl-wr703n_tl-mr10u.dtsi" / { - model = "TP-Link MR10U"; - compatible = "tplink,tl-mr10u"; - - reg_usb_vbus: reg_usb_vbus { - compatible = "regulator-fixed"; - regulator-name = "usb_vbus"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - gpio = <&gpio 28 GPIO_ACTIVE_HIGH>; - enable-active-high; - }; + model = "TP-Link TL-MR10U"; + compatible = "tplink,tl-mr10u", "qca,ar9331"; +}; +®_usb_vbus { + gpio = <&gpio 18 GPIO_ACTIVE_HIGH>; }; diff --git a/target/linux/ath79/dts/ar9331_tl-wr703n.dts b/target/linux/ath79/dts/ar9331_tl-wr703n.dts index 17747052e6..da02e48662 100644 --- a/target/linux/ath79/dts/ar9331_tl-wr703n.dts +++ b/target/linux/ath79/dts/ar9331_tl-wr703n.dts @@ -1,9 +1,13 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "ar9331_tl-wr703n.dtsi" +#include "ar9331_tl-wr703n_tl-mr10u.dtsi" / { - model = "TP-Link WR703N"; - compatible = "tplink,tl-wr703n"; + model = "TP-Link TL-WR703N"; + compatible = "tplink,tl-wr703n", "qca,ar9331"; +}; + +®_usb_vbus { + gpio = <&gpio 8 GPIO_ACTIVE_HIGH>; }; diff --git a/target/linux/ath79/dts/ar9331_tl-wr703n.dtsi b/target/linux/ath79/dts/ar9331_tl-wr703n_tl-mr10u.dtsi similarity index 94% rename from target/linux/ath79/dts/ar9331_tl-wr703n.dtsi rename to target/linux/ath79/dts/ar9331_tl-wr703n_tl-mr10u.dtsi index 70f94ed4cb..8a82d80706 100644 --- a/target/linux/ath79/dts/ar9331_tl-wr703n.dtsi +++ b/target/linux/ath79/dts/ar9331_tl-wr703n_tl-mr10u.dtsi @@ -7,9 +7,6 @@ #include "ar9331.dtsi" / { - compatible = "tplink,tl-wr703n", "qca,ar9331"; - model = "TP-Link TL-WR703N"; - aliases { serial0 = &uart; led-status = &led_system; @@ -48,7 +45,6 @@ regulator-name = "usb_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&gpio 8 GPIO_ACTIVE_HIGH>; enable-active-high; };