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

Commit 880c0d14 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-dt-4' of... 

Merge tag 'samsung-dt-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt

Merge "Samsung 4th DT updates for v3.20" from Kukjin Kim:

- For exynos4 SoCs
  : add PPMU node
  : add syscon phandle for video-phy node

- For exynos4415 SoC
  : add mipi dsi and fimd device nodes

- For exynos3250-monk and exynos3250-rinato boards
  : add PPMU node

- For exynos4412-trats2 board
  : add maxim77693 fuel gauge and battery charger nodes
  : fix regarding CLK_MOUT_CAMn parent and CLK_UART_ISP_SCLK clocks
  : switch max77686 regulators to GPIO control
  : add suspend configuration for max77686 regulators
  : add PPMU node and sound nodes

* tag 'samsung-dt-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  ARM: dts: Add PPMU node for exynos4412-trats2
  ARM: dts: Add PPMU node for exynos3250-monk and exynos3250-rinato
  ARM: dts: Add PPMU dt node for exynos4 and exynos4210
  ARM: dts: Add PPMU dt node for exynos3250
  ARM: dts: add mipi dsi device node for exynos4415
  ARM: dts: add fimd device node for exynos4415
  ARM: dts: Add syscon phandle to the video-phy node for Exynos4
  ARM: dts: Add sound nodes for exynos4412-trats2
  ARM: dts: Fix CLK_MOUT_CAMn parent clocks assignment for exynos4412-trats2
  ARM: dts: Fix CLK_UART_ISP_SCLK clock assignment in exynos4x12.dtsi
  ARM: dts: Add max77693 charger node for exynos4412-trats2
  ARM: dts: Switch max77686 regulators to GPIO control for exynos4412-trats2
  ARM: dts: Add suspend configuration for max77686 regulators for exynos4412-trats2
  ARM: dts: Add Maxim 77693 fuel gauge node for exynos4412-trats2

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f5ebaf26 7808cae3

arch/arm/boot/dts/exynos3250-monk.dts

+40 −0
Original line number Diff line number Diff line
@@ -437,6 +437,46 @@ 
	status = "okay";

};



&ppmu_dmc0 {

	status = "okay";



	events {

		ppmu_dmc0_3: ppmu-event3-dmc0 {

			event-name = "ppmu-event3-dmc0";

		};

	};

};



&ppmu_dmc1 {

	status = "okay";



	events {

		ppmu_dmc1_3: ppmu-event3-dmc1 {

			event-name = "ppmu-event3-dmc1";

		};

	};

};



&ppmu_leftbus {

	status = "okay";



	events {

		ppmu_leftbus_3: ppmu-event3-leftbus {

			event-name = "ppmu-event3-leftbus";

		};

	};

};



&ppmu_rightbus {

	status = "okay";



	events {

		ppmu_rightbus_3: ppmu-event3-rightbus {

			event-name = "ppmu-event3-rightbus";

		};

	};

};



&xusbxti {

	clock-frequency = <24000000>;

};

arch/arm/boot/dts/exynos3250-rinato.dts

+40 −0
Original line number Diff line number Diff line
@@ -610,6 +610,46 @@ 
	status = "okay";

};



&ppmu_dmc0 {

	status = "okay";



	events {

		ppmu_dmc0_3: ppmu-event3-dmc0 {

			event-name = "ppmu-event3-dmc0";

		};

	};

};



&ppmu_dmc1 {

	status = "okay";



	events {

		ppmu_dmc1_3: ppmu-event3-dmc1 {

			event-name = "ppmu-event3-dmc1";

		};

	};

};



&ppmu_leftbus {

	status = "okay";



	events {

		ppmu_leftbus_3: ppmu-event3-leftbus {

			event-name = "ppmu-event3-leftbus";

		};

	};

};



&ppmu_rightbus {

	status = "okay";



	events {

		ppmu_rightbus_3: ppmu-event3-rightbus {

			event-name = "ppmu-event3-rightbus";

		};

	};

};



&xusbxti {

	clock-frequency = <24000000>;

};

arch/arm/boot/dts/exynos3250.dtsi

+74 −0
Original line number Diff line number Diff line
@@ -541,6 +541,80 @@ 
			compatible = "arm,cortex-a7-pmu";

			interrupts = <0 18 0>, <0 19 0>;

		};



		ppmu_dmc0: ppmu_dmc0@106a0000 {

			compatible = "samsung,exynos-ppmu";

			reg = <0x106a0000 0x2000>;

			status = "disabled";

		};



		ppmu_dmc1: ppmu_dmc1@106b0000 {

			compatible = "samsung,exynos-ppmu";

			reg = <0x106b0000 0x2000>;

			status = "disabled";

		};



		ppmu_cpu: ppmu_cpu@106c0000 {

			compatible = "samsung,exynos-ppmu";

			reg = <0x106c0000 0x2000>;

			status = "disabled";

		};



		ppmu_rightbus: ppmu_rightbus@112a0000 {

			compatible = "samsung,exynos-ppmu";

			reg = <0x112a0000 0x2000>;

			clocks = <&cmu CLK_PPMURIGHT>;

			clock-names = "ppmu";

			status = "disabled";

		};



		ppmu_leftbus: ppmu_leftbus0@116a0000 {

			compatible = "samsung,exynos-ppmu";

			reg = <0x116a0000 0x2000>;

			clocks = <&cmu CLK_PPMULEFT>;

			clock-names = "ppmu";

			status = "disabled";

		};



		ppmu_camif: ppmu_camif@11ac0000 {

			compatible = "samsung,exynos-ppmu";

			reg = <0x11ac0000 0x2000>;

			clocks = <&cmu CLK_PPMUCAMIF>;

			clock-names = "ppmu";

			status = "disabled";

		};



		ppmu_lcd0: ppmu_lcd0@11e40000 {

			compatible = "samsung,exynos-ppmu";

			reg = <0x11e40000 0x2000>;

			clocks = <&cmu CLK_PPMULCD0>;

			clock-names = "ppmu";

			status = "disabled";

		};



		ppmu_fsys: ppmu_fsys@12630000 {

			compatible = "samsung,exynos-ppmu";

			reg = <0x12630000 0x2000>;

			clocks = <&cmu CLK_PPMUFILE>;

			clock-names = "ppmu";

			status = "disabled";

		};



		ppmu_g3d: ppmu_g3d@13220000 {

			compatible = "samsung,exynos-ppmu";

			reg = <0x13220000 0x2000>;

			clocks = <&cmu CLK_PPMUG3D>;

			clock-names = "ppmu";

			status = "disabled";

		};



		ppmu_mfc: ppmu_mfc@13660000 {

			compatible = "samsung,exynos-ppmu";

			reg = <0x13660000 0x2000>;

			clocks = <&cmu CLK_PPMUMFC_L>;

			clock-names = "ppmu";

			status = "disabled";

		};

	};

};

arch/arm/boot/dts/exynos4.dtsi

+109 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ 
		compatible = "samsung,s5pv210-mipi-video-phy";

		reg = <0x10020710 8>;

		#phy-cells = <1>;

		syscon = <&pmu_system_controller>;

	};



	pd_mfc: mfc-power-domain@10023C40 {
@@ -652,4 +653,112 @@ 
		samsung,sysreg = <&sys_reg>;

		status = "disabled";

	};



	ppmu_dmc0: ppmu_dmc0@106a0000 {

		compatible = "samsung,exynos-ppmu";

		reg = <0x106a0000 0x2000>;

		clocks = <&clock CLK_PPMUDMC0>;

		clock-names = "ppmu";

		status = "disabled";

	};



	ppmu_dmc1: ppmu_dmc1@106b0000 {

		compatible = "samsung,exynos-ppmu";

		reg = <0x106b0000 0x2000>;

		clocks = <&clock CLK_PPMUDMC1>;

		clock-names = "ppmu";

		status = "disabled";

	};



	ppmu_cpu: ppmu_cpu@106c0000 {

		compatible = "samsung,exynos-ppmu";

		reg = <0x106c0000 0x2000>;

		clocks = <&clock CLK_PPMUCPU>;

		clock-names = "ppmu";

		status = "disabled";

	};



	ppmu_acp: ppmu_acp@10ae0000 {

		compatible = "samsung,exynos-ppmu";

		reg = <0x106e0000 0x2000>;

		status = "disabled";

	};



	ppmu_rightbus: ppmu_rightbus@112a0000 {

		compatible = "samsung,exynos-ppmu";

		reg = <0x112a0000 0x2000>;

		clocks = <&clock CLK_PPMURIGHT>;

		clock-names = "ppmu";

		status = "disabled";

	};



	ppmu_leftbus: ppmu_leftbus0@116a0000 {

		compatible = "samsung,exynos-ppmu";

		reg = <0x116a0000 0x2000>;

		clocks = <&clock CLK_PPMULEFT>;

		clock-names = "ppmu";

		status = "disabled";

	};



	ppmu_camif: ppmu_camif@11ac0000 {

		compatible = "samsung,exynos-ppmu";

		reg = <0x11ac0000 0x2000>;

		clocks = <&clock CLK_PPMUCAMIF>;

		clock-names = "ppmu";

		status = "disabled";

	};



	ppmu_lcd0: ppmu_lcd0@11e40000 {

		compatible = "samsung,exynos-ppmu";

		reg = <0x11e40000 0x2000>;

		clocks = <&clock CLK_PPMULCD0>;

		clock-names = "ppmu";

		status = "disabled";

	};



	ppmu_fsys: ppmu_g3d@12630000 {

		compatible = "samsung,exynos-ppmu";

		reg = <0x12630000 0x2000>;

		status = "disabled";

	};



	ppmu_image: ppmu_image@12aa0000 {

		compatible = "samsung,exynos-ppmu";

		reg = <0x12aa0000 0x2000>;

		clocks = <&clock CLK_PPMUIMAGE>;

		clock-names = "ppmu";

		status = "disabled";

	};



	ppmu_tv: ppmu_tv@12e40000 {

		compatible = "samsung,exynos-ppmu";

		reg = <0x12e40000 0x2000>;

		clocks = <&clock CLK_PPMUTV>;

		clock-names = "ppmu";

		status = "disabled";

	};



	ppmu_g3d: ppmu_g3d@13220000 {

		compatible = "samsung,exynos-ppmu";

		reg = <0x13220000 0x2000>;

		clocks = <&clock CLK_PPMUG3D>;

		clock-names = "ppmu";

		status = "disabled";

	};



	ppmu_mfc_left: ppmu_mfc_left@13660000 {

		compatible = "samsung,exynos-ppmu";

		reg = <0x13660000 0x2000>;

		clocks = <&clock CLK_PPMUMFC_L>;

		clock-names = "ppmu";

		status = "disabled";

	};



	ppmu_mfc_right: ppmu_mfc_right@13670000 {

		compatible = "samsung,exynos-ppmu";

		reg = <0x13670000 0x2000>;

		clocks = <&clock CLK_PPMUMFC_R>;

		clock-names = "ppmu";

		status = "disabled";

	};

};

arch/arm/boot/dts/exynos4210.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -193,4 +193,12 @@ 
			samsung,lcd-wb;

		};

	};



	ppmu_lcd1: ppmu_lcd1@12240000 {

		compatible = "samsung,exynos-ppmu";

		reg = <0x12240000 0x2000>;

		clocks = <&clock CLK_PPMULCD1>;

		clock-names = "ppmu";

		status = "disabled";

	};

};