From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ABDE5145FF3; Sun, 24 Mar 2024 23:14:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711322056; cv=none; b=Z/tFMYJ8fnw1v4kJYPU1jtW05CS81xkyIQsb5n2TAnc3QA6Whrz4kX62vhUg2lB3RrZLiPnlxuiFputZaBpUEnlJQLhKoXuiDwpU2JDxF0gtxajtM9jaRPU18cFqL/F/sWeffkqqlESxu2QibXtgjNC0yQQoBtpUXNMCj1dxSgc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711322056; c=relaxed/simple; bh=cZ3FDbVrdGMansDtfsbUATAeF8l7KjlYgQN5CPOAiUk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eBF19py/3M8b3LhRDwWeoTrJ0/3jVaPpbjfjhblD50C9YbiX3Bf2Hgwk2lEUK7mRbtisa7mmZVtsASJiOS4W4Afe6qrLIWD3bUp+GDGfAYFhJSYHI6P/Wq3HnNY36tXoPu7qwailnkfwY9G3CuVi8E+OCX3c5tzO5f0Tw8BKMh4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iFeCjqgw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="iFeCjqgw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DC7E0C433F1; Sun, 24 Mar 2024 23:14:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711322055; bh=cZ3FDbVrdGMansDtfsbUATAeF8l7KjlYgQN5CPOAiUk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iFeCjqgwyzeJ7h8OWIKQ01hhoa8Khff7BeMaoZYQaPOVR8SnU6uR7X6I6K51J05Q7 8D++fZeNNrIETojoL6L2xFKSKMk+aLzu9BvY43j/za1bfTTTUMqBM4GRLeJy/Scw+P H9nFCtkvzjfFINj9rbo9mDZJy+eTF1BEYQX9dZJ7b0Jykh7wqT1ArBGP+n7Rfrm5H1 2AKnYuFN67hO23ZrG/8hdMhA6Fm4p8E8UEUrLxn+20e8RAHleAQ0roDjTcJC3gjkRD kJkykInVBnHk57xoZS0R9+QCT1DsKGhQPmX57mONGwzwEXqrGfvj5stoFR8HrbhIEN 7+mrvCOdJNWPw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dmitry Baryshkov , Bjorn Andersson , Sasha Levin Subject: [PATCH 6.1 128/451] arm64: dts: qcom: msm8998: switch USB QMP PHY to new style of bindings Date: Sun, 24 Mar 2024 19:06:44 -0400 Message-ID: <20240324231207.1351418-129-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324231207.1351418-1-sashal@kernel.org> References: <20240324231207.1351418-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Dmitry Baryshkov [ Upstream commit b7efebfeb2e8ad8187cdabba5f0212ba2e6c1069 ] Change the USB QMP PHY to use newer style of QMP PHY bindings (single resource region, no per-PHY subnodes). Signed-off-by: Dmitry Baryshkov Link: https://lore.kernel.org/r/20230824211952.1397699-11-dmitry.baryshkov@linaro.org Signed-off-by: Bjorn Andersson Stable-dep-of: fc835b2311d4 ("arm64: dts: qcom: msm8998: declare VLS CLAMP register for USB3 PHY") Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/qcom/msm8998.dtsi | 35 +++++++++++---------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi index 7a41250539ff5..6eef7cbe7d7bf 100644 --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi @@ -2030,7 +2030,7 @@ usb3_dwc3: usb@a800000 { interrupts = ; snps,dis_u2_susphy_quirk; snps,dis_enblslpm_quirk; - phys = <&qusb2phy>, <&usb1_ssphy>; + phys = <&qusb2phy>, <&usb3phy>; phy-names = "usb2-phy", "usb3-phy"; snps,has-lpm-erratum; snps,hird-threshold = /bits/ 8 <0x10>; @@ -2039,33 +2039,26 @@ usb3_dwc3: usb@a800000 { usb3phy: phy@c010000 { compatible = "qcom,msm8998-qmp-usb3-phy"; - reg = <0x0c010000 0x18c>; - status = "disabled"; - #address-cells = <1>; - #size-cells = <1>; - ranges; + reg = <0x0c010000 0x1000>; clocks = <&gcc GCC_USB3_PHY_AUX_CLK>, + <&gcc GCC_USB3_CLKREF_CLK>, <&gcc GCC_USB_PHY_CFG_AHB2PHY_CLK>, - <&gcc GCC_USB3_CLKREF_CLK>; - clock-names = "aux", "cfg_ahb", "ref"; + <&gcc GCC_USB3_PHY_PIPE_CLK>; + clock-names = "aux", + "ref", + "cfg_ahb", + "pipe"; + clock-output-names = "usb3_phy_pipe_clk_src"; + #clock-cells = <0>; + #phy-cells = <0>; resets = <&gcc GCC_USB3_PHY_BCR>, <&gcc GCC_USB3PHY_PHY_BCR>; - reset-names = "phy", "common"; + reset-names = "phy", + "phy_phy"; - usb1_ssphy: phy@c010200 { - reg = <0xc010200 0x128>, - <0xc010400 0x200>, - <0xc010c00 0x20c>, - <0xc010600 0x128>, - <0xc010800 0x200>; - #phy-cells = <0>; - #clock-cells = <0>; - clocks = <&gcc GCC_USB3_PHY_PIPE_CLK>; - clock-names = "pipe0"; - clock-output-names = "usb3_phy_pipe_clk_src"; - }; + status = "disabled"; }; qusb2phy: phy@c012000 { -- 2.43.0