Drop arm64-dts-qcom-msm8996-move-clock-cells-to-qmp-phy-c.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.15/arm64-dts-qcom-msm8996-move-clock-cells-to-qmp-phy-c.patch b/queue-5.15/arm64-dts-qcom-msm8996-move-clock-cells-to-qmp-phy-c.patch
deleted file mode 100644 (file)
index d4a37d5..0000000
--- a/queue-5.15/arm64-dts-qcom-msm8996-move-clock-cells-to-qmp-phy-c.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From 87b532489934e25275082177c5727e15a786b1f3 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 29 Sep 2021 11:42:46 +0800
-Subject: arm64: dts: qcom: msm8996: Move '#clock-cells' to QMP PHY child node
-
-From: Shawn Guo <shawn.guo@linaro.org>
-
-[ Upstream commit 82d61e19fccbf2fe7c018765b3799791916e7f31 ]
-
-'#clock-cells' is a required property of QMP PHY child node, not itself.
-Move it to fix the dtbs_check warnings.
-
-There are only '#clock-cells' removal from SM8350 QMP PHY nodes, because
-child nodes already have the property.
-
-Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
-Link: https://lore.kernel.org/r/20210929034253.24570-4-shawn.guo@linaro.org
-Stable-dep-of: fc835b2311d4 ("arm64: dts: qcom: msm8998: declare VLS CLAMP register for USB3 PHY")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/ipq8074.dtsi | 4 ++--
- arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 ++--
- arch/arm64/boot/dts/qcom/msm8998.dtsi | 2 +-
- arch/arm64/boot/dts/qcom/sm8350.dtsi  | 3 ---
- 4 files changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-index 17eeff106bab7..0a4c5b847ddd5 100644
---- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
-@@ -91,7 +91,6 @@ soc: soc {
-               ssphy_1: phy@58000 {
-                       compatible = "qcom,ipq8074-qmp-usb3-phy";
-                       reg = <0x00058000 0x1c4>;
--                      #clock-cells = <1>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges;
-@@ -112,6 +111,7 @@ usb1_ssphy: phy@58200 {
-                                     <0x00058800 0x1f8>,     /* PCS  */
-                                     <0x00058600 0x044>;     /* PCS misc*/
-                               #phy-cells = <0>;
-+                              #clock-cells = <1>;
-                               clocks = <&gcc GCC_USB1_PIPE_CLK>;
-                               clock-names = "pipe0";
-                               clock-output-names = "usb3phy_1_cc_pipe_clk";
-@@ -134,7 +134,6 @@ qusb_phy_1: phy@59000 {
-               ssphy_0: phy@78000 {
-                       compatible = "qcom,ipq8074-qmp-usb3-phy";
-                       reg = <0x00078000 0x1c4>;
--                      #clock-cells = <1>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges;
-@@ -155,6 +154,7 @@ usb0_ssphy: phy@78200 {
-                                     <0x00078800 0x1f8>,     /* PCS  */
-                                     <0x00078600 0x044>;     /* PCS misc*/
-                               #phy-cells = <0>;
-+                              #clock-cells = <1>;
-                               clocks = <&gcc GCC_USB0_PIPE_CLK>;
-                               clock-names = "pipe0";
-                               clock-output-names = "usb3phy_0_cc_pipe_clk";
-diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
-index fd9ffe8448b04..e8fe02f484bf2 100644
---- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
-+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
-@@ -615,7 +615,6 @@ soc: soc {
-               pcie_phy: phy@34000 {
-                       compatible = "qcom,msm8996-qmp-pcie-phy";
-                       reg = <0x00034000 0x488>;
--                      #clock-cells = <1>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges;
-@@ -637,6 +636,7 @@ pciephy_0: phy@35000 {
-                                     <0x00035400 0x1dc>;
-                               #phy-cells = <0>;
- 
-+                              #clock-cells = <1>;
-                               clock-output-names = "pcie_0_pipe_clk_src";
-                               clocks = <&gcc GCC_PCIE_0_PIPE_CLK>;
-                               clock-names = "pipe0";
-@@ -2641,7 +2641,6 @@ usb3_dwc3: dwc3@6a00000 {
-               usb3phy: phy@7410000 {
-                       compatible = "qcom,msm8996-qmp-usb3-phy";
-                       reg = <0x07410000 0x1c4>;
--                      #clock-cells = <1>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges;
-@@ -2662,6 +2661,7 @@ ssusb_phy_0: phy@7410200 {
-                                     <0x07410600 0x1a8>;
-                               #phy-cells = <0>;
- 
-+                              #clock-cells = <1>;
-                               clock-output-names = "usb3_phy_pipe_clk_src";
-                               clocks = <&gcc GCC_USB3_PHY_PIPE_CLK>;
-                               clock-names = "pipe0";
-diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
-index 7eadecba0175d..6dbed85fa53e5 100644
---- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
-+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
-@@ -1993,7 +1993,6 @@ usb3phy: phy@c010000 {
-                       compatible = "qcom,msm8998-qmp-usb3-phy";
-                       reg = <0x0c010000 0x18c>;
-                       status = "disabled";
--                      #clock-cells = <1>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges;
-@@ -2014,6 +2013,7 @@ usb1_ssphy: phy@c010200 {
-                                     <0xc010600 0x128>,
-                                     <0xc010800 0x200>;
-                               #phy-cells = <0>;
-+                              #clock-cells = <1>;
-                               clocks = <&gcc GCC_USB3_PHY_PIPE_CLK>;
-                               clock-names = "pipe0";
-                               clock-output-names = "usb3_phy_pipe_clk_src";
-diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi
-index b0ba63b5869d2..8506dc841c869 100644
---- a/arch/arm64/boot/dts/qcom/sm8350.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi
-@@ -1119,7 +1119,6 @@ ufs_mem_phy: phy@1d87000 {
-                       reg = <0 0x01d87000 0 0x1c4>;
-                       #address-cells = <2>;
-                       #size-cells = <2>;
--                      #clock-cells = <1>;
-                       ranges;
-                       clock-names = "ref",
-                                     "ref_aux";
-@@ -1254,7 +1253,6 @@ usb_1_qmpphy: phy-wrapper@88e9000 {
-                             <0 0x088e8000 0 0x20>;
-                       reg-names = "reg-base", "dp_com";
-                       status = "disabled";
--                      #clock-cells = <1>;
-                       #address-cells = <2>;
-                       #size-cells = <2>;
-                       ranges;
-@@ -1287,7 +1285,6 @@ usb_2_qmpphy: phy-wrapper@88eb000 {
-                       compatible = "qcom,sm8350-qmp-usb3-uni-phy";
-                       reg = <0 0x088eb000 0 0x200>;
-                       status = "disabled";
--                      #clock-cells = <1>;
-                       #address-cells = <2>;
-                       #size-cells = <2>;
-                       ranges;
--- 
-2.43.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 39e0356dbf21e38fc88b13e209013b0285e29722..2e63211be71a32729b9c72240b09455695e33333 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -80,7 +80,6 @@ pwm-atmel-hlcdc-use-consistent-variable-naming.patch
 pwm-atmel-hlcdc-fix-clock-imbalance-related-to-suspe.patch
 net-blackhole_dev-fix-build-warning-for-ethh-set-but.patch
 wifi-libertas-fix-some-memleaks-in-lbs_allocate_cmd_.patch
-arm64-dts-qcom-msm8996-move-clock-cells-to-qmp-phy-c.patch
 arm64-dts-qcom-msm8998-switch-usb-qmp-phy-to-new-sty.patch
 arm64-dts-qcom-msm8998-declare-vls-clamp-register-fo.patch
 printk-add-panic_in_progress-helper.patch