From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0512C04EB9 for ; Mon, 3 Dec 2018 03:46:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 75C832145D for ; Mon, 3 Dec 2018 03:46:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 75C832145D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726069AbeLCDqQ (ORCPT ); Sun, 2 Dec 2018 22:46:16 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:15189 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725976AbeLCDps (ORCPT ); Sun, 2 Dec 2018 22:45:48 -0500 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 5D0C9B90FF95A; Mon, 3 Dec 2018 11:45:42 +0800 (CST) Received: from vm100-107-113-134.huawei.com (100.107.113.134) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.408.0; Mon, 3 Dec 2018 11:45:36 +0800 From: Yu Chen To: , , CC: , , Yu Chen , Wei Xu , Rob Herring , Mark Rutland , , John Stultz , Binghui Wang Subject: [PATCH v1 12/12] dts: hi3660: Add support for usb on Hikey960 Date: Mon, 3 Dec 2018 11:45:15 +0800 Message-ID: <20181203034515.91412-13-chenyu56@huawei.com> X-Mailer: git-send-email 2.15.0-rc2 In-Reply-To: <20181203034515.91412-1-chenyu56@huawei.com> References: <20181203034515.91412-1-chenyu56@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [100.107.113.134] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds support for usb on Hikey960. Cc: Wei Xu Cc: Rob Herring Cc: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org Cc: John Stultz Cc: Binghui Wang Signed-off-by: Yu Chen --- arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 56 ++++++++++++++++++ arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 72 +++++++++++++++++++++++ 2 files changed, 128 insertions(+) diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts index c98bcbc8dfba..066c558154ea 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts +++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts @@ -13,6 +13,7 @@ #include #include #include +#include / { model = "HiKey960"; @@ -196,6 +197,28 @@ method = "smc"; }; }; + + hisi_hikey_usb: hisi_hikey_usb { + compatible = "hisilicon,hikey960_usb"; + typec-vbus-gpios = <&gpio25 2 0>; + typc-vbus-enable-val = <1>; + otg-switch-gpios = <&gpio25 6 0>; + hub-vdd33-en-gpios = <&gpio5 6 0>; + pinctrl-names = "default"; + pinctrl-0 = <&usbhub5734_pmx_func>; + + port { + #address-cells = <1>; + #size-cells = <0>; + + hikey_usb_ep: endpoint@0 { + reg = <0>; + device_type = "usb-role-switch"; + remote-endpoint = <&dwc3_role_switch_notify>; + }; + }; + }; + }; /* @@ -526,6 +549,39 @@ &i2c1 { status = "okay"; + rt1711h: rt1711h@4e { + compatible = "richtek,rt1711h"; + reg = <0x4e>; + status = "ok"; + interrupt-parent = <&gpio27>; + interrupts = <3 IRQ_TYPE_LEVEL_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&usb_cfg_func>; + + usb_con: connector { + compatible = "usb-c-connector"; + label = "USB-C"; + data-role = "dual"; + power-role = "dual"; + try-power-role = "sink"; + source-pdos = ; + sink-pdos = ; + op-sink-microwatt = <10000000>; + }; + + port { + #address-cells = <1>; + #size-cells = <0>; + + rt1711h_ep: endpoint@0 { + reg = <0>; + device_type = "usb-role-switch"; + remote-endpoint = <&dwc3_role_switch>; + }; + }; + }; + adv7533: adv7533@39 { status = "ok"; compatible = "adi,adv7533"; diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi index f432b0a88c65..e6583bd7efdb 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi @@ -349,6 +349,12 @@ #clock-cells = <1>; }; + pmctrl: pmctrl@fff31000 { + compatible = "hisilicon,hi3660-pmctrl", "syscon"; + reg = <0x0 0xfff31000 0x0 0x1000>; + #clock-cells = <1>; + }; + pmuctrl: crg_ctrl@fff34000 { compatible = "hisilicon,hi3660-pmuctrl", "syscon"; reg = <0x0 0xfff34000 0x0 0x1000>; @@ -1122,5 +1128,71 @@ }; }; }; + + usb3_otg_bc: usb3_otg_bc@ff200000 { + compatible = "syscon"; + reg = <0x0 0xff200000 0x0 0x1000>; + }; + + usb_phy: usb-phy { + compatible = "hisilicon,hi3660-usb-phy"; + #phy-cells = <0>; + hisilicon,pericrg-syscon = <&crg_ctrl>; + hisilicon,pctrl-syscon = <&pctrl>; + hisilicon,usb3-otg-bc-syscon = <&usb3_otg_bc>; + hisilicon,eye-diagram-param = <0x22466e4>; + }; + + usb3: hisi_dwc3 { + compatible = "hisilicon,hi3660-dwc3"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + + clocks = <&crg_ctrl HI3660_CLK_ABB_USB>, + <&crg_ctrl HI3660_ACLK_GATE_USB3OTG>; + clock-names = "clk_usb3phy_ref", "aclk_usb3otg"; + + assigned-clocks = <&crg_ctrl HI3660_ACLK_GATE_USB3OTG>; + assigned-clock-rates = <229000000>; + resets = <&crg_rst 0x90 8>, + <&crg_rst 0x90 7>, + <&crg_rst 0x90 6>, + <&crg_rst 0x90 5>; + + dwc3: dwc3@ff100000 { + compatible = "snps,dwc3"; + reg = <0x0 0xff100000 0x0 0x100000>; + interrupts = <0 159 4>, <0 161 4>; + phys = <&usb_phy>; + phy-names = "usb3-phy"; + dr_mode = "otg"; + maximum-speed = "super-speed"; + phy_type = "utmi"; + snps,dis-del-phy-power-chg-quirk; + snps,lfps_filter_quirk; + snps,dis_u2_susphy_quirk; + snps,dis_u3_susphy_quirk; + snps,tx_de_emphasis_quirk; + snps,tx_de_emphasis = <1>; + snps,dis_enblslpm_quirk; + snps,gctl-reset-quirk; + + port { + #address-cells = <1>; + #size-cells = <0>; + + dwc3_role_switch: endpoint@0 { + reg = <0>; + remote-endpoint = <&rt1711h_ep>; + }; + + dwc3_role_switch_notify: endpoint@1 { + reg = <1>; + remote-endpoint = <&hikey_usb_ep>; + }; + }; + }; + }; }; }; -- 2.15.0-rc2 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yu Chen Subject: [PATCH v1 12/12] dts: hi3660: Add support for usb on Hikey960 Date: Mon, 3 Dec 2018 11:45:15 +0800 Message-ID: <20181203034515.91412-13-chenyu56@huawei.com> References: <20181203034515.91412-1-chenyu56@huawei.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20181203034515.91412-1-chenyu56@huawei.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mark Rutland , suzhuangluan@hisilicon.com, Binghui Wang , Yu Chen , kongfei@hisilicon.com, Wei Xu , Rob Herring , John Stultz , linux-arm-kernel@lists.infradead.org List-Id: devicetree@vger.kernel.org This patch adds support for usb on Hikey960. Cc: Wei Xu Cc: Rob Herring Cc: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org Cc: John Stultz Cc: Binghui Wang Signed-off-by: Yu Chen --- arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 56 ++++++++++++++++++ arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 72 +++++++++++++++++++++++ 2 files changed, 128 insertions(+) diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts index c98bcbc8dfba..066c558154ea 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts +++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts @@ -13,6 +13,7 @@ #include #include #include +#include / { model = "HiKey960"; @@ -196,6 +197,28 @@ method = "smc"; }; }; + + hisi_hikey_usb: hisi_hikey_usb { + compatible = "hisilicon,hikey960_usb"; + typec-vbus-gpios = <&gpio25 2 0>; + typc-vbus-enable-val = <1>; + otg-switch-gpios = <&gpio25 6 0>; + hub-vdd33-en-gpios = <&gpio5 6 0>; + pinctrl-names = "default"; + pinctrl-0 = <&usbhub5734_pmx_func>; + + port { + #address-cells = <1>; + #size-cells = <0>; + + hikey_usb_ep: endpoint@0 { + reg = <0>; + device_type = "usb-role-switch"; + remote-endpoint = <&dwc3_role_switch_notify>; + }; + }; + }; + }; /* @@ -526,6 +549,39 @@ &i2c1 { status = "okay"; + rt1711h: rt1711h@4e { + compatible = "richtek,rt1711h"; + reg = <0x4e>; + status = "ok"; + interrupt-parent = <&gpio27>; + interrupts = <3 IRQ_TYPE_LEVEL_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&usb_cfg_func>; + + usb_con: connector { + compatible = "usb-c-connector"; + label = "USB-C"; + data-role = "dual"; + power-role = "dual"; + try-power-role = "sink"; + source-pdos = ; + sink-pdos = ; + op-sink-microwatt = <10000000>; + }; + + port { + #address-cells = <1>; + #size-cells = <0>; + + rt1711h_ep: endpoint@0 { + reg = <0>; + device_type = "usb-role-switch"; + remote-endpoint = <&dwc3_role_switch>; + }; + }; + }; + adv7533: adv7533@39 { status = "ok"; compatible = "adi,adv7533"; diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi index f432b0a88c65..e6583bd7efdb 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi @@ -349,6 +349,12 @@ #clock-cells = <1>; }; + pmctrl: pmctrl@fff31000 { + compatible = "hisilicon,hi3660-pmctrl", "syscon"; + reg = <0x0 0xfff31000 0x0 0x1000>; + #clock-cells = <1>; + }; + pmuctrl: crg_ctrl@fff34000 { compatible = "hisilicon,hi3660-pmuctrl", "syscon"; reg = <0x0 0xfff34000 0x0 0x1000>; @@ -1122,5 +1128,71 @@ }; }; }; + + usb3_otg_bc: usb3_otg_bc@ff200000 { + compatible = "syscon"; + reg = <0x0 0xff200000 0x0 0x1000>; + }; + + usb_phy: usb-phy { + compatible = "hisilicon,hi3660-usb-phy"; + #phy-cells = <0>; + hisilicon,pericrg-syscon = <&crg_ctrl>; + hisilicon,pctrl-syscon = <&pctrl>; + hisilicon,usb3-otg-bc-syscon = <&usb3_otg_bc>; + hisilicon,eye-diagram-param = <0x22466e4>; + }; + + usb3: hisi_dwc3 { + compatible = "hisilicon,hi3660-dwc3"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + + clocks = <&crg_ctrl HI3660_CLK_ABB_USB>, + <&crg_ctrl HI3660_ACLK_GATE_USB3OTG>; + clock-names = "clk_usb3phy_ref", "aclk_usb3otg"; + + assigned-clocks = <&crg_ctrl HI3660_ACLK_GATE_USB3OTG>; + assigned-clock-rates = <229000000>; + resets = <&crg_rst 0x90 8>, + <&crg_rst 0x90 7>, + <&crg_rst 0x90 6>, + <&crg_rst 0x90 5>; + + dwc3: dwc3@ff100000 { + compatible = "snps,dwc3"; + reg = <0x0 0xff100000 0x0 0x100000>; + interrupts = <0 159 4>, <0 161 4>; + phys = <&usb_phy>; + phy-names = "usb3-phy"; + dr_mode = "otg"; + maximum-speed = "super-speed"; + phy_type = "utmi"; + snps,dis-del-phy-power-chg-quirk; + snps,lfps_filter_quirk; + snps,dis_u2_susphy_quirk; + snps,dis_u3_susphy_quirk; + snps,tx_de_emphasis_quirk; + snps,tx_de_emphasis = <1>; + snps,dis_enblslpm_quirk; + snps,gctl-reset-quirk; + + port { + #address-cells = <1>; + #size-cells = <0>; + + dwc3_role_switch: endpoint@0 { + reg = <0>; + remote-endpoint = <&rt1711h_ep>; + }; + + dwc3_role_switch_notify: endpoint@1 { + reg = <1>; + remote-endpoint = <&hikey_usb_ep>; + }; + }; + }; + }; }; }; -- 2.15.0-rc2 From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v1,12/12] dts: hi3660: Add support for usb on Hikey960 From: Yu Chen Message-Id: <20181203034515.91412-13-chenyu56@huawei.com> Date: Mon, 3 Dec 2018 11:45:15 +0800 To: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: suzhuangluan@hisilicon.com, kongfei@hisilicon.com, Yu Chen , Wei Xu , Rob Herring , Mark Rutland , linux-arm-kernel@lists.infradead.org, John Stultz , Binghui Wang List-ID: VGhpcyBwYXRjaCBhZGRzIHN1cHBvcnQgZm9yIHVzYiBvbiBIaWtleTk2MC4KCkNjOiBXZWkgWHUg PHh1d2VpNUBoaXNpbGljb24uY29tPgpDYzogUm9iIEhlcnJpbmcgPHJvYmgrZHRAa2VybmVsLm9y Zz4KQ2M6IE1hcmsgUnV0bGFuZCA8bWFyay5ydXRsYW5kQGFybS5jb20+CkNjOiBsaW51eC1hcm0t a2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKQ2M6IEpvaG4gU3R1bHR6IDxqb2huLnN0dWx0ekBs aW5hcm8ub3JnPgpDYzogQmluZ2h1aSBXYW5nIDx3YW5nYmluZ2h1aUBoaXNpbGljb24uY29tPgpT aWduZWQtb2ZmLWJ5OiBZdSBDaGVuIDxjaGVueXU1NkBodWF3ZWkuY29tPgotLS0KIGFyY2gvYXJt NjQvYm9vdC9kdHMvaGlzaWxpY29uL2hpMzY2MC1oaWtleTk2MC5kdHMgfCA1NiArKysrKysrKysr KysrKysrKysKIGFyY2gvYXJtNjQvYm9vdC9kdHMvaGlzaWxpY29uL2hpMzY2MC5kdHNpICAgICAg ICAgfCA3MiArKysrKysrKysrKysrKysrKysrKysrKwogMiBmaWxlcyBjaGFuZ2VkLCAxMjggaW5z ZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2FyY2gvYXJtNjQvYm9vdC9kdHMvaGlzaWxpY29uL2hp MzY2MC1oaWtleTk2MC5kdHMgYi9hcmNoL2FybTY0L2Jvb3QvZHRzL2hpc2lsaWNvbi9oaTM2NjAt aGlrZXk5NjAuZHRzCmluZGV4IGM5OGJjYmM4ZGZiYS4uMDY2YzU1ODE1NGVhIDEwMDY0NAotLS0g YS9hcmNoL2FybTY0L2Jvb3QvZHRzL2hpc2lsaWNvbi9oaTM2NjAtaGlrZXk5NjAuZHRzCisrKyBi L2FyY2gvYXJtNjQvYm9vdC9kdHMvaGlzaWxpY29uL2hpMzY2MC1oaWtleTk2MC5kdHMKQEAgLTEz LDYgKzEzLDcgQEAKICNpbmNsdWRlIDxkdC1iaW5kaW5ncy9ncGlvL2dwaW8uaD4KICNpbmNsdWRl IDxkdC1iaW5kaW5ncy9pbnB1dC9pbnB1dC5oPgogI2luY2x1ZGUgPGR0LWJpbmRpbmdzL2ludGVy cnVwdC1jb250cm9sbGVyL2lycS5oPgorI2luY2x1ZGUgPGR0LWJpbmRpbmdzL3VzYi9wZC5oPgog CiAvIHsKIAltb2RlbCA9ICJIaUtleTk2MCI7CkBAIC0xOTYsNiArMTk3LDI4IEBACiAJCQltZXRo b2QgPSAic21jIjsKIAkJfTsKIAl9OworCisJaGlzaV9oaWtleV91c2I6IGhpc2lfaGlrZXlfdXNi IHsKKwkJY29tcGF0aWJsZSA9ICJoaXNpbGljb24saGlrZXk5NjBfdXNiIjsKKwkJdHlwZWMtdmJ1 cy1ncGlvcyA9IDwmZ3BpbzI1IDIgMD47CisJCXR5cGMtdmJ1cy1lbmFibGUtdmFsID0gPDE+Owor CQlvdGctc3dpdGNoLWdwaW9zID0gPCZncGlvMjUgNiAwPjsKKwkJaHViLXZkZDMzLWVuLWdwaW9z ID0gPCZncGlvNSA2IDA+OworCQlwaW5jdHJsLW5hbWVzID0gImRlZmF1bHQiOworCQlwaW5jdHJs LTAgPSA8JnVzYmh1YjU3MzRfcG14X2Z1bmM+OworCisJCXBvcnQgeworCQkJI2FkZHJlc3MtY2Vs bHMgPSA8MT47CisJCQkjc2l6ZS1jZWxscyA9IDwwPjsKKworCQkJaGlrZXlfdXNiX2VwOiBlbmRw b2ludEAwIHsKKwkJCQlyZWcgPSA8MD47CisJCQkJZGV2aWNlX3R5cGUgPSAidXNiLXJvbGUtc3dp dGNoIjsKKwkJCQlyZW1vdGUtZW5kcG9pbnQgPSA8JmR3YzNfcm9sZV9zd2l0Y2hfbm90aWZ5PjsK KwkJCX07CisJCX07CisJfTsKKwogfTsKIAogLyoKQEAgLTUyNiw2ICs1NDksMzkgQEAKICZpMmMx IHsKIAlzdGF0dXMgPSAib2theSI7CiAKKwlydDE3MTFoOiBydDE3MTFoQDRlIHsKKwkJY29tcGF0 aWJsZSA9ICJyaWNodGVrLHJ0MTcxMWgiOworCQlyZWcgPSA8MHg0ZT47CisJCXN0YXR1cyA9ICJv ayI7CisJCWludGVycnVwdC1wYXJlbnQgPSA8JmdwaW8yNz47CisJCWludGVycnVwdHMgPSA8MyBJ UlFfVFlQRV9MRVZFTF9MT1c+OworCQlwaW5jdHJsLW5hbWVzID0gImRlZmF1bHQiOworCQlwaW5j dHJsLTAgPSA8JnVzYl9jZmdfZnVuYz47CisKKwkJdXNiX2NvbjogY29ubmVjdG9yIHsKKwkJCWNv bXBhdGlibGUgPSAidXNiLWMtY29ubmVjdG9yIjsKKwkJCWxhYmVsID0gIlVTQi1DIjsKKwkJCWRh dGEtcm9sZSA9ICJkdWFsIjsKKwkJCXBvd2VyLXJvbGUgPSAiZHVhbCI7CisJCQl0cnktcG93ZXIt cm9sZSA9ICJzaW5rIjsKKwkJCXNvdXJjZS1wZG9zID0gPFBET19GSVhFRCg1MDAwLCA1MDAsIFBE T19GSVhFRF9VU0JfQ09NTSk+OworCQkJc2luay1wZG9zID0gPFBET19GSVhFRCg1MDAwLCA1MDAs IFBET19GSVhFRF9VU0JfQ09NTSkKKwkJCQlQRE9fVkFSKDUwMDAsIDUwMDAsIDEwMDApPjsKKwkJ CW9wLXNpbmstbWljcm93YXR0ID0gPDEwMDAwMDAwPjsKKwkJfTsKKworCQlwb3J0IHsKKwkJCSNh ZGRyZXNzLWNlbGxzID0gPDE+OworCQkJI3NpemUtY2VsbHMgPSA8MD47CisKKwkJCXJ0MTcxMWhf ZXA6IGVuZHBvaW50QDAgeworCQkJCXJlZyA9IDwwPjsKKwkJCQlkZXZpY2VfdHlwZSA9ICJ1c2It cm9sZS1zd2l0Y2giOworCQkJCXJlbW90ZS1lbmRwb2ludCA9IDwmZHdjM19yb2xlX3N3aXRjaD47 CisJCQl9OworCQl9OworCX07CisKIAlhZHY3NTMzOiBhZHY3NTMzQDM5IHsKIAkJc3RhdHVzID0g Im9rIjsKIAkJY29tcGF0aWJsZSA9ICJhZGksYWR2NzUzMyI7CmRpZmYgLS1naXQgYS9hcmNoL2Fy bTY0L2Jvb3QvZHRzL2hpc2lsaWNvbi9oaTM2NjAuZHRzaSBiL2FyY2gvYXJtNjQvYm9vdC9kdHMv aGlzaWxpY29uL2hpMzY2MC5kdHNpCmluZGV4IGY0MzJiMGE4OGM2NS4uZTY1ODNiZDdlZmRiIDEw MDY0NAotLS0gYS9hcmNoL2FybTY0L2Jvb3QvZHRzL2hpc2lsaWNvbi9oaTM2NjAuZHRzaQorKysg Yi9hcmNoL2FybTY0L2Jvb3QvZHRzL2hpc2lsaWNvbi9oaTM2NjAuZHRzaQpAQCAtMzQ5LDYgKzM0 OSwxMiBAQAogCQkJI2Nsb2NrLWNlbGxzID0gPDE+OwogCQl9OwogCisJCXBtY3RybDogcG1jdHJs QGZmZjMxMDAwIHsKKwkJCWNvbXBhdGlibGUgPSAiaGlzaWxpY29uLGhpMzY2MC1wbWN0cmwiLCAi c3lzY29uIjsKKwkJCXJlZyA9IDwweDAgMHhmZmYzMTAwMCAweDAgMHgxMDAwPjsKKwkJCSNjbG9j ay1jZWxscyA9IDwxPjsKKwkJfTsKKwogCQlwbXVjdHJsOiBjcmdfY3RybEBmZmYzNDAwMCB7CiAJ CQljb21wYXRpYmxlID0gImhpc2lsaWNvbixoaTM2NjAtcG11Y3RybCIsICJzeXNjb24iOwogCQkJ cmVnID0gPDB4MCAweGZmZjM0MDAwIDB4MCAweDEwMDA+OwpAQCAtMTEyMiw1ICsxMTI4LDcxIEBA CiAJCQkJfTsKIAkJCX07CiAJCX07CisKKwkJdXNiM19vdGdfYmM6IHVzYjNfb3RnX2JjQGZmMjAw MDAwIHsKKwkJCWNvbXBhdGlibGUgPSAic3lzY29uIjsKKwkJCXJlZyA9IDwweDAgMHhmZjIwMDAw MCAweDAgMHgxMDAwPjsKKwkJfTsKKworCQl1c2JfcGh5OiB1c2ItcGh5IHsKKwkJCWNvbXBhdGli bGUgPSAiaGlzaWxpY29uLGhpMzY2MC11c2ItcGh5IjsKKwkJCSNwaHktY2VsbHMgPSA8MD47CisJ CQloaXNpbGljb24scGVyaWNyZy1zeXNjb24gPSA8JmNyZ19jdHJsPjsKKwkJCWhpc2lsaWNvbixw Y3RybC1zeXNjb24gPSA8JnBjdHJsPjsKKwkJCWhpc2lsaWNvbix1c2IzLW90Zy1iYy1zeXNjb24g PSA8JnVzYjNfb3RnX2JjPjsKKwkJCWhpc2lsaWNvbixleWUtZGlhZ3JhbS1wYXJhbSA9IDwweDIy NDY2ZTQ+OworCQl9OworCisJCXVzYjM6IGhpc2lfZHdjMyB7CisJCQljb21wYXRpYmxlID0gImhp c2lsaWNvbixoaTM2NjAtZHdjMyI7CisJCQkjYWRkcmVzcy1jZWxscyA9IDwyPjsKKwkJCSNzaXpl LWNlbGxzID0gPDI+OworCQkJcmFuZ2VzOworCisJCQljbG9ja3MgPSA8JmNyZ19jdHJsIEhJMzY2 MF9DTEtfQUJCX1VTQj4sCisJCQkJIDwmY3JnX2N0cmwgSEkzNjYwX0FDTEtfR0FURV9VU0IzT1RH PjsKKwkJCWNsb2NrLW5hbWVzID0gImNsa191c2IzcGh5X3JlZiIsICJhY2xrX3VzYjNvdGciOwor CisJCQlhc3NpZ25lZC1jbG9ja3MgPSA8JmNyZ19jdHJsIEhJMzY2MF9BQ0xLX0dBVEVfVVNCM09U Rz47CisJCQlhc3NpZ25lZC1jbG9jay1yYXRlcyA9IDwyMjkwMDAwMDA+OworCQkJcmVzZXRzID0g PCZjcmdfcnN0IDB4OTAgOD4sCisJCQkJIDwmY3JnX3JzdCAweDkwIDc+LAorCQkJCSA8JmNyZ19y c3QgMHg5MCA2PiwKKwkJCQkgPCZjcmdfcnN0IDB4OTAgNT47CisKKwkJCWR3YzM6IGR3YzNAZmYx MDAwMDAgeworCQkJCWNvbXBhdGlibGUgPSAic25wcyxkd2MzIjsKKwkJCQlyZWcgPSA8MHgwIDB4 ZmYxMDAwMDAgMHgwIDB4MTAwMDAwPjsKKwkJCQlpbnRlcnJ1cHRzID0gPDAgMTU5IDQ+LCA8MCAx NjEgND47CisJCQkJcGh5cyA9IDwmdXNiX3BoeT47CisJCQkJcGh5LW5hbWVzID0gInVzYjMtcGh5 IjsKKwkJCQlkcl9tb2RlID0gIm90ZyI7CisJCQkJbWF4aW11bS1zcGVlZCA9ICJzdXBlci1zcGVl ZCI7CisJCQkJcGh5X3R5cGUgPSAidXRtaSI7CisJCQkJc25wcyxkaXMtZGVsLXBoeS1wb3dlci1j aGctcXVpcms7CisJCQkJc25wcyxsZnBzX2ZpbHRlcl9xdWlyazsKKwkJCQlzbnBzLGRpc191Ml9z dXNwaHlfcXVpcms7CisJCQkJc25wcyxkaXNfdTNfc3VzcGh5X3F1aXJrOworCQkJCXNucHMsdHhf ZGVfZW1waGFzaXNfcXVpcms7CisJCQkJc25wcyx0eF9kZV9lbXBoYXNpcyA9IDwxPjsKKwkJCQlz bnBzLGRpc19lbmJsc2xwbV9xdWlyazsKKwkJCQlzbnBzLGdjdGwtcmVzZXQtcXVpcms7CisKKwkJ CQlwb3J0IHsKKwkJCQkJI2FkZHJlc3MtY2VsbHMgPSA8MT47CisJCQkJCSNzaXplLWNlbGxzID0g PDA+OworCisJCQkJCWR3YzNfcm9sZV9zd2l0Y2g6IGVuZHBvaW50QDAgeworCQkJCQkJcmVnID0g PDA+OworCQkJCQkJcmVtb3RlLWVuZHBvaW50ID0gPCZydDE3MTFoX2VwPjsKKwkJCQkJfTsKKwor CQkJCQlkd2MzX3JvbGVfc3dpdGNoX25vdGlmeTogZW5kcG9pbnRAMSB7CisJCQkJCQlyZWcgPSA8 MT47CisJCQkJCQlyZW1vdGUtZW5kcG9pbnQgPSA8Jmhpa2V5X3VzYl9lcD47CisJCQkJCX07CisJ CQkJfTsKKwkJCX07CisJCX07CiAJfTsKIH07Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.7 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 828F1C64EB4 for ; Mon, 3 Dec 2018 03:46:12 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4835F20848 for ; Mon, 3 Dec 2018 03:46:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="QREX3Dgi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4835F20848 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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=oqE1JDK+3sAeOCijFVaeuLglDlouM53Tr+ol5Q6gZpY=; b=QREX3Dgi2cnKdV 6oC88j9wrVY2lVp30ykBSwoaa4co9bBawOUD6EZApdL38/ICjanwWFKyyyF+T3DlAXEtdjDBuydAm sa3oFT5QEFFnkTloeIcfFMXlw/uHRnMlm7WvhiKS6OvBlFH1oKLwo+ic1Hs15ffN+QbRAzUitvOrD 7QQQk3oNY5jPAcH11Hx8EPrnXp9H6wMJmmQeyZrnS999Z7hRGzwRaULXwuwrdCeH7b23zs5eulKRm nM2b7vVRuwMIhtqs+5U+q8Q72ANykRGl8Ux2nyj+LgMwkz9mUw/VAJ6TJgomiP65QqkhNkUwcCopx R/xO4srjWodEGySKLumg==; 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 1gTfBS-0004hK-Gb; Mon, 03 Dec 2018 03:46:10 +0000 Received: from szxga05-in.huawei.com ([45.249.212.191] helo=huawei.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gTfBO-0004eL-Ux for linux-arm-kernel@lists.infradead.org; Mon, 03 Dec 2018 03:46:08 +0000 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 5D0C9B90FF95A; Mon, 3 Dec 2018 11:45:42 +0800 (CST) Received: from vm100-107-113-134.huawei.com (100.107.113.134) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.408.0; Mon, 3 Dec 2018 11:45:36 +0800 From: Yu Chen To: , , Subject: [PATCH v1 12/12] dts: hi3660: Add support for usb on Hikey960 Date: Mon, 3 Dec 2018 11:45:15 +0800 Message-ID: <20181203034515.91412-13-chenyu56@huawei.com> X-Mailer: git-send-email 2.15.0-rc2 In-Reply-To: <20181203034515.91412-1-chenyu56@huawei.com> References: <20181203034515.91412-1-chenyu56@huawei.com> MIME-Version: 1.0 X-Originating-IP: [100.107.113.134] X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181202_194607_161057_046D8C96 X-CRM114-Status: GOOD ( 12.42 ) X-BeenThere: linux-arm-kernel@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 , suzhuangluan@hisilicon.com, Binghui Wang , Yu Chen , kongfei@hisilicon.com, Wei Xu , Rob Herring , John Stultz , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org This patch adds support for usb on Hikey960. Cc: Wei Xu Cc: Rob Herring Cc: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org Cc: John Stultz Cc: Binghui Wang Signed-off-by: Yu Chen --- arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 56 ++++++++++++++++++ arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 72 +++++++++++++++++++++++ 2 files changed, 128 insertions(+) diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts index c98bcbc8dfba..066c558154ea 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts +++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts @@ -13,6 +13,7 @@ #include #include #include +#include / { model = "HiKey960"; @@ -196,6 +197,28 @@ method = "smc"; }; }; + + hisi_hikey_usb: hisi_hikey_usb { + compatible = "hisilicon,hikey960_usb"; + typec-vbus-gpios = <&gpio25 2 0>; + typc-vbus-enable-val = <1>; + otg-switch-gpios = <&gpio25 6 0>; + hub-vdd33-en-gpios = <&gpio5 6 0>; + pinctrl-names = "default"; + pinctrl-0 = <&usbhub5734_pmx_func>; + + port { + #address-cells = <1>; + #size-cells = <0>; + + hikey_usb_ep: endpoint@0 { + reg = <0>; + device_type = "usb-role-switch"; + remote-endpoint = <&dwc3_role_switch_notify>; + }; + }; + }; + }; /* @@ -526,6 +549,39 @@ &i2c1 { status = "okay"; + rt1711h: rt1711h@4e { + compatible = "richtek,rt1711h"; + reg = <0x4e>; + status = "ok"; + interrupt-parent = <&gpio27>; + interrupts = <3 IRQ_TYPE_LEVEL_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&usb_cfg_func>; + + usb_con: connector { + compatible = "usb-c-connector"; + label = "USB-C"; + data-role = "dual"; + power-role = "dual"; + try-power-role = "sink"; + source-pdos = ; + sink-pdos = ; + op-sink-microwatt = <10000000>; + }; + + port { + #address-cells = <1>; + #size-cells = <0>; + + rt1711h_ep: endpoint@0 { + reg = <0>; + device_type = "usb-role-switch"; + remote-endpoint = <&dwc3_role_switch>; + }; + }; + }; + adv7533: adv7533@39 { status = "ok"; compatible = "adi,adv7533"; diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi index f432b0a88c65..e6583bd7efdb 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi @@ -349,6 +349,12 @@ #clock-cells = <1>; }; + pmctrl: pmctrl@fff31000 { + compatible = "hisilicon,hi3660-pmctrl", "syscon"; + reg = <0x0 0xfff31000 0x0 0x1000>; + #clock-cells = <1>; + }; + pmuctrl: crg_ctrl@fff34000 { compatible = "hisilicon,hi3660-pmuctrl", "syscon"; reg = <0x0 0xfff34000 0x0 0x1000>; @@ -1122,5 +1128,71 @@ }; }; }; + + usb3_otg_bc: usb3_otg_bc@ff200000 { + compatible = "syscon"; + reg = <0x0 0xff200000 0x0 0x1000>; + }; + + usb_phy: usb-phy { + compatible = "hisilicon,hi3660-usb-phy"; + #phy-cells = <0>; + hisilicon,pericrg-syscon = <&crg_ctrl>; + hisilicon,pctrl-syscon = <&pctrl>; + hisilicon,usb3-otg-bc-syscon = <&usb3_otg_bc>; + hisilicon,eye-diagram-param = <0x22466e4>; + }; + + usb3: hisi_dwc3 { + compatible = "hisilicon,hi3660-dwc3"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + + clocks = <&crg_ctrl HI3660_CLK_ABB_USB>, + <&crg_ctrl HI3660_ACLK_GATE_USB3OTG>; + clock-names = "clk_usb3phy_ref", "aclk_usb3otg"; + + assigned-clocks = <&crg_ctrl HI3660_ACLK_GATE_USB3OTG>; + assigned-clock-rates = <229000000>; + resets = <&crg_rst 0x90 8>, + <&crg_rst 0x90 7>, + <&crg_rst 0x90 6>, + <&crg_rst 0x90 5>; + + dwc3: dwc3@ff100000 { + compatible = "snps,dwc3"; + reg = <0x0 0xff100000 0x0 0x100000>; + interrupts = <0 159 4>, <0 161 4>; + phys = <&usb_phy>; + phy-names = "usb3-phy"; + dr_mode = "otg"; + maximum-speed = "super-speed"; + phy_type = "utmi"; + snps,dis-del-phy-power-chg-quirk; + snps,lfps_filter_quirk; + snps,dis_u2_susphy_quirk; + snps,dis_u3_susphy_quirk; + snps,tx_de_emphasis_quirk; + snps,tx_de_emphasis = <1>; + snps,dis_enblslpm_quirk; + snps,gctl-reset-quirk; + + port { + #address-cells = <1>; + #size-cells = <0>; + + dwc3_role_switch: endpoint@0 { + reg = <0>; + remote-endpoint = <&rt1711h_ep>; + }; + + dwc3_role_switch_notify: endpoint@1 { + reg = <1>; + remote-endpoint = <&hikey_usb_ep>; + }; + }; + }; + }; }; }; -- 2.15.0-rc2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel