From patchwork Sat Dec 9 08:45:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?Q2h1bmZlbmcgWXVuICjkupHmmKXls7Ap?= X-Patchwork-Id: 10103625 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6104160329 for ; Sat, 9 Dec 2017 08:48:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 509A728FF6 for ; Sat, 9 Dec 2017 08:48:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 458F029011; Sat, 9 Dec 2017 08:48:45 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 ED82728FF6 for ; Sat, 9 Dec 2017 08:48:44 +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:References:In-Reply-To: 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: List-Owner; bh=ps76qRQbYbf2dsp1vnNmn0KWOxh1h05RtV4lMWxddoA=; b=OoMgrufravViJS bb4hMjIiWAMwzZWBGjbE9XkY/rEpnGiXr9LlF0t+BeIinv0MLetNCeusjHxdgVlW/CnuMs8e/b2Ld UitjyhmFTvWS6sEMqEV6XtOvn+YzoILKye/2aLq6bZ7O9ee+YZac/Q9kBODNTqOyXfkPAAqWSeWh9 CQtMuDgUJBa8x3+72A+loA+MvCEv5bZ4faDFIG7f2ddO5ilOwZchfFZUBLrpdSd3eT4mF3x3sfqXO 9ZufJA9/4CJZpjOkT20DMddtjXyVmXzb/D/UN6lpoH3VwFqTX8e6Q9DFgJb/QgY9BEHjFJmxXWg32 b63Kr+2G96SS+DA+3Zbw==; 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 1eNaoN-0008Lk-FI; Sat, 09 Dec 2017 08:48:43 +0000 Received: from [210.61.82.184] (helo=mailgw02.mediatek.com) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eNanA-0007Bu-CE; Sat, 09 Dec 2017 08:47:30 +0000 X-UUID: 528e6952f2a14c5abb2e2f2aa1e3bfb8-20171209 Received: from mtkcas09.mediatek.inc [(172.21.101.178)] by mailgw02.mediatek.com (envelope-from ) (mhqrelay.mediatek.com ESMTP with TLS) with ESMTP id 393971534; Sat, 09 Dec 2017 16:46:59 +0800 Received: from mtkcas09.mediatek.inc (172.21.101.178) by mtkmbs08n1.mediatek.inc (172.21.101.55) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Sat, 9 Dec 2017 16:46:59 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas09.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1210.3 via Frontend Transport; Sat, 9 Dec 2017 16:46:58 +0800 From: Chunfeng Yun To: Rob Herring , Felipe Balbi , Matthias Brugger , Mathias Nyman Subject: [PATCH 7/7] arm64: dts: mt8173: add uwk node and remove unused usb property Date: Sat, 9 Dec 2017 16:45:36 +0800 Message-ID: <1512809136-2779-8-git-send-email-chunfeng.yun@mediatek.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1512809136-2779-1-git-send-email-chunfeng.yun@mediatek.com> References: <1512809136-2779-1-git-send-email-chunfeng.yun@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171209_004728_713202_D5C06D8D X-CRM114-Status: GOOD ( 11.03 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, linux-usb@vger.kernel.org, Greg Kroah-Hartman , Sean Wang , Will Deacon , linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Catalin Marinas , Chunfeng Yun , Jean Delvare Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add uwk node for new way of usb remote wakeup instead of old one, and modify some usb properties according binding documents of mediatek,mtu3.txt and mediatek,mtk-xhci.txt Signed-off-by: Chunfeng Yun --- arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 28 ++++++++++++++++++---------- arch/arm64/boot/dts/mediatek/mt8173.dtsi | 16 +++++----------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts index 1c3634f..08a323b 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts +++ b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts @@ -14,6 +14,7 @@ /dts-v1/; #include +#include #include "mt8173.dtsi" / { @@ -68,6 +69,20 @@ gpio = <&pio 9 GPIO_ACTIVE_HIGH>; enable-active-high; }; + + usb_wakeup: uwk@0 { + compatible = "mediatek,mt8173-uwk","mediatek,usb-wk-v1"; + mediatek,wkc = <&pericfg>; + #address-cells = <1>; + #size-cells = <1>; + status = "okay"; + + usb_wk0: uwk@400 { + reg = <0x400 0x8>; + #mediatek,uwk-cells = <1>; + status = "okay"; + }; + }; }; &cec { @@ -268,12 +283,6 @@ }; }; - usb_id_pins_ground: usb_iddig_pull_down { - pins_iddig { - pinmux = ; - bias-pull-down; - }; - }; }; &pwm0 { @@ -501,15 +510,14 @@ }; &ssusb { + mediatek,uwks = <&usb_wk0 MTU_WK_IP_SLEEP>; vusb33-supply = <&mt6397_vusb_reg>; vbus-supply = <&usb_p0_vbus>; extcon = <&extcon_usb>; dr_mode = "otg"; - mediatek,enable-wakeup; - pinctrl-names = "default", "id_float", "id_ground"; + wakeup-source; + pinctrl-names = "default"; pinctrl-0 = <&usb_id_pins_float>; - pinctrl-1 = <&usb_id_pins_float>; - pinctrl-2 = <&usb_id_pins_ground>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi index 26396ef..818ead7 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi @@ -722,7 +722,7 @@ }; ssusb: usb@11271000 { - compatible = "mediatek,mt8173-mtu3"; + compatible = "mediatek,mt8173-mtu3", "mediatek,mtu3"; reg = <0 0x11271000 0 0x3000>, <0 0x11280700 0 0x0100>; reg-names = "mac", "ippc"; @@ -731,22 +731,16 @@ <&u3port0 PHY_TYPE_USB3>, <&u2port1 PHY_TYPE_USB2>; power-domains = <&scpsys MT8173_POWER_DOMAIN_USB>; - clocks = <&topckgen CLK_TOP_USB30_SEL>, - <&clk26m>, - <&pericfg CLK_PERI_USB0>, - <&pericfg CLK_PERI_USB1>; - clock-names = "sys_ck", - "ref_ck", - "wakeup_deb_p0", - "wakeup_deb_p1"; - mediatek,syscon-wakeup = <&pericfg>; + clocks = <&topckgen CLK_TOP_USB30_SEL>, <&clk26m>; + clock-names = "sys_ck", "ref_ck"; #address-cells = <2>; #size-cells = <2>; ranges; status = "disabled"; usb_host: xhci@11270000 { - compatible = "mediatek,mt8173-xhci"; + compatible = "mediatek,mt8173-xhci", + "mediatek,mtk-xhci"; reg = <0 0x11270000 0 0x1000>; reg-names = "mac"; interrupts = ;