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

Commit d7d3d26f authored by Mike Turquette's avatar Mike Turquette
Browse files

Merge tag 'for_3.17/samsung-clk' of... 

Merge tag 'for_3.17/samsung-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/tfiga/samsung-clk into clk-next-samsung

Samsung clock patches for 3.17

1) non-critical fixes (without need to push to stable):

d5e136a2 clk: samsung: Register clk provider only after registering its all clocks
305cfab0 clk: samsung: Make of_device_id array const
e9d52956 clk: samsung: exynos5420: Setup clocks before system suspend
f65d5189 clk: samsung: trivial: Correct typo in author's name

2) Exynos CLKOUT driver:

800c9797 clk: samsung: exynos4: Add missing CPU/DMC clock hierarchy
01f7ec26 clk: samsung: exynos4: Add CLKOUT clock hierarchy
1e832e51 clk: samsung: Add driver to control CLKOUT line on Exynos SoCs
d19bb397 ARM: dts: exynos: Update PMU node with CLKOUT related data

3) Clock hierarchy extensions:

17d3f1d2 clk: exynos4: Add PPMU IP block source clocks.
ca5b4029 clk: samsung: register exynos5420 apll/kpll configuration data

4) ARM CLKDOWN functionality enablement for Exynos4 and 3250:

42773b28 clk: samsung: exynos4: Enable ARMCLK down feature
45c5b0a6 clk: samsung: exynos3250: Enable ARMCLK down feature
parents abeab450 f65d5189

Documentation/devicetree/bindings/arm/samsung/pmu.txt

+30 −0
Original line number Diff line number Diff line
@@ -12,8 +12,38 @@ Properties: 


 - reg : offset and length of the register set.



 - #clock-cells : must be <1>, since PMU requires once cell as clock specifier.

		The single specifier cell is used as index to list of clocks

		provided by PMU, which is currently:

			0 : SoC clock output (CLKOUT pin)



 - clock-names : list of clock names for particular CLKOUT mux inputs in

		following format:

			"clkoutN", where N is a decimal number corresponding to

			CLKOUT mux control bits value for given input, e.g.

				"clkout0", "clkout7", "clkout15".



 - clocks : list of phandles and specifiers to all input clocks listed in

		clock-names property.



Example :

pmu_system_controller: system-controller@10040000 {

	compatible = "samsung,exynos5250-pmu", "syscon";

	reg = <0x10040000 0x5000>;

	#clock-cells = <1>;

	clock-names = "clkout0", "clkout1", "clkout2", "clkout3",

			"clkout4", "clkout8", "clkout9";

	clocks = <&clock CLK_OUT_DMC>, <&clock CLK_OUT_TOP>,

		<&clock CLK_OUT_LEFTBUS>, <&clock CLK_OUT_RIGHTBUS>,

		<&clock CLK_OUT_CPU>, <&clock CLK_XXTI>,

		<&clock CLK_XUSBXTI>;

};



Example of clock consumer :



usb3503: usb3503@08 {

	/* ... */

	clock-names = "refclk";

	clocks = <&pmu_system_controller 0>;

	/* ... */

};

arch/arm/boot/dts/exynos4210.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -31,6 +31,16 @@ 
		pinctrl2 = &pinctrl_2;

	};



	pmu_system_controller: system-controller@10020000 {

		clock-names = "clkout0", "clkout1", "clkout2", "clkout3",

				"clkout4", "clkout8", "clkout9";

		clocks = <&clock CLK_OUT_DMC>, <&clock CLK_OUT_TOP>,

			<&clock CLK_OUT_LEFTBUS>, <&clock CLK_OUT_RIGHTBUS>,

			<&clock CLK_OUT_CPU>, <&clock CLK_XXTI>,

			<&clock CLK_XUSBXTI>;

		#clock-cells = <1>;

	};



	sysram@02020000 {

		compatible = "mmio-sram";

		reg = <0x02020000 0x20000>;

arch/arm/boot/dts/exynos4x12.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -139,6 +139,13 @@ 


	pmu_system_controller: system-controller@10020000 {

		compatible = "samsung,exynos4212-pmu", "syscon";

		clock-names = "clkout0", "clkout1", "clkout2", "clkout3",

				"clkout4", "clkout8", "clkout9";

		clocks = <&clock CLK_OUT_DMC>, <&clock CLK_OUT_TOP>,

			<&clock CLK_OUT_LEFTBUS>, <&clock CLK_OUT_RIGHTBUS>,

			<&clock CLK_OUT_CPU>, <&clock CLK_XXTI>,

			<&clock CLK_XUSBXTI>;

		#clock-cells = <1>;

	};



	g2d@10800000 {

arch/arm/boot/dts/exynos5250.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -191,6 +191,9 @@ 
	pmu_system_controller: system-controller@10040000 {

		compatible = "samsung,exynos5250-pmu", "syscon";

		reg = <0x10040000 0x5000>;

		clock-names = "clkout16";

		clocks = <&clock CLK_FIN_PLL>;

		#clock-cells = <1>;

	};



	sysreg_system_controller: syscon@10050000 {

arch/arm/boot/dts/exynos5420.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -724,6 +724,9 @@ 
	pmu_system_controller: system-controller@10040000 {

		compatible = "samsung,exynos5420-pmu", "syscon";

		reg = <0x10040000 0x5000>;

		clock-names = "clkout16";

		clocks = <&clock CLK_FIN_PLL>;

		#clock-cells = <1>;

	};



	sysreg_system_controller: syscon@10050000 {