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

Commit 82567c85 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-fixes-1' of... 

Merge tag 'samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes

Merge "Samsung fixes for v4.2" from Kukjin Kim:

From Krzysztof Kozlowski:
1. Fix exynos3250 MIPI DSI display and MIPI CSIS-2 camera sensorx
   after adding support for PMU regmap in exynos-video-mipi driver
   (issue introduced in v4.0).
2. Bring back cpufreq for exynos4210 after incomplete switch to
   cpufreq-dt driver in 4.2 merge window. The necessary DT changes
   for exynos4210 cpufreq was not applied to the same tree as rest
   of patchset because of multiple conflicts between clk and arm-soc
   trees. Unfortunately without the change the exynos4210 boards
   loose cpufreq feature.

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

:
  ARM: dts: add CPU OPP and regulator supply property for exynos4210
  ARM: dts: Update video-phy node with syscon phandle for exynos3250

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3eae03da 300bde79

arch/arm/boot/dts/exynos3250.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -138,8 +138,8 @@ 


		mipi_phy: video-phy@10020710 {

			compatible = "samsung,s5pv210-mipi-video-phy";

			reg = <0x10020710 8>;

			#phy-cells = <1>;

			syscon = <&pmu_system_controller>;

		};



		pd_cam: cam-power-domain@10023C00 {

arch/arm/boot/dts/exynos4210-origen.dts

+4 −0
Original line number Diff line number Diff line
@@ -127,6 +127,10 @@ 
	};

};



&cpu0 {

	cpu0-supply = <&buck1_reg>;

};



&fimd {

	pinctrl-0 = <&lcd_en &lcd_clk &lcd_data24 &pwm0_out>;

	pinctrl-names = "default";

arch/arm/boot/dts/exynos4210-trats.dts

+4 −0
Original line number Diff line number Diff line
@@ -188,6 +188,10 @@ 
	};

};



&cpu0 {

	cpu0-supply = <&varm_breg>;

};



&dsi_0 {

	vddcore-supply = <&vusb_reg>;

	vddio-supply = <&vmipi_reg>;

arch/arm/boot/dts/exynos4210-universal_c210.dts

+4 −0
Original line number Diff line number Diff line
@@ -548,6 +548,10 @@ 
	};

};



&cpu0 {

	cpu0-supply = <&vdd_arm_reg>;

};



&pinctrl_1 {

	hdmi_hpd: hdmi-hpd {

		samsung,pins = "gpx3-7";

arch/arm/boot/dts/exynos4210.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -40,6 +40,18 @@ 
			device_type = "cpu";

			compatible = "arm,cortex-a9";

			reg = <0x900>;

			clocks = <&clock CLK_ARM_CLK>;

			clock-names = "cpu";

			clock-latency = <160000>;



			operating-points = <

				1200000 1250000

				1000000 1150000

				800000	1075000

				500000	975000

				400000	975000

				200000	950000

			>;

			cooling-min-level = <4>;

			cooling-max-level = <2>;

			#cooling-cells = <2>; /* min followed by max */