| Message ID | 20230113162245.117324-4-krzysztof.kozlowski@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/6] arm64: dts: qcom: sm8250: drop unused clock-frequency from rx-macro | expand |
On 13.01.2023 17:22, Krzysztof Kozlowski wrote: > Clock for WCD9340 is coming from the SoC and is the same in all users, > so move it to common file to reduce the code duplication (which still > allows further customizations per board). > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad > arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi | 3 +++ > arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 2 -- > arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 2 -- > arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 2 -- > arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 2 -- > arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts | 2 -- > 6 files changed, 3 insertions(+), 10 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi b/arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi > index 33718cb95c83..0d7c37f39176 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi > +++ b/arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi > @@ -29,6 +29,9 @@ wcd9340: codec@1,0 { > interrupt-controller; > #interrupt-cells = <1>; > > + clock-names = "extclk"; > + clocks = <&rpmhcc RPMH_LN_BB_CLK2>; > + > #clock-cells = <0>; > clock-frequency = <9600000>; > clock-output-names = "mclk"; > diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts > index 33ec79afbb62..9c9a587ea7a9 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts > +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts > @@ -1076,8 +1076,6 @@ &venus { > }; > > &wcd9340 { > - clock-names = "extclk"; > - clocks = <&rpmhcc RPMH_LN_BB_CLK2>; > reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>; > vdd-buck-supply = <&vreg_s4a_1p8>; > vdd-buck-sido-supply = <&vreg_s4a_1p8>; > diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi > index a7a3f7ce2809..4f8ffc0da141 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi > +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi > @@ -534,8 +534,6 @@ &venus { > }; > > &wcd9340 { > - clock-names = "extclk"; > - clocks = <&rpmhcc RPMH_LN_BB_CLK2>; > reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>; > vdd-buck-supply = <&vreg_s4a_1p8>; > vdd-buck-sido-supply = <&vreg_s4a_1p8>; > diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts > index 1ceeea0885b9..d9c4af06ab63 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts > +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts > @@ -692,8 +692,6 @@ &venus { > }; > > &wcd9340 { > - clock-names = "extclk"; > - clocks = <&rpmhcc RPMH_LN_BB_CLK2>; > reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>; > vdd-buck-sido-supply = <&vreg_s4a_1p8>; > vdd-buck-supply = <&vreg_s4a_1p8>; > diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts > index f3dd0ff1d5c6..5094e7e6dc48 100644 > --- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts > +++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts > @@ -738,8 +738,6 @@ &venus { > }; > > &wcd9340 { > - clock-names = "extclk"; > - clocks = <&rpmhcc RPMH_LN_BB_CLK2>; > reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>; > vdd-buck-supply = <&vreg_s4a_1p8>; > vdd-buck-sido-supply = <&vreg_s4a_1p8>; > diff --git a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts > index fc9369eafd23..65de8d595736 100644 > --- a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts > +++ b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts > @@ -647,8 +647,6 @@ &venus { > }; > > &wcd9340 { > - clock-names = "extclk"; > - clocks = <&rpmhcc RPMH_LN_BB_CLK2>; > reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>; > vdd-buck-supply = <&vreg_s4a_1p8>; > vdd-buck-sido-supply = <&vreg_s4a_1p8>;
diff --git a/arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi b/arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi index 33718cb95c83..0d7c37f39176 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi @@ -29,6 +29,9 @@ wcd9340: codec@1,0 { interrupt-controller; #interrupt-cells = <1>; + clock-names = "extclk"; + clocks = <&rpmhcc RPMH_LN_BB_CLK2>; + #clock-cells = <0>; clock-frequency = <9600000>; clock-output-names = "mclk"; diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts index 33ec79afbb62..9c9a587ea7a9 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts @@ -1076,8 +1076,6 @@ &venus { }; &wcd9340 { - clock-names = "extclk"; - clocks = <&rpmhcc RPMH_LN_BB_CLK2>; reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>; vdd-buck-supply = <&vreg_s4a_1p8>; vdd-buck-sido-supply = <&vreg_s4a_1p8>; diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi index a7a3f7ce2809..4f8ffc0da141 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi @@ -534,8 +534,6 @@ &venus { }; &wcd9340 { - clock-names = "extclk"; - clocks = <&rpmhcc RPMH_LN_BB_CLK2>; reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>; vdd-buck-supply = <&vreg_s4a_1p8>; vdd-buck-sido-supply = <&vreg_s4a_1p8>; diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts index 1ceeea0885b9..d9c4af06ab63 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts @@ -692,8 +692,6 @@ &venus { }; &wcd9340 { - clock-names = "extclk"; - clocks = <&rpmhcc RPMH_LN_BB_CLK2>; reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>; vdd-buck-sido-supply = <&vreg_s4a_1p8>; vdd-buck-supply = <&vreg_s4a_1p8>; diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts index f3dd0ff1d5c6..5094e7e6dc48 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts @@ -738,8 +738,6 @@ &venus { }; &wcd9340 { - clock-names = "extclk"; - clocks = <&rpmhcc RPMH_LN_BB_CLK2>; reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>; vdd-buck-supply = <&vreg_s4a_1p8>; vdd-buck-sido-supply = <&vreg_s4a_1p8>; diff --git a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts index fc9369eafd23..65de8d595736 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts @@ -647,8 +647,6 @@ &venus { }; &wcd9340 { - clock-names = "extclk"; - clocks = <&rpmhcc RPMH_LN_BB_CLK2>; reset-gpios = <&tlmm 64 GPIO_ACTIVE_HIGH>; vdd-buck-supply = <&vreg_s4a_1p8>; vdd-buck-sido-supply = <&vreg_s4a_1p8>;
Clock for WCD9340 is coming from the SoC and is the same in all users, so move it to common file to reduce the code duplication (which still allows further customizations per board). Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- arch/arm64/boot/dts/qcom/sdm845-audio-wcd9340.dtsi | 3 +++ arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 2 -- arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 2 -- arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 2 -- arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 2 -- arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts | 2 -- 6 files changed, 3 insertions(+), 10 deletions(-)