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

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

Merge "clk: msm: clock: Do not allow setting rate on mmss_mmagic_ahb_clk"

parents 78df4338 28cd4eab

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

+2 −2
Original line number Diff line number Diff line
@@ -186,8 +186,8 @@ 
			qcom,setrate-only-clk;

			qcom,bus-type = <1>;

			clock-names = "bus_clk", "bus_a_clk";

			clocks = <&clock_mmss clk_mmss_mmagic_ahb_clk>,

			     <&clock_mmss clk_mmss_mmagic_ahb_clk>;

			clocks = <&clock_mmss clk_ahb_clk_src>,

			     <&clock_mmss clk_ahb_clk_src>;

			bus-gdsc-supply = <&gdsc_mmagic_bimc>;

			bus-a-gdsc-supply = <&gdsc_mmagic_bimc>;

		};

drivers/clk/msm/clock-mmss-8996.c

+1 −1
Original line number Diff line number Diff line
@@ -1649,7 +1649,7 @@ static struct rcg_clk video_subcore1_clk_src = { 


static struct branch_clk mmss_mmagic_ahb_clk = {

	.cbcr_reg = MMSS_MMSS_MMAGIC_AHB_CBCR,

	.has_sibling = 0,

	.has_sibling = 1,

	.check_enable_bit = true,

	.base = &virt_base,

	.no_halt_check_on_disable = true,