From patchwork Wed Jul 12 01:02:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 107429 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp173467qge; Tue, 11 Jul 2017 18:03:18 -0700 (PDT) X-Received: by 10.84.128.76 with SMTP id 70mr1282989pla.229.1499821398423; Tue, 11 Jul 2017 18:03:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499821398; cv=none; d=google.com; s=arc-20160816; b=GXE+vBqI2Cpxdh7KXMewTEa47lBdhgyRoTPc6l+Ejpqbmd8/hvM3osXgO6ZXPa2wdN qFte01+fOL0UjYkol72ie9j2FWgHrP0akTVXOnq8XqPlyawLLYhtGOEncZxAzv4HqYGW ++w1dNX2msKkdnq9YP0PbSc1eOXFxgtz8jMPpCO+c005xe6ZIjc8L6jWZ1PjxO2aM/VZ A/dbApW9aIb0CpZc51Njcm1XGs2KbRszzmFL6sO2XKuj/FF0Kc9bDjvjxcK1UBc/rMj/ CzjNF+gULvV8ap+0mp1HiFb9J8iUe/4HivpB121TaCvZJqCKfrZWZM3Q7SuJHOVJy23h 5oPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=mrEbsSIuetZ3NWb/M+S0M/RpcZoAi1+TBzYDPo+BI0Y=; b=N7ejaeGQZilq8xacrm1gwua0hfFSk+U263ORWN7yYdp2O6qpSe2Kg12BmDJm9vWJdO K1P6ddSFhE4JAoy/PsxbxIDFXwWPINksIRSx4tweq013zgNHIYfYkykjUk47qz+CO5rb 6d3JG8kVI1lsYWp7gPFRKBll7+DngyAO/bYCizxtFT225CiWStkFD4Q79Q/MMh0z7CWN G530Qfe4MjY7xF+z9ULG7rFLMJYQ/28+TNS2spRtSllj/CkIbl0e7BsKVxOnOmdfeObv laKvEtwkcCMuffbwH9RiF71BLjfjZe5ViOp9Vo1vc+7MB/QQcW66Ld0tti8qLrfUzxCS g87w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=RQhCWjLH; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 66si664805pgc.392.2017.07.11.18.03.18; Tue, 11 Jul 2017 18:03:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.b=RQhCWjLH; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932821AbdGLBDH (ORCPT + 25 others); Tue, 11 Jul 2017 21:03:07 -0400 Received: from mail-pf0-f181.google.com ([209.85.192.181]:34960 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756377AbdGLBDC (ORCPT ); Tue, 11 Jul 2017 21:03:02 -0400 Received: by mail-pf0-f181.google.com with SMTP id c73so4291150pfk.2 for ; Tue, 11 Jul 2017 18:03:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mrEbsSIuetZ3NWb/M+S0M/RpcZoAi1+TBzYDPo+BI0Y=; b=RQhCWjLHuiMgQMjWQNXLKv/PKjsrN2o5DWVH+CQvB/XhLWbqdcxz0Fu26PHy63hct+ jhr3P+IMy657gorqM5xwHmCMEL+nOV7zxl9p2qRxFjNRVIQ6LI8Buy99vZjhoPHOWYWU AkGP1IiFdmdG2enMRTUl8FSfT3UYPRcRt4/JM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mrEbsSIuetZ3NWb/M+S0M/RpcZoAi1+TBzYDPo+BI0Y=; b=Qrvw5qjoMW2NEVjo/WDvefwDd1AaaMGumWmQVi1pb7tbdB73XmPB4ofbAj3Jjc5kcX a4/SXvlGNGjykpZIx2qSIMBhfbSf9gMJ2Nep7qNUUBf2QqDMK4184PotMGIgO9NWcvWM kPbJekYR28ljoXiqutjOJI/1ZVXm0dUoCV6SqKCCdSDS9Bfl99EpTNvS8itNrLECdNqZ iHCNk0URjo7vapfHaNLvZHcMXNhzZ0eI/+iTpitoajMo64naPYLKYy+TgiE7XS3/YYin Um/dvTtpX4fi0lFTJIro3JNIwXZwDrvbkQvzhi7WlHbEu9PDynu5nsk4HlMoIt4WFQX0 EqWw== X-Gm-Message-State: AIVw1103x7vWcGS0t2xJv5BPy7z3x3DFnnFkLcz6P9eNp1AWnbnW80X8 ijVFqKRHzoTAJLUA X-Received: by 10.101.83.138 with SMTP id x10mr1180463pgq.201.1499821382159; Tue, 11 Jul 2017 18:03:02 -0700 (PDT) Received: from localhost.localdomain (i-global254.qualcomm.com. [199.106.103.254]) by smtp.gmail.com with ESMTPSA id o8sm839571pgn.52.2017.07.11.18.03.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 11 Jul 2017 18:03:01 -0700 (PDT) From: Stephen Boyd To: Andy Gross Cc: linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Rob Herring , Rob Clark , Peter Chen , Peter Rosin Subject: [PATCH 3/3] arm64: dts: qcom: Collapse usb support into one node Date: Tue, 11 Jul 2017 18:02:55 -0700 Message-Id: <20170712010255.26855-4-stephen.boyd@linaro.org> X-Mailer: git-send-email 2.10.0.297.gf6727b0 In-Reply-To: <20170712010255.26855-1-stephen.boyd@linaro.org> References: <20170712010255.26855-1-stephen.boyd@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We currently have three device nodes for the same USB hardware block, as evident by the reuse of the same reg address multiple times. Now that the chipidea driver fully supports OTG with the MSM wrapper we can collapse all these nodes into one USB device node, reflecting the true nature of the hardware. Signed-off-by: Stephen Boyd --- Should go through arm-soc via Andy. arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 39 ++++++++++--------- arch/arm64/boot/dts/qcom/msm8916.dtsi | 62 +++++++++++++++---------------- 2 files changed, 51 insertions(+), 50 deletions(-) -- 2.10.0.297.gf6727b0 diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi index f326f4fb4d72..dc950a054d0a 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi @@ -213,24 +213,21 @@ }; usb@78d9000 { - extcon = <&usb_id>, <&usb_id>; + extcon = <&usb_id>; status = "okay"; - }; - - ehci@78d9000 { - status = "okay"; - }; - - phy@78d9000 { - v1p8-supply = <&pm8916_l7>; - v3p3-supply = <&pm8916_l13>; - vddcx-supply = <&pm8916_s1>; - extcon = <&usb_id>, <&usb_id>; - dr_mode = "otg"; - status = "okay"; - switch-gpio = <&pm8916_gpios 4 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&usb_sw_sel_pm>; + adp-disable; + hnp-disable; + srp-disable; + mux-controls = <&usb_switch>; + mux-control-names = "usb_switch"; + usb-switch-states = <0>, <1>; + + ulpi { + phy { + v1p8-supply = <&pm8916_l7>; + v3p3-supply = <&pm8916_l13>; + }; + }; }; lpass@07708000 { @@ -348,6 +345,14 @@ pinctrl-0 = <&usb_id_default>; }; + usb_switch: usb-switch { + compatible = "toshiba,tc7usb40mu"; + mux-gpios = <&pm8916_gpios 4 GPIO_ACTIVE_HIGH>; + #mux-control-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&usb_sw_sel_pm>; + }; + hdmi-out { compatible = "hdmi-connector"; type = "a"; diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index 17691abea608..039991f80831 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -546,44 +546,40 @@ status = "disabled"; }; - usb_dev: usb@78d9000 { + otg: usb@78d9000 { compatible = "qcom,ci-hdrc"; - reg = <0x78d9000 0x400>; - dr_mode = "peripheral"; - interrupts = ; - usb-phy = <&usb_otg>; - status = "disabled"; - }; - - usb_host: ehci@78d9000 { - compatible = "qcom,ehci-host"; - reg = <0x78d9000 0x400>; - interrupts = ; - usb-phy = <&usb_otg>; - status = "disabled"; - }; - - usb_otg: phy@78d9000 { - compatible = "qcom,usb-otg-snps"; - reg = <0x78d9000 0x400>; + reg = <0x78d9000 0x200>, + <0x78d9200 0x200>; interrupts = , ; - - qcom,vdd-levels = <500000 1000000 1320000>; - qcom,phy-init-sequence = <0x44 0x6B 0x24 0x13>; - dr_mode = "peripheral"; - qcom,otg-control = <2>; // PMIC - qcom,manual-pullup; - clocks = <&gcc GCC_USB_HS_AHB_CLK>, - <&gcc GCC_USB_HS_SYSTEM_CLK>, - <&gcc GCC_USB2A_PHY_SLEEP_CLK>; - clock-names = "iface", "core", "sleep"; - - resets = <&gcc GCC_USB2A_PHY_BCR>, - <&gcc GCC_USB_HS_BCR>; - reset-names = "phy", "link"; + <&gcc GCC_USB_HS_SYSTEM_CLK>; + clock-names = "iface", "core"; + assigned-clocks = <&gcc GCC_USB_HS_SYSTEM_CLK>; + assigned-clock-rates = <80000000>; + resets = <&gcc GCC_USB_HS_BCR>; + reset-names = "core"; + phy_type = "ulpi"; + dr_mode = "otg"; + ahb-burst-config = <0>; + phy-names = "usb-phy"; + phys = <&usb_hs_phy>; status = "disabled"; + #reset-cells = <1>; + + ulpi { + usb_hs_phy: phy { + compatible = "qcom,usb-hs-phy-msm8916", + "qcom,usb-hs-phy"; + #phy-cells = <0>; + clocks = <&xo_board>, <&gcc GCC_USB2A_PHY_SLEEP_CLK>; + clock-names = "ref", "sleep"; + resets = <&gcc GCC_USB2A_PHY_BCR>, <&otg 0>; + reset-names = "phy", "por"; + qcom,init-seq = /bits/ 8 <0x0 0x44 + 0x1 0x6b 0x2 0x24 0x3 0x13>; + }; + }; }; intc: interrupt-controller@b000000 {