Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb0ce810 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: update and enable clock_rpmh device for SDM855" into msm-next

parents 7387f5c0 83ef6627

arch/arm64/boot/dts/qcom/sdm855.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -689,10 +689,10 @@ 
	};



	clock_rpmh: qcom,rpmhclk {

		compatible = "qcom,dummycc";

		clock-output-names = "rpm_clocks";

		compatible = "qcom,rpmh-clk-sdm855";

		mboxes = <&apps_rsc 0>;

		mbox-names = "apps";

		#clock-cells = <1>;

		#reset-cells = <1>;

	};



	clock_aop: qcom,aopclk {

drivers/clk/qcom/gcc-sdm855.c

+0 −9
Original line number Diff line number Diff line
@@ -252,14 +252,6 @@ static struct clk_dummy measure_only_ipa_2x_clk = { 
	},

};



static struct clk_dummy bi_tcxo = {

	.rrate = 19200000,

	.hw.init = &(struct clk_init_data){

		.name = "bi_tcxo",

		.ops = &clk_dummy_ops,

	},

};



static struct pll_vco trion_vco[] = {

	{ 249600000, 2000000000, 0 },

};
@@ -4151,7 +4143,6 @@ static struct clk_branch gcc_video_xo_clk = { 
};



struct clk_hw *gcc_sdm855_hws[] = {

	[GCC_XO] = &bi_tcxo.hw,

	[MEASURE_ONLY_SNOC_CLK] = &measure_only_snoc_clk.hw,

	[MEASURE_ONLY_CNOC_CLK] = &measure_only_cnoc_clk.hw,

	[MEASURE_ONLY_BIMC_CLK] = &measure_only_bimc_clk.hw,

include/dt-bindings/clock/qcom,gcc-sdm855.h

+0 −3
Original line number Diff line number Diff line
@@ -262,7 +262,4 @@ 
#define MEASURE_ONLY_BIMC_CLK					2

#define MEASURE_ONLY_IPA_2X_CLK					3



/* Hardware/Dummy/Voter clocks */

#define GCC_XO							4



#endif