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=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 4A2DAC282E2 for ; Sat, 20 Apr 2019 06:40:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 252952087F for ; Sat, 20 Apr 2019 06:40:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728228AbfDTGk5 (ORCPT ); Sat, 20 Apr 2019 02:40:57 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:39642 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727969AbfDTGkx (ORCPT ); Sat, 20 Apr 2019 02:40:53 -0400 Received: from DGGEMS410-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 645FDA245AB5B0B69D3A; Sat, 20 Apr 2019 14:40:44 +0800 (CST) Received: from vm100-107-113-134.huawei.com (100.107.113.134) by DGGEMS410-HUB.china.huawei.com (10.3.19.210) with Microsoft SMTP Server id 14.3.408.0; Sat, 20 Apr 2019 14:40:35 +0800 From: Yu Chen To: , , CC: , , , , , , , , , , , , , , Yu Chen , Chunfeng Yun , Wei Xu , Rob Herring , Mark Rutland , , Binghui Wang Subject: [PATCH v6 13/13] dts: hi3660: Add support for usb on Hikey960 Date: Sat, 20 Apr 2019 14:40:19 +0800 Message-ID: <20190420064019.57522-14-chenyu56@huawei.com> X-Mailer: git-send-email 2.15.0-rc2 In-Reply-To: <20190420064019.57522-1-chenyu56@huawei.com> References: <20190420064019.57522-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: Chunfeng Yun 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 --- v2: * Remove device_type property. * Add property "usb-role-switch". v3: * Make node "usb_phy" a subnode of usb3_otg_bc register. * Remove property "typec-vbus-enable-val" of hisi_hikey_usb. v4: * Remove property "hisilicon,usb3-otg-bc-syscon" of usb-phy. --- --- arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 53 ++++++++++++++++ arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 73 +++++++++++++++++++++++ 2 files changed, 126 insertions(+) diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts index e035cf195b19..d4e11c56b250 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,26 @@ method = "smc"; }; }; + + hisi_hikey_usb: hisi_hikey_usb { + compatible = "hisilicon,hikey960_usb"; + typec-vbus-gpios = <&gpio25 2 GPIO_ACTIVE_HIGH>; + otg-switch-gpios = <&gpio25 6 GPIO_ACTIVE_HIGH>; + hub-vdd33-en-gpios = <&gpio5 6 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&usbhub5734_pmx_func>; + + port { + #address-cells = <1>; + #size-cells = <0>; + + hikey_usb_ep: endpoint@0 { + reg = <0>; + remote-endpoint = <&dwc3_role_switch_notify>; + }; + }; + }; + }; /* @@ -526,6 +547,38 @@ &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>; + 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 2f19e0e5b7cf..173467505ada 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi @@ -355,6 +355,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>; @@ -1134,5 +1140,72 @@ }; }; }; + + usb3_otg_bc: usb3_otg_bc@ff200000 { + compatible = "syscon", "simple-mfd"; + 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,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; + usb-role-switch; + role-switch-default-host; + + 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 v6 13/13] dts: hi3660: Add support for usb on Hikey960 Date: Sat, 20 Apr 2019 14:40:19 +0800 Message-ID: <20190420064019.57522-14-chenyu56@huawei.com> References: <20190420064019.57522-1-chenyu56@huawei.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <20190420064019.57522-1-chenyu56@huawei.com> Sender: linux-kernel-owner@vger.kernel.org To: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: john.stultz@linaro.org, suzhuangluan@hisilicon.com, kongfei@hisilicon.com, liuyu712@hisilicon.com, wanghu17@hisilicon.com, butao@hisilicon.com, chenyao11@huawei.com, fangshengzhou@hisilicon.com, lipengcheng8@huawei.com, songxiaowei@hisilicon.com, xuyiping@hisilicon.com, xuyoujun4@huawei.com, yudongbin@hisilicon.com, zangleigang@hisilicon.com, Yu Chen , Chunfeng Yun , Wei Xu , Rob Herring , Mark Rutland , linux-arm-kernel@lists.infradead.org, Binghui Wang List-Id: devicetree@vger.kernel.org This patch adds support for usb on Hikey960. Cc: Chunfeng Yun 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 --- v2: * Remove device_type property. * Add property "usb-role-switch". v3: * Make node "usb_phy" a subnode of usb3_otg_bc register. * Remove property "typec-vbus-enable-val" of hisi_hikey_usb. v4: * Remove property "hisilicon,usb3-otg-bc-syscon" of usb-phy. --- --- arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 53 ++++++++++++++++ arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 73 +++++++++++++++++++++++ 2 files changed, 126 insertions(+) diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts index e035cf195b19..d4e11c56b250 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,26 @@ method = "smc"; }; }; + + hisi_hikey_usb: hisi_hikey_usb { + compatible = "hisilicon,hikey960_usb"; + typec-vbus-gpios = <&gpio25 2 GPIO_ACTIVE_HIGH>; + otg-switch-gpios = <&gpio25 6 GPIO_ACTIVE_HIGH>; + hub-vdd33-en-gpios = <&gpio5 6 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&usbhub5734_pmx_func>; + + port { + #address-cells = <1>; + #size-cells = <0>; + + hikey_usb_ep: endpoint@0 { + reg = <0>; + remote-endpoint = <&dwc3_role_switch_notify>; + }; + }; + }; + }; /* @@ -526,6 +547,38 @@ &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>; + 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 2f19e0e5b7cf..173467505ada 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi @@ -355,6 +355,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>; @@ -1134,5 +1140,72 @@ }; }; }; + + usb3_otg_bc: usb3_otg_bc@ff200000 { + compatible = "syscon", "simple-mfd"; + 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,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; + usb-role-switch; + role-switch-default-host; + + 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: [v6,13/13] dts: hi3660: Add support for usb on Hikey960 From: Yu Chen Message-Id: <20190420064019.57522-14-chenyu56@huawei.com> Date: Sat, 20 Apr 2019 14:40:19 +0800 To: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: john.stultz@linaro.org, suzhuangluan@hisilicon.com, kongfei@hisilicon.com, liuyu712@hisilicon.com, wanghu17@hisilicon.com, butao@hisilicon.com, chenyao11@huawei.com, fangshengzhou@hisilicon.com, lipengcheng8@huawei.com, songxiaowei@hisilicon.com, xuyiping@hisilicon.com, xuyoujun4@huawei.com, yudongbin@hisilicon.com, zangleigang@hisilicon.com, Yu Chen , Chunfeng Yun , Wei Xu , Rob Herring , Mark Rutland , linux-arm-kernel@lists.infradead.org, Binghui Wang List-ID: VGhpcyBwYXRjaCBhZGRzIHN1cHBvcnQgZm9yIHVzYiBvbiBIaWtleTk2MC4KCkNjOiBDaHVuZmVu ZyBZdW4gPGNodW5mZW5nLnl1bkBtZWRpYXRlay5jb20+CkNjOiBXZWkgWHUgPHh1d2VpNUBoaXNp bGljb24uY29tPgpDYzogUm9iIEhlcnJpbmcgPHJvYmgrZHRAa2VybmVsLm9yZz4KQ2M6IE1hcmsg UnV0bGFuZCA8bWFyay5ydXRsYW5kQGFybS5jb20+CkNjOiBsaW51eC1hcm0ta2VybmVsQGxpc3Rz LmluZnJhZGVhZC5vcmcKQ2M6IEpvaG4gU3R1bHR6IDxqb2huLnN0dWx0ekBsaW5hcm8ub3JnPgpD YzogQmluZ2h1aSBXYW5nIDx3YW5nYmluZ2h1aUBoaXNpbGljb24uY29tPgpTaWduZWQtb2ZmLWJ5 OiBZdSBDaGVuIDxjaGVueXU1NkBodWF3ZWkuY29tPgotLS0KdjI6CiogUmVtb3ZlIGRldmljZV90 eXBlIHByb3BlcnR5LgoqIEFkZCBwcm9wZXJ0eSAidXNiLXJvbGUtc3dpdGNoIi4KdjM6CiogTWFr ZSBub2RlICJ1c2JfcGh5IiBhIHN1Ym5vZGUgb2YgdXNiM19vdGdfYmMgcmVnaXN0ZXIuCiogUmVt b3ZlIHByb3BlcnR5ICJ0eXBlYy12YnVzLWVuYWJsZS12YWwiIG9mIGhpc2lfaGlrZXlfdXNiLgp2 NDoKKiBSZW1vdmUgcHJvcGVydHkgImhpc2lsaWNvbix1c2IzLW90Zy1iYy1zeXNjb24iIG9mIHVz Yi1waHkuCi0tLQotLS0KIGFyY2gvYXJtNjQvYm9vdC9kdHMvaGlzaWxpY29uL2hpMzY2MC1oaWtl eTk2MC5kdHMgfCA1MyArKysrKysrKysrKysrKysrCiBhcmNoL2FybTY0L2Jvb3QvZHRzL2hpc2ls aWNvbi9oaTM2NjAuZHRzaSAgICAgICAgIHwgNzMgKysrKysrKysrKysrKysrKysrKysrKysKIDIg ZmlsZXMgY2hhbmdlZCwgMTI2IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9hcmNoL2FybTY0 L2Jvb3QvZHRzL2hpc2lsaWNvbi9oaTM2NjAtaGlrZXk5NjAuZHRzIGIvYXJjaC9hcm02NC9ib290 L2R0cy9oaXNpbGljb24vaGkzNjYwLWhpa2V5OTYwLmR0cwppbmRleCBlMDM1Y2YxOTViMTkuLmQ0 ZTExYzU2YjI1MCAxMDA2NDQKLS0tIGEvYXJjaC9hcm02NC9ib290L2R0cy9oaXNpbGljb24vaGkz NjYwLWhpa2V5OTYwLmR0cworKysgYi9hcmNoL2FybTY0L2Jvb3QvZHRzL2hpc2lsaWNvbi9oaTM2 NjAtaGlrZXk5NjAuZHRzCkBAIC0xMyw2ICsxMyw3IEBACiAjaW5jbHVkZSA8ZHQtYmluZGluZ3Mv Z3Bpby9ncGlvLmg+CiAjaW5jbHVkZSA8ZHQtYmluZGluZ3MvaW5wdXQvaW5wdXQuaD4KICNpbmNs dWRlIDxkdC1iaW5kaW5ncy9pbnRlcnJ1cHQtY29udHJvbGxlci9pcnEuaD4KKyNpbmNsdWRlIDxk dC1iaW5kaW5ncy91c2IvcGQuaD4KIAogLyB7CiAJbW9kZWwgPSAiSGlLZXk5NjAiOwpAQCAtMTk2 LDYgKzE5NywyNiBAQAogCQkJbWV0aG9kID0gInNtYyI7CiAJCX07CiAJfTsKKworCWhpc2lfaGlr ZXlfdXNiOiBoaXNpX2hpa2V5X3VzYiB7CisJCWNvbXBhdGlibGUgPSAiaGlzaWxpY29uLGhpa2V5 OTYwX3VzYiI7CisJCXR5cGVjLXZidXMtZ3Bpb3MgPSA8JmdwaW8yNSAyIEdQSU9fQUNUSVZFX0hJ R0g+OworCQlvdGctc3dpdGNoLWdwaW9zID0gPCZncGlvMjUgNiBHUElPX0FDVElWRV9ISUdIPjsK KwkJaHViLXZkZDMzLWVuLWdwaW9zID0gPCZncGlvNSA2IEdQSU9fQUNUSVZFX0hJR0g+OworCQlw aW5jdHJsLW5hbWVzID0gImRlZmF1bHQiOworCQlwaW5jdHJsLTAgPSA8JnVzYmh1YjU3MzRfcG14 X2Z1bmM+OworCisJCXBvcnQgeworCQkJI2FkZHJlc3MtY2VsbHMgPSA8MT47CisJCQkjc2l6ZS1j ZWxscyA9IDwwPjsKKworCQkJaGlrZXlfdXNiX2VwOiBlbmRwb2ludEAwIHsKKwkJCQlyZWcgPSA8 MD47CisJCQkJcmVtb3RlLWVuZHBvaW50ID0gPCZkd2MzX3JvbGVfc3dpdGNoX25vdGlmeT47CisJ CQl9OworCQl9OworCX07CisKIH07CiAKIC8qCkBAIC01MjYsNiArNTQ3LDM4IEBACiAmaTJjMSB7 CiAJc3RhdHVzID0gIm9rYXkiOwogCisJcnQxNzExaDogcnQxNzExaEA0ZSB7CisJCWNvbXBhdGli bGUgPSAicmljaHRlayxydDE3MTFoIjsKKwkJcmVnID0gPDB4NGU+OworCQlzdGF0dXMgPSAib2si OworCQlpbnRlcnJ1cHQtcGFyZW50ID0gPCZncGlvMjc+OworCQlpbnRlcnJ1cHRzID0gPDMgSVJR X1RZUEVfTEVWRUxfTE9XPjsKKwkJcGluY3RybC1uYW1lcyA9ICJkZWZhdWx0IjsKKwkJcGluY3Ry bC0wID0gPCZ1c2JfY2ZnX2Z1bmM+OworCisJCXVzYl9jb246IGNvbm5lY3RvciB7CisJCQljb21w YXRpYmxlID0gInVzYi1jLWNvbm5lY3RvciI7CisJCQlsYWJlbCA9ICJVU0ItQyI7CisJCQlkYXRh LXJvbGUgPSAiZHVhbCI7CisJCQlwb3dlci1yb2xlID0gImR1YWwiOworCQkJdHJ5LXBvd2VyLXJv bGUgPSAic2luayI7CisJCQlzb3VyY2UtcGRvcyA9IDxQRE9fRklYRUQoNTAwMCwgNTAwLCBQRE9f RklYRURfVVNCX0NPTU0pPjsKKwkJCXNpbmstcGRvcyA9IDxQRE9fRklYRUQoNTAwMCwgNTAwLCBQ RE9fRklYRURfVVNCX0NPTU0pCisJCQkJUERPX1ZBUig1MDAwLCA1MDAwLCAxMDAwKT47CisJCQlv cC1zaW5rLW1pY3Jvd2F0dCA9IDwxMDAwMDAwMD47CisJCX07CisKKwkJcG9ydCB7CisJCQkjYWRk cmVzcy1jZWxscyA9IDwxPjsKKwkJCSNzaXplLWNlbGxzID0gPDA+OworCisJCQlydDE3MTFoX2Vw OiBlbmRwb2ludEAwIHsKKwkJCQlyZWcgPSA8MD47CisJCQkJcmVtb3RlLWVuZHBvaW50ID0gPCZk d2MzX3JvbGVfc3dpdGNoPjsKKwkJCX07CisJCX07CisJfTsKKwogCWFkdjc1MzM6IGFkdjc1MzNA MzkgewogCQlzdGF0dXMgPSAib2siOwogCQljb21wYXRpYmxlID0gImFkaSxhZHY3NTMzIjsKZGlm ZiAtLWdpdCBhL2FyY2gvYXJtNjQvYm9vdC9kdHMvaGlzaWxpY29uL2hpMzY2MC5kdHNpIGIvYXJj aC9hcm02NC9ib290L2R0cy9oaXNpbGljb24vaGkzNjYwLmR0c2kKaW5kZXggMmYxOWUwZTViN2Nm Li4xNzM0Njc1MDVhZGEgMTAwNjQ0Ci0tLSBhL2FyY2gvYXJtNjQvYm9vdC9kdHMvaGlzaWxpY29u L2hpMzY2MC5kdHNpCisrKyBiL2FyY2gvYXJtNjQvYm9vdC9kdHMvaGlzaWxpY29uL2hpMzY2MC5k dHNpCkBAIC0zNTUsNiArMzU1LDEyIEBACiAJCQkjY2xvY2stY2VsbHMgPSA8MT47CiAJCX07CiAK KwkJcG1jdHJsOiBwbWN0cmxAZmZmMzEwMDAgeworCQkJY29tcGF0aWJsZSA9ICJoaXNpbGljb24s aGkzNjYwLXBtY3RybCIsICJzeXNjb24iOworCQkJcmVnID0gPDB4MCAweGZmZjMxMDAwIDB4MCAw eDEwMDA+OworCQkJI2Nsb2NrLWNlbGxzID0gPDE+OworCQl9OworCiAJCXBtdWN0cmw6IGNyZ19j dHJsQGZmZjM0MDAwIHsKIAkJCWNvbXBhdGlibGUgPSAiaGlzaWxpY29uLGhpMzY2MC1wbXVjdHJs IiwgInN5c2NvbiI7CiAJCQlyZWcgPSA8MHgwIDB4ZmZmMzQwMDAgMHgwIDB4MTAwMD47CkBAIC0x MTM0LDUgKzExNDAsNzIgQEAKIAkJCQl9OwogCQkJfTsKIAkJfTsKKworCQl1c2IzX290Z19iYzog dXNiM19vdGdfYmNAZmYyMDAwMDAgeworCQkJY29tcGF0aWJsZSA9ICJzeXNjb24iLCAic2ltcGxl LW1mZCI7CisJCQlyZWcgPSA8MHgwIDB4ZmYyMDAwMDAgMHgwIDB4MTAwMD47CisKKwkJCXVzYl9w aHk6IHVzYi1waHkgeworCQkJCWNvbXBhdGlibGUgPSAiaGlzaWxpY29uLGhpMzY2MC11c2ItcGh5 IjsKKwkJCQkjcGh5LWNlbGxzID0gPDA+OworCQkJCWhpc2lsaWNvbixwZXJpY3JnLXN5c2NvbiA9 IDwmY3JnX2N0cmw+OworCQkJCWhpc2lsaWNvbixwY3RybC1zeXNjb24gPSA8JnBjdHJsPjsKKwkJ CQloaXNpbGljb24sZXllLWRpYWdyYW0tcGFyYW0gPSA8MHgyMjQ2NmU0PjsKKwkJCX07CisJCX07 CisKKwkJdXNiMzogaGlzaV9kd2MzIHsKKwkJCWNvbXBhdGlibGUgPSAiaGlzaWxpY29uLGhpMzY2 MC1kd2MzIjsKKwkJCSNhZGRyZXNzLWNlbGxzID0gPDI+OworCQkJI3NpemUtY2VsbHMgPSA8Mj47 CisJCQlyYW5nZXM7CisKKwkJCWNsb2NrcyA9IDwmY3JnX2N0cmwgSEkzNjYwX0NMS19BQkJfVVNC PiwKKwkJCQkgPCZjcmdfY3RybCBISTM2NjBfQUNMS19HQVRFX1VTQjNPVEc+OworCQkJY2xvY2st bmFtZXMgPSAiY2xrX3VzYjNwaHlfcmVmIiwgImFjbGtfdXNiM290ZyI7CisKKwkJCWFzc2lnbmVk LWNsb2NrcyA9IDwmY3JnX2N0cmwgSEkzNjYwX0FDTEtfR0FURV9VU0IzT1RHPjsKKwkJCWFzc2ln bmVkLWNsb2NrLXJhdGVzID0gPDIyOTAwMDAwMD47CisJCQlyZXNldHMgPSA8JmNyZ19yc3QgMHg5 MCA4PiwKKwkJCQkgPCZjcmdfcnN0IDB4OTAgNz4sCisJCQkJIDwmY3JnX3JzdCAweDkwIDY+LAor CQkJCSA8JmNyZ19yc3QgMHg5MCA1PjsKKworCQkJZHdjMzogZHdjM0BmZjEwMDAwMCB7CisJCQkJ Y29tcGF0aWJsZSA9ICJzbnBzLGR3YzMiOworCQkJCXJlZyA9IDwweDAgMHhmZjEwMDAwMCAweDAg MHgxMDAwMDA+OworCQkJCWludGVycnVwdHMgPSA8MCAxNTkgND4sIDwwIDE2MSA0PjsKKwkJCQlw aHlzID0gPCZ1c2JfcGh5PjsKKwkJCQlwaHktbmFtZXMgPSAidXNiMy1waHkiOworCQkJCWRyX21v ZGUgPSAib3RnIjsKKwkJCQltYXhpbXVtLXNwZWVkID0gInN1cGVyLXNwZWVkIjsKKwkJCQlwaHlf dHlwZSA9ICJ1dG1pIjsKKwkJCQlzbnBzLGRpcy1kZWwtcGh5LXBvd2VyLWNoZy1xdWlyazsKKwkJ CQlzbnBzLGxmcHNfZmlsdGVyX3F1aXJrOworCQkJCXNucHMsZGlzX3UyX3N1c3BoeV9xdWlyazsK KwkJCQlzbnBzLGRpc191M19zdXNwaHlfcXVpcms7CisJCQkJc25wcyx0eF9kZV9lbXBoYXNpc19x dWlyazsKKwkJCQlzbnBzLHR4X2RlX2VtcGhhc2lzID0gPDE+OworCQkJCXNucHMsZGlzX2VuYmxz bHBtX3F1aXJrOworCQkJCXNucHMsZ2N0bC1yZXNldC1xdWlyazsKKwkJCQl1c2Itcm9sZS1zd2l0 Y2g7CisJCQkJcm9sZS1zd2l0Y2gtZGVmYXVsdC1ob3N0OworCisJCQkJcG9ydCB7CisJCQkJCSNh ZGRyZXNzLWNlbGxzID0gPDE+OworCQkJCQkjc2l6ZS1jZWxscyA9IDwwPjsKKworCQkJCQlkd2Mz X3JvbGVfc3dpdGNoOiBlbmRwb2ludEAwIHsKKwkJCQkJCXJlZyA9IDwwPjsKKwkJCQkJCXJlbW90 ZS1lbmRwb2ludCA9IDwmcnQxNzExaF9lcD47CisJCQkJCX07CisKKwkJCQkJZHdjM19yb2xlX3N3 aXRjaF9ub3RpZnk6IGVuZHBvaW50QDEgeworCQkJCQkJcmVnID0gPDE+OworCQkJCQkJcmVtb3Rl LWVuZHBvaW50ID0gPCZoaWtleV91c2JfZXA+OworCQkJCQl9OworCQkJCX07CisJCQl9OworCQl9 OwogCX07CiB9Owo= 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.1 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=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 19CDCC282E3 for ; Sat, 20 Apr 2019 06:41:15 +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 DC6D021871 for ; Sat, 20 Apr 2019 06:41:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="G6hPCV8K" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DC6D021871 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=9m8J8j7WfwdPKkx2GmmjLBvmSIE1sqXNqvPRtjuLOPg=; b=G6hPCV8KSWx6+w YR/Wtjlhm1dxnJy8SwLQVn5ptp7KsnTYj66krt93gGjv56FrOzKbT54yRCfJk+dLYiP3eVhaIrmcQ vZd5yq+CwL/XfFlgqc2Y77RIGY/iFt1YmJGpSWSu9tBSo4bfWdf6wld4hHAJVR9YuMbdfP1tO2KDq yW8MrWSt2ynxU+8nBWUBeMLUcpSC+izSKQ0xBGv0oBsiICEndXw5lMsaSPVvGd5Er/gdaVUF/noyv QvObvNPro3arv5Wc1bx+dgovE3w7n6GoFaPwHL7O8NLC54S/11UYLrsUo4O/71FGA0FrgYE1e7N0i /vEHy7eJWY0MVtdS+8Gg==; 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 1hHjgM-00047B-PU; Sat, 20 Apr 2019 06:41:02 +0000 Received: from szxga06-in.huawei.com ([45.249.212.32] helo=huawei.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hHjgH-00043v-NL for linux-arm-kernel@lists.infradead.org; Sat, 20 Apr 2019 06:41:00 +0000 Received: from DGGEMS410-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 645FDA245AB5B0B69D3A; Sat, 20 Apr 2019 14:40:44 +0800 (CST) Received: from vm100-107-113-134.huawei.com (100.107.113.134) by DGGEMS410-HUB.china.huawei.com (10.3.19.210) with Microsoft SMTP Server id 14.3.408.0; Sat, 20 Apr 2019 14:40:35 +0800 From: Yu Chen To: , , Subject: [PATCH v6 13/13] dts: hi3660: Add support for usb on Hikey960 Date: Sat, 20 Apr 2019 14:40:19 +0800 Message-ID: <20190420064019.57522-14-chenyu56@huawei.com> X-Mailer: git-send-email 2.15.0-rc2 In-Reply-To: <20190420064019.57522-1-chenyu56@huawei.com> References: <20190420064019.57522-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-20190419_234057_943785_03074BD5 X-CRM114-Status: GOOD ( 11.74 ) 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 , yudongbin@hisilicon.com, Binghui Wang , xuyiping@hisilicon.com, xuyoujun4@huawei.com, suzhuangluan@hisilicon.com, songxiaowei@hisilicon.com, Yu Chen , kongfei@hisilicon.com, Wei Xu , fangshengzhou@hisilicon.com, lipengcheng8@huawei.com, Rob Herring , john.stultz@linaro.org, wanghu17@hisilicon.com, Chunfeng Yun , zangleigang@hisilicon.com, chenyao11@huawei.com, liuyu712@hisilicon.com, linux-arm-kernel@lists.infradead.org, butao@hisilicon.com 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: Chunfeng Yun 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 --- v2: * Remove device_type property. * Add property "usb-role-switch". v3: * Make node "usb_phy" a subnode of usb3_otg_bc register. * Remove property "typec-vbus-enable-val" of hisi_hikey_usb. v4: * Remove property "hisilicon,usb3-otg-bc-syscon" of usb-phy. --- --- arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 53 ++++++++++++++++ arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 73 +++++++++++++++++++++++ 2 files changed, 126 insertions(+) diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts index e035cf195b19..d4e11c56b250 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,26 @@ method = "smc"; }; }; + + hisi_hikey_usb: hisi_hikey_usb { + compatible = "hisilicon,hikey960_usb"; + typec-vbus-gpios = <&gpio25 2 GPIO_ACTIVE_HIGH>; + otg-switch-gpios = <&gpio25 6 GPIO_ACTIVE_HIGH>; + hub-vdd33-en-gpios = <&gpio5 6 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&usbhub5734_pmx_func>; + + port { + #address-cells = <1>; + #size-cells = <0>; + + hikey_usb_ep: endpoint@0 { + reg = <0>; + remote-endpoint = <&dwc3_role_switch_notify>; + }; + }; + }; + }; /* @@ -526,6 +547,38 @@ &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>; + 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 2f19e0e5b7cf..173467505ada 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi @@ -355,6 +355,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>; @@ -1134,5 +1140,72 @@ }; }; }; + + usb3_otg_bc: usb3_otg_bc@ff200000 { + compatible = "syscon", "simple-mfd"; + 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,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; + usb-role-switch; + role-switch-default-host; + + 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