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

Commit 819167e7 authored Aug 20, 2015 by Olof Johansson

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

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

Samsung 2nd DT updates for v4.3

- for exynos3250, 4212, 4412 and 5250
  : add CPU OPP and regulator supply property

- for exynos3250
  : add CPU cooling binding for exynos3250 boards

- for exynos4 SoCs
  : add iommu property to JPEG device

- for exynos4412-odroidu3
  : enable SPI1

- for exynos5250-snow
  : add SPI CS

- for exynos5422
  : add exynos5422-cpus.dtsi to correct cpu order

* Note this branch is depending on tags/samsung-clk-driver

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

: (22 commits)
  ARM: dts: add iommu property to JPEG device for exynos4
  ARM: dts: enable SPI1 for exynos4412-odroidu3
  ARM: dts: Add SPI CS on exynos5250-snow
  ARM: dts: Add CPU cooling binding for exynos3250 boards
  ARM: dts: add exynos5422-cpus.dtsi to correct cpu order
  ARM: dts: add CPU OPP and regulator supply property for exynos4x12
  ARM: dts: Add CPU OPP and regulator supply property for exynos3250
  ARM: dts: add CPU OPP and regulator supply property for exynos5250
  ARM: dts: Extend exynos5420-pinctrl nodes using labels instead of paths
  ARM: dts: Include exynos5420-pinctrl after the nodes were defined for exynos5420
  ARM: dts: Extend exynos5250-pinctrl nodes using labels instead of paths
  ARM: dts: Include exynos5250-pinctrl after the nodes were defined for exynos5250
  ARM: dts: Enable thermal-zones for exynos5422-odroidxu3
  ARM: dts: Define default thermal-zones for exynos5422
  ARM: dts: Enable TMU for exynos5422-odroidxu3
  ARM: dts: Add pwm-fan node for exynos5422-odroidxu3
  ARM: dts: Use labels for overriding nodes for exynos4210-universal_c210
  ARM: dts: Set max17047 over heat and voltage thresholds for exynos4412-trats2
  ARM: dts: Enable USB3 regulators for exynos5422-odroidxu3
  ARM: dts: Clean up indentation for exynos5410-smdk5410
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>

parents 6b077058 ba032795

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

+19 −0

Original line number	Diff line number	Diff line
		@@ -116,6 +116,21 @@
		min-microvolt = <1100000>;
		max-microvolt = <2700000>;
		};

		thermal-zones {
		cpu_thermal: cpu-thermal {
		cooling-maps {
		map0 {
		/* Correspond to 500MHz at freq_table */
		cooling-device = <&cpu0 5 5>;
		};
		map1 {
		/* Correspond to 200MHz at freq_table */
		cooling-device = <&cpu0 8 8>;
		};
		};
		};
		};
		};

		&adc {
		@@ -141,6 +156,10 @@
		};
		};

		&cpu0 {
		cpu0-supply = <&buck2_reg>;
		};

		&exynos_usbphy {
		status = "okay";
		};

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

+19 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,21 @@
		min-microvolt = <1100000>;
		max-microvolt = <2700000>;
		};

		thermal-zones {
		cpu_thermal: cpu-thermal {
		cooling-maps {
		map0 {
		/* Corresponds to 500MHz */
		cooling-device = <&cpu0 5 5>;
		};
		map1 {
		/* Corresponds to 200MHz */
		cooling-device = <&cpu0 8 8>;
		};
		};
		};
		};
		};

		&adc {
		@@ -132,6 +147,10 @@
		};
		};

		&cpu0 {
		cpu0-supply = <&buck2_reg>;
		};

		&exynos_usbphy {
		status = "okay";
		};

arch/arm/boot/dts/exynos3250.dtsi

+17 −1

Original line number	Diff line number	Diff line
		@@ -53,6 +53,22 @@
		compatible = "arm,cortex-a7";
		reg = <0>;
		clock-frequency = <1000000000>;
		clocks = <&cmu CLK_ARM_CLK>;
		clock-names = "cpu";
		#cooling-cells = <2>;

		operating-points = <
		1000000 1150000
		900000 1112500
		800000 1075000
		700000 1037500
		600000 1000000
		500000 962500
		400000 925000
		300000 887500
		200000 850000
		100000 850000
		>;
		};

		cpu1: cpu@1 {
		@@ -138,8 +154,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/exynos4.dtsi

+1 −0

Original line number	Diff line number	Diff line
		@@ -702,6 +702,7 @@
		clocks = <&clock CLK_JPEG>;
		clock-names = "jpeg";
		power-domains = <&pd_cam>;
		iommus = <&sysmmu_jpeg>;
		};

		hdmi: hdmi@12D00000 {

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";