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

Commit e9360979 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'for-v3.16-rc/clk-dt-fixes' of https://github.com/t-kristo/linux-pm into fixes-rc4

parents 24faebd6 dd94324b

arch/arm/boot/dts/dra7xx-clocks.dtsi

+6 −4
Original line number Diff line number Diff line
@@ -673,10 +673,12 @@ 


	l3_iclk_div: l3_iclk_div {

		#clock-cells = <0>;

		compatible = "fixed-factor-clock";

		compatible = "ti,divider-clock";

		ti,max-div = <2>;

		ti,bit-shift = <4>;

		reg = <0x0100>;

		clocks = <&dpll_core_h12x2_ck>;

		clock-mult = <1>;

		clock-div = <1>;

		ti,index-power-of-two;

	};



	l4_root_clk_div: l4_root_clk_div {
@@ -684,7 +686,7 @@ 
		compatible = "fixed-factor-clock";

		clocks = <&l3_iclk_div>;

		clock-mult = <1>;

		clock-div = <1>;

		clock-div = <2>;

	};



	video1_clk2_div: video1_clk2_div {