From patchwork Mon Oct 22 20:51:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evan Green X-Patchwork-Id: 10652543 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8A64313BF for ; Mon, 22 Oct 2018 20:52:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D61F62900F for ; Mon, 22 Oct 2018 20:52:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C7CDF29038; Mon, 22 Oct 2018 20:52:06 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F9652900F for ; Mon, 22 Oct 2018 20:52:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729218AbeJWFML (ORCPT ); Tue, 23 Oct 2018 01:12:11 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:34419 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729213AbeJWFML (ORCPT ); Tue, 23 Oct 2018 01:12:11 -0400 Received: by mail-pg1-f193.google.com with SMTP id g12-v6so19576514pgs.1 for ; Mon, 22 Oct 2018 13:52:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Za6AXbZULknJhEO7JV3z0QWbK51r0hvShkOrvCcc+ok=; b=V751cXiuYFv2t8pk2LUxgcEtPk3oP+oRnpDjz6ba3tcKFbqN1Pw7aB5BFmN1fNMVrO v8MTvQdiihocoEjsCFQvnVo07iKuvZ2pw3gzGQ6NnAgDkiKZdYAt8chX5+uA9zQVIpPk Q8sVN2rBa3S3zyexmeJvjVk4AdAIXFjmhz5VE= 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=Za6AXbZULknJhEO7JV3z0QWbK51r0hvShkOrvCcc+ok=; b=ZWh9ooMQGRkQBcC1T/biBOvhYojk3Ems3cJviUgVKP/ZE2MsAr8xnv5eS3WAjhE4UG p14dYaD1zRk6T5YxSGKJJ2MUy4WEazbA4/xro/d76jC+xWZbxtuGERzFymjS6ckPPL+R iT9qt0GK7ZHCcqOUON2aBut77xXWE8ubJGWh5TWGQDYZncXOWwZq7O/pSy5+aiFodxpI X1ZmDLoVG44gWJyhBH8gNH99AHbiyP/rFBjPa0TEzeks3Br3XU6D1M37lnn/knzTyzgE FkbVISvIE38qU1LCXT1oE0UtvmR3GA2cOo5eWqFH5YtwP1qsLHJefXiosp9N0oImJ2Ks 2dYQ== X-Gm-Message-State: ABuFfoj0qNpP/lNzg590W5W20AJplW9X1ALUP4lfPi1G3eZ1Rsbd5WRv wd4u2pxKIEWuNOElhWG/GnePNA== X-Google-Smtp-Source: ACcGV60peR0nlouhfZ/61FrKZJlic0cFT8eiKuNuQolx8DCAcNLCI0xZ1FhSCeM97GV07dRMyMgTDg== X-Received: by 2002:a62:48ce:: with SMTP id q75-v6mr47897474pfi.22.1540241524833; Mon, 22 Oct 2018 13:52:04 -0700 (PDT) Received: from evgreen2.mtv.corp.google.com ([2620:15c:202:201:e418:c825:76cf:5f64]) by smtp.gmail.com with ESMTPSA id a11-v6sm37216041pfn.66.2018.10.22.13.52.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 Oct 2018 13:52:03 -0700 (PDT) From: Evan Green To: Rob Herring , Andy Gross , Kishon Vijay Abraham I Cc: Douglas Anderson , Stephen Boyd , Evan Green , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring , David Brown , Mark Rutland , linux-soc@vger.kernel.org Subject: [PATCH v3 3/5] arm64: dts: qcom: sdm845: add UFS controller Date: Mon, 22 Oct 2018 13:51:00 -0700 Message-Id: <20181022205102.74825-4-evgreen@chromium.org> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20181022205102.74825-1-evgreen@chromium.org> References: <20181022205102.74825-1-evgreen@chromium.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add the UFS controller and PHY to SDM845. Signed-off-by: Evan Green Signed-off-by: Douglas Anderson --- As Doug mentioned in v2, this should land after (or with) the driver fix in this series. Changes in v3: None Changes in v2: - Renamed ufsphy to phy (Vivek) - Removed #clock-cells (Vivek) arch/arm64/boot/dts/qcom/sdm845.dtsi | 67 ++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index b72bdb0a31a5..9c72edb678ec 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -808,6 +808,73 @@ }; }; + ufshc1: ufshc@1d84000 { + compatible = "qcom,sdm845-ufshc", "qcom,ufshc", + "jedec,ufs-2.0"; + reg = <0x1d84000 0x2500>; + interrupts = ; + phys = <&ufsphy1_lanes>; + phy-names = "ufsphy"; + lanes-per-direction = <2>; + power-domains = <&gcc UFS_PHY_GDSC>; + + clock-names = + "core_clk", + "bus_aggr_clk", + "iface_clk", + "core_clk_unipro", + "ref_clk", + "tx_lane0_sync_clk", + "rx_lane0_sync_clk", + "rx_lane1_sync_clk"; + clocks = + <&gcc GCC_UFS_PHY_AXI_CLK>, + <&gcc GCC_AGGRE_UFS_PHY_AXI_CLK>, + <&gcc GCC_UFS_PHY_AHB_CLK>, + <&gcc GCC_UFS_PHY_UNIPRO_CORE_CLK>, + <&rpmhcc RPMH_CXO_CLK>, + <&gcc GCC_UFS_PHY_TX_SYMBOL_0_CLK>, + <&gcc GCC_UFS_PHY_RX_SYMBOL_0_CLK>, + <&gcc GCC_UFS_PHY_RX_SYMBOL_1_CLK>; + freq-table-hz = + <50000000 200000000>, + <0 0>, + <0 0>, + <37500000 150000000>, + <0 0>, + <0 0>, + <0 0>, + <0 0>; + + resets = <&gcc GCC_UFS_PHY_BCR>; + reset-names = "rst"; + + status = "disabled"; + }; + + ufsphy1: phy@1d87000 { + compatible = "qcom,sdm845-qmp-ufs-phy"; + reg = <0x1d87000 0x18c>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + clock-names = "ref", + "ref_aux"; + clocks = <&gcc GCC_UFS_MEM_CLKREF_CLK>, + <&gcc GCC_UFS_PHY_PHY_AUX_CLK>; + + status = "disabled"; + + ufsphy1_lanes: lanes@1d87400 { + reg = <0x1d87400 0x108>, + <0x1d87600 0x1e0>, + <0x1d87c00 0x1dc>, + <0x1d87800 0x108>, + <0x1d87a00 0x1e0>; + #phy-cells = <0>; + }; + }; + tcsr_mutex_regs: syscon@1f40000 { compatible = "syscon"; reg = <0x1f40000 0x40000>; From patchwork Mon Oct 22 20:51:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evan Green X-Patchwork-Id: 10652545 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B61EC14DE for ; Mon, 22 Oct 2018 20:52:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0E5E12900F for ; Mon, 22 Oct 2018 20:52:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0010A29038; Mon, 22 Oct 2018 20:52:15 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 804FF2900F for ; Mon, 22 Oct 2018 20:52:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729321AbeJWFMV (ORCPT ); Tue, 23 Oct 2018 01:12:21 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:38586 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729183AbeJWFMU (ORCPT ); Tue, 23 Oct 2018 01:12:20 -0400 Received: by mail-pg1-f196.google.com with SMTP id f8-v6so19569531pgq.5 for ; Mon, 22 Oct 2018 13:52:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xLKlsnGFS9lkOakWGrRUVip4OrwSbxaV3uwLy7WzbJU=; b=Kd34SoKvFVAsliANZ34ORX9svKrP4CBcZpjhfPQsVhKREknqty/Wp2c+lEQcOrR0rw lGt8fNLT1zpqD/lETX2SRW5BGvBop9hVM4E27/ipzXGuPdeBKkSVAgU0K83Y5OM8uCux PATHV0Rpebk9wN+kE11j2ifRd4F2TBRFmWVZk= 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=xLKlsnGFS9lkOakWGrRUVip4OrwSbxaV3uwLy7WzbJU=; b=dhzhhMGZ1NH7PnwA9wZPW8dnXbYzGUHAnESr2MtaGqpzsEPWSO6OXOTDBI0BUKrOAk 9ECeexIdRDXe4S+TVg8aNHIrXwuMo1ACUHJuLyz92aAQ7OTZVJNbJuCjrhtFAgBgbFen xG/KPECRypYYcaw350pRv3/UyRyYdK5HHOYPF1M2bf/FrIJIk+W6V1ZRx7fBBrZKAnGV 5xKUHsXgX51z40/BTE2TCZTPKvnzsMg5CjD8AScPH2wz8MuBADuJiPrP+jsfsTZlnsEA kWN/m3/Zckfe3hHpXrJUJzkxAYo56GG63O9XOo+Wd3xGkNX0a84/8UrXrnIE8CxINUsv t+0w== X-Gm-Message-State: ABuFfojZkZKnGOcaCbghuVxOo5pEhwWBxlKlTiPIF4qoWp31vYNSacGZ WTwuiHGuJu1r9Tiu3rvurf46Bw== X-Google-Smtp-Source: ACcGV61ot8WiSzRBoekld2wpjbn+m0Tua2QBpPz2suG3Fwig4q1rRDWuhXz2mZ2mPSrZDIEiqNP1iw== X-Received: by 2002:a63:4045:: with SMTP id n66-v6mr21584034pga.244.1540241534119; Mon, 22 Oct 2018 13:52:14 -0700 (PDT) Received: from evgreen2.mtv.corp.google.com ([2620:15c:202:201:e418:c825:76cf:5f64]) by smtp.gmail.com with ESMTPSA id a11-v6sm37216041pfn.66.2018.10.22.13.52.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 Oct 2018 13:52:13 -0700 (PDT) From: Evan Green To: Rob Herring , Andy Gross , Kishon Vijay Abraham I Cc: Douglas Anderson , Stephen Boyd , Can Guo , Evan Green , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring , David Brown , Mark Rutland , linux-soc@vger.kernel.org Subject: [PATCH v3 4/5] arm64: dts: qcom: sdm845: Add UFS nodes for sdm845-mtp Date: Mon, 22 Oct 2018 13:51:01 -0700 Message-Id: <20181022205102.74825-5-evgreen@chromium.org> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20181022205102.74825-1-evgreen@chromium.org> References: <20181022205102.74825-1-evgreen@chromium.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Can Guo Enable the UFS host controller and PHY on sdm845-mtp. Signed-off-by: Can Guo Signed-off-by: Evan Green Reviewed-by: Vivek Gautam Reviewed-by: Douglas Anderson --- Changes in v3: None Changes in v2: None arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts index eedfaf8922e2..d5fddea71a85 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts @@ -356,6 +356,20 @@ status = "okay"; }; +&ufshc1 { + status = "okay"; + + vcc-supply = <&vreg_l20a_2p95>; + vcc-max-microamp = <600000>; +}; + +&ufsphy1 { + status = "okay"; + + vdda-phy-supply = <&vdda_ufs1_core>; + vdda-pll-supply = <&vdda_ufs1_1p2>; +}; + &usb_1 { status = "okay"; }; From patchwork Mon Oct 22 20:51:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evan Green X-Patchwork-Id: 10652547 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E46C114DE for ; Mon, 22 Oct 2018 20:52:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3E7DA2900F for ; Mon, 22 Oct 2018 20:52:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 32A2329038; Mon, 22 Oct 2018 20:52:27 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DCA052900F for ; Mon, 22 Oct 2018 20:52:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729348AbeJWFM0 (ORCPT ); Tue, 23 Oct 2018 01:12:26 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:45243 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729316AbeJWFM0 (ORCPT ); Tue, 23 Oct 2018 01:12:26 -0400 Received: by mail-pf1-f196.google.com with SMTP id u12-v6so20482945pfn.12 for ; Mon, 22 Oct 2018 13:52:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RPT/WTxyUGreQcDbdg1cHDx9XCdq0A5fb8bWQwqAeBo=; b=SMdJkgfDWFnC7ibzKHBaWUUGrz8qnX/KAEt4NwGQUiw2zpWxZev4gtnbVreywPZyii CnoT0RaZaoIrq8+Y147CmhreSHJ8SfeIlpbL1uExgj+9qJELlVCNzBE9VPj7u0TynECa DuSTahW4yazos4OSCZ48fwbgjQc6aSrZFa2wA= 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=RPT/WTxyUGreQcDbdg1cHDx9XCdq0A5fb8bWQwqAeBo=; b=XbyqZBciU2Q4BC7S55BCFT9Kszym/0f2DIIbIESHqxUp54fp4fotLzLQzLBRSjCtcm 8XbnB10Yg8DAr/Wfbudu3cTaIrjtnR3aexNNE+5j1ZyiCdG1mgBGF0DfMTdNYrXZQaq8 GrfBQtgQdaRiQAE8gXKXX/xh5L/YW176Kw4VMQB7MsXcvNTEvr0sLVZyh7Uz5JaLE/g8 zC9/X3Uu6+JT93ZlKh2xL8GS2N30fyOg9wBVxzLdF4q/Id05DMjM2s9js+4FJdMfPKtt qBljMPFPTGqFZ4kbjl2u+7WSvJLQ9xmbQecGA24M0MXULGvluCi+ovwodPmrqLo5Ubcm JSrA== X-Gm-Message-State: ABuFfojHgnh0JyEldbGKWa8Y2K/Ut4pPhzyhpJ5Z+W6ly6UAPwKgD/TW AYUH75KkCl+kAxMvhXOXSqjfj8BwoyQ= X-Google-Smtp-Source: ACcGV608bPOu4etozebDXXTQS7tMyYnVcCjK1YsIQtHS4T0S6XqjUcO5d1/2xGuUpt62Kz6covxPRg== X-Received: by 2002:a62:8910:: with SMTP id v16-v6mr46873789pfd.106.1540241539236; Mon, 22 Oct 2018 13:52:19 -0700 (PDT) Received: from evgreen2.mtv.corp.google.com ([2620:15c:202:201:e418:c825:76cf:5f64]) by smtp.gmail.com with ESMTPSA id a11-v6sm37216041pfn.66.2018.10.22.13.52.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 Oct 2018 13:52:18 -0700 (PDT) From: Evan Green To: Rob Herring , Andy Gross , Kishon Vijay Abraham I Cc: Douglas Anderson , Stephen Boyd , Evan Green , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring , David Brown , Mark Rutland , linux-soc@vger.kernel.org Subject: [PATCH v3 5/5] arm64: dts: qcom: sdm845: Add USB PHY lane two Date: Mon, 22 Oct 2018 13:51:02 -0700 Message-Id: <20181022205102.74825-6-evgreen@chromium.org> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20181022205102.74825-1-evgreen@chromium.org> References: <20181022205102.74825-1-evgreen@chromium.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add the second lane registers for the USB PHY, now that the QMP phy bindings have been updated. This way the driver can stop reaching beyond its register region to get at the second lane. Signed-off-by: Evan Green Reviewed-by: Douglas Anderson --- Changes in v3: - Removed erroneous fixup for USB UniPro PHY, which is not dual lane (Doug) arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index 9c72edb678ec..ff2db36ec4fa 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -1188,10 +1188,12 @@ <&gcc GCC_USB3_PHY_PRIM_BCR>; reset-names = "phy", "common"; - usb_1_ssphy: lane@88e9200 { + usb_1_ssphy: lanes@88e9200 { reg = <0x88e9200 0x128>, <0x88e9400 0x200>, <0x88e9c00 0x218>, + <0x88e9600 0x128>, + <0x88e9800 0x200>, <0x88e9a00 0x100>; #phy-cells = <0>; clocks = <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>;