From 20ecb1f6ddae35f51cc86c00615377c074071353 Mon Sep 17 00:00:00 2001 From: Peter Geis Date: Thu, 16 Sep 2021 13:50:09 -0400 Subject: [PATCH 105/478] arm64: dts: rockchip: sync combophy changes from latest submission This updates the device tree to adjust for the clock changes in the latest combophy driver. Signed-off-by: Peter Geis --- arch/arm64/boot/dts/rockchip/rk3568.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk356x.dtsi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts/rockchip/rk3568.dtsi index 3a3c12df35c4..468758c5f958 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi @@ -95,7 +95,7 @@ combphy0_us: phy@fe820000 { assigned-clock-rates = <100000000>; clocks = <&pmucru CLK_PCIEPHY0_REF>, <&cru PCLK_PIPEPHY0>, <&cru PCLK_PIPE>; - clock-names = "refclk", "apbclk", "pipe_clk"; + clock-names = "ref", "apb", "pipe"; resets = <&cru SRST_P_PIPEPHY0>, <&cru SRST_PIPEPHY0>; reset-names = "combphy-apb", "combphy"; rockchip,pipe-grf = <&pipegrf>; diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi index 418f12f96228..cdb2b2e376cc 100644 --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi @@ -1328,7 +1328,7 @@ combphy1_usq: phy@fe830000 { assigned-clock-rates = <100000000>; clocks = <&pmucru CLK_PCIEPHY1_REF>, <&cru PCLK_PIPEPHY1>, <&cru PCLK_PIPE>; - clock-names = "refclk", "apbclk", "pipe_clk"; + clock-names = "ref", "apb", "pipe"; resets = <&cru SRST_P_PIPEPHY1>, <&cru SRST_PIPEPHY1>; reset-names = "combphy-apb", "combphy"; rockchip,pipe-grf = <&pipegrf>; @@ -1344,7 +1344,7 @@ combphy2_psq: phy@fe840000 { assigned-clock-rates = <100000000>; clocks = <&pmucru CLK_PCIEPHY2_REF>, <&cru PCLK_PIPEPHY2>, <&cru PCLK_PIPE>; - clock-names = "refclk", "apbclk", "pipe_clk"; + clock-names = "ref", "apb", "pipe"; resets = <&cru SRST_P_PIPEPHY2>, <&cru SRST_PIPEPHY2>; reset-names = "combphy-apb", "combphy"; rockchip,pipe-grf = <&pipegrf>; -- 2.35.3