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

Commit 30c7b56d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC fixes from Olof Johansson:
 "Things are calming down nicely here w.r.t. fixes.  This batch
  includes two week's worth since I missed to send before -rc4.

  Nothing particularly scary to point out, smaller fixes here and there.
  Shortlog describes it pretty well"

* tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: dts: keystone: fix dt bindings to use post div register for mainpll
  ARM: nomadik: disable UART0 on Nomadik boards
  ARM: dts: i.MX35: Fix can support.
  ARM: OMAP2+: hwmod: Fix _wait_target_ready() for hwmods without sysc
  ARM: dts: add CPU OPP and regulator supply property for exynos4210
  ARM: dts: Update video-phy node with syscon phandle for exynos3250
  ARM: DRA7: hwmod: fix gpmc hwmod
parents 01183609 c1bfa985

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 */