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

Commit f6389b64 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: remove unnecessary UFS clocks for 8996 v2 & v3"

parents 5e34438d 7c68a08a

arch/arm/boot/dts/qcom/msm8996-v1.dtsi

+45 −0
Original line number Diff line number Diff line
@@ -119,3 +119,48 @@ 
		snps,disable-clk-gating;

	};

};



&ufs1 {

	clock-names =

		"core_clk_src",

		"core_clk",

		"bus_clk",

		"bus_aggr_clk",

		"iface_clk",

		"core_clk_unipro_src",

		"core_clk_unipro",

		"core_clk_ice",

		"ref_clk",

		"tx_lane0_sync_clk",

		"rx_lane0_sync_clk",

		"sys_clk_core_clk",

		"tx_symbol_clk_core_clk";

	clocks =

		<&clock_gcc clk_ufs_axi_clk_src>,

		<&clock_gcc clk_gcc_ufs_axi_clk>,

		<&clock_gcc clk_gcc_sys_noc_ufs_axi_clk>,

		<&clock_gcc clk_gcc_aggre2_ufs_axi_clk>,

		<&clock_gcc clk_gcc_ufs_ahb_clk>,

		<&clock_gcc clk_ufs_ice_core_clk_src>,

		<&clock_gcc clk_gcc_ufs_unipro_core_clk>,

		<&clock_gcc clk_gcc_ufs_ice_core_clk>,

		<&clock_gcc clk_bb_clk1>,

		<&clock_gcc clk_gcc_ufs_tx_symbol_0_clk>,

		<&clock_gcc clk_gcc_ufs_rx_symbol_0_clk>,

		<&clock_gcc clk_gcc_ufs_sys_clk_core_clk>,

		<&clock_gcc clk_gcc_ufs_tx_symbol_clk_core_clk>;

	freq-table-hz =

		<100000000 200000000>,

		<0 0>,

		<0 0>,

		<0 0>,

		<0 0>,

		<150000000 300000000>,

		<0 0>,

		<0 0>,

		<0 0>,

		<0 0>,

		<0 0>,

		<0 0>,

		<0 0>;

};

arch/arm/boot/dts/qcom/msm8996.dtsi

+2 −8
Original line number Diff line number Diff line
@@ -1282,9 +1282,7 @@ 
			"core_clk_ice",

			"ref_clk",

			"tx_lane0_sync_clk",

			"rx_lane0_sync_clk",

			"sys_clk_core_clk",

			"tx_symbol_clk_core_clk";

			"rx_lane0_sync_clk";

		clocks =

			<&clock_gcc clk_ufs_axi_clk_src>,

			<&clock_gcc clk_gcc_ufs_axi_clk>,
@@ -1296,9 +1294,7 @@ 
			<&clock_gcc clk_gcc_ufs_ice_core_clk>,

			<&clock_gcc clk_bb_clk1>,

			<&clock_gcc clk_gcc_ufs_tx_symbol_0_clk>,

			<&clock_gcc clk_gcc_ufs_rx_symbol_0_clk>,

			<&clock_gcc clk_gcc_ufs_sys_clk_core_clk>,

			<&clock_gcc clk_gcc_ufs_tx_symbol_clk_core_clk>;

			<&clock_gcc clk_gcc_ufs_rx_symbol_0_clk>;

		freq-table-hz =

			<100000000 200000000>,

			<0 0>,
@@ -1310,8 +1306,6 @@ 
			<0 0>,

			<0 0>,

			<0 0>,

			<0 0>,

			<0 0>,

			<0 0>;



		lanes-per-direction = <1>;