Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp445117pxb; Thu, 9 Sep 2021 04:45:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKpzWZCM4ZRrr7teFah3tFtcub6bWanPwI2eIkCYSfwEq60iOfpnLk6p8bM7ax7J9ZiWUV X-Received: by 2002:a05:6638:339b:: with SMTP id h27mr2474502jav.118.1631187956747; Thu, 09 Sep 2021 04:45:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631187956; cv=none; d=google.com; s=arc-20160816; b=uPpURFyaAx2zTEV3C6XIVmt2WelfBfo0+Ex+54vZee3jCLnpdMSGk/TVRBr5jFtqKI rp8nU0uiE9ruGBqrd34xMOH0YCmRnQFPLihDl7O6mtHn6WhcQ9YQMcG84zkA3Ac63QnB uKV3X2WfDvDXEM7ii5XMh20dOdxVOb0OnK7lRY78Yy75ohAoA/eZduMlTVNLrGV0NQxl +0TMbiiI+fdkn0pkw/5H7fzVc8R7vlb+fQAeKHTYyZDAGaTIh0Pz12R8klSf7LkDexqY 2hUW7miLc+pAoP/Whppe3IhTnLN6uZyIXNV/oRVve7PHh9UXw94+3X07Jxu7NGh96TWl 0Ywg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6koJpOS6y3PRgPXUWdOXSpD/PU9CBJf93KQ00Hgo9Ys=; b=FSa4TWooIALr4VdO/Yz76twZyqhITNmTLUti1HiOLtrElzaP1i87HeWUN7kAWs9V03 4QIIMr+MDmq3dAvr9IBRrOvpMOViIYYXrU6fB/8FtxUPasQYoWfcxbTmXzU664Neady/ QrZgHDanzHBVRDxbY29tfnpG+njI1UZNJucx1RXK5PTVSQ50l7mQLrz4OLn9mXio63/m z66g+4rwwA7M055BhZ7IxlSmu6uGKSBNltFHvqw9Ecrk646cMREm39eN10EJ02od+5/S yidN3l8hNIStIso/ZrWDvFx0L5EhQ8unZjGyH13i9Q8QS/QEAr/8FXdD5T44Ujk7wFsr zpdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=IGqH3lC5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c9si1583091ili.44.2021.09.09.04.45.45; Thu, 09 Sep 2021 04:45:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=IGqH3lC5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239966AbhIILo0 (ORCPT + 99 others); Thu, 9 Sep 2021 07:44:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:45698 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237334AbhIILm6 (ORCPT ); Thu, 9 Sep 2021 07:42:58 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7F8F5611CC; Thu, 9 Sep 2021 11:41:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631187707; bh=Fl89BLpZqkI7d42dfLouRxVDKhNQxznxdmuRukWnMdk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IGqH3lC5Psm9d16Pp5nb6XEg3mcgcysOU/Jq12qRNMNgbJFcne7Md7UF82AKho4dq hDdCgXksrAVyBqCyc55l8PShf/mP0+4LyMAd3MhYAsMjzfvTWdREOytA828Cott3NA E0lfnkkTk/RGIHKH6o3CBMklFaq86TIfuoDtYZhgQPQ9USNA44XdA6Y+JW/ElsYWqM ZUbQ07eyKUx9f6HyvCQKfmoDoCkcoV/5bMlUeQCDXaBMFH2NVUcP20XdDjVNhh+d14 2AotBcjJHuAc8CNed3/T0CU8iFlCPchp+2Y0q7Wv15nrvbPjgb4JdbnEn9JrTb9HkX kZwGuV7aqf+Iw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Bhupesh Sharma , Bjorn Andersson , Sasha Levin , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH AUTOSEL 5.14 031/252] arm64: dts: qcom: Fix usb entries for SA8155p adp board Date: Thu, 9 Sep 2021 07:37:25 -0400 Message-Id: <20210909114106.141462-31-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909114106.141462-1-sashal@kernel.org> References: <20210909114106.141462-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bhupesh Sharma [ Upstream commit 12dd4ebda47abd5e3907da386b6fe1d8181ad179 ] SA8155p adp board has two USB A-type receptacles called USB-portB and USB-portC respectively. While USB-portB is a USB High-Speed connector/interface, the USB-portC one is a USB 3.1 Super-Speed connector/interface. Also the USB-portB is used as the USB emergency download port (for image download purposes). Enable both the ports on the board in USB Host mode (since all the USB interfaces are brought out to USB Type A connectors). Cc: Bjorn Andersson Signed-off-by: Bhupesh Sharma Link: https://lore.kernel.org/r/20210627114616.717101-4-bhupesh.sharma@linaro.org Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 60 ++++++++++++++++++++---- 1 file changed, 51 insertions(+), 9 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sa8155p-adp.dts b/arch/arm64/boot/dts/qcom/sa8155p-adp.dts index 0da7a3b8d1bf..5ae2ddc65f7e 100644 --- a/arch/arm64/boot/dts/qcom/sa8155p-adp.dts +++ b/arch/arm64/boot/dts/qcom/sa8155p-adp.dts @@ -307,10 +307,6 @@ &qupv3_id_1 { status = "okay"; }; -&tlmm { - gpio-reserved-ranges = <0 4>; -}; - &uart2 { status = "okay"; }; @@ -337,6 +333,16 @@ &ufs_mem_phy { vdda-pll-max-microamp = <18300>; }; +&usb_1 { + status = "okay"; +}; + +&usb_1_dwc3 { + dr_mode = "host"; + + pinctrl-names = "default"; + pinctrl-0 = <&usb2phy_ac_en1_default>; +}; &usb_1_hsphy { status = "okay"; @@ -346,15 +352,51 @@ &usb_1_hsphy { }; &usb_1_qmpphy { + status = "disabled"; +}; + +&usb_2 { status = "okay"; - vdda-phy-supply = <&vreg_l8c_1p2>; - vdda-pll-supply = <&vdda_usb_ss_dp_core_1>; }; -&usb_1 { +&usb_2_dwc3 { + dr_mode = "host"; + + pinctrl-names = "default"; + pinctrl-0 = <&usb2phy_ac_en2_default>; +}; + +&usb_2_hsphy { status = "okay"; + vdda-pll-supply = <&vdd_usb_hs_core>; + vdda33-supply = <&vdda_usb_hs_3p1>; + vdda18-supply = <&vdda_usb_hs_1p8>; }; -&usb_1_dwc3 { - dr_mode = "peripheral"; +&usb_2_qmpphy { + status = "okay"; + vdda-phy-supply = <&vreg_l8c_1p2>; + vdda-pll-supply = <&vdda_usb_ss_dp_core_1>; +}; + +&tlmm { + gpio-reserved-ranges = <0 4>; + + usb2phy_ac_en1_default: usb2phy_ac_en1_default { + mux { + pins = "gpio113"; + function = "usb2phy_ac"; + bias-disable; + drive-strength = <2>; + }; + }; + + usb2phy_ac_en2_default: usb2phy_ac_en2_default { + mux { + pins = "gpio123"; + function = "usb2phy_ac"; + bias-disable; + drive-strength = <2>; + }; + }; }; -- 2.30.2