Commit ecf89023 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

Merge tag 'samsung-dt-5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/dt

Samsung DTS ARM changes for v5.3

1. Fixes for minor warnings.
2. Enable ADC on Exynos5410 Odroid XU board.

* tag 'samsung-dt-5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  ARM: dts: exynos: Add ADC node to Exynos5410 and Odroid XU
  ARM: dts: exynos: Raise maximum buck regulator voltages on Arndale Octa
  ARM: dts: exynos: Move CPU OPP tables out of SoC node on Exynos5420

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f8269581 d2cac68e

arch/arm/boot/dts/exynos5410-odroidxu.dts

+5 −0
Original line number Diff line number Diff line
@@ -85,6 +85,11 @@ 
	};

};



&adc {

	vdd-supply = <&ldo10_reg>;

	status = "okay";

};



&audi2s0 {

	status = "okay";

};

arch/arm/boot/dts/exynos5410.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -260,6 +260,12 @@ 
	};

};



&adc {

	clocks = <&clock CLK_TSADC>;

	clock-names = "adc";

	samsung,syscon-phandle = <&pmu_system_controller>;

};



&arm_a15_pmu {

	interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>;

	status = "okay";

arch/arm/boot/dts/exynos5420-arndale-octa.dts

+7 −7
Original line number Diff line number Diff line
@@ -615,48 +615,48 @@ 
			buck1_reg: BUCK1 {

				regulator-name = "PVDD_MIF_1V1";

				regulator-min-microvolt = <800000>;

				regulator-max-microvolt = <1100000>;

				regulator-max-microvolt = <1300000>;

				regulator-always-on;

			};



			buck2_reg: BUCK2 {

				regulator-name = "vdd_arm";

				regulator-min-microvolt = <800000>;

				regulator-max-microvolt = <1000000>;

				regulator-max-microvolt = <1500000>;

				regulator-always-on;

			};



			buck3_reg: BUCK3 {

				regulator-name = "PVDD_INT_1V0";

				regulator-min-microvolt = <800000>;

				regulator-max-microvolt = <1000000>;

				regulator-max-microvolt = <1400000>;

				regulator-always-on;

			};



			buck4_reg: BUCK4 {

				regulator-name = "PVDD_G3D_1V0";

				regulator-min-microvolt = <800000>;

				regulator-max-microvolt = <1000000>;

				regulator-max-microvolt = <1400000>;

			};



			buck5_reg: BUCK5 {

				regulator-name = "PVDD_LPDDR3_1V2";

				regulator-min-microvolt = <800000>;

				regulator-max-microvolt = <1200000>;

				regulator-max-microvolt = <1400000>;

				regulator-always-on;

			};



			buck6_reg: BUCK6 {

				regulator-name = "PVDD_KFC_1V0";

				regulator-min-microvolt = <800000>;

				regulator-max-microvolt = <1000000>;

				regulator-max-microvolt = <1500000>;

				regulator-always-on;

			};



			buck7_reg: BUCK7 {

				regulator-name = "VIN_LLDO_1V4";

				regulator-min-microvolt = <800000>;

				regulator-max-microvolt = <1400000>;

				regulator-max-microvolt = <1500000>;

				regulator-always-on;

			};

arch/arm/boot/dts/exynos5420.dtsi

+115 −119
Original line number Diff line number Diff line
@@ -42,10 +42,10 @@ 
	 * by exynos5420-cpus.dtsi or exynos5422-cpus.dtsi.

	 */



	soc: soc {

	cluster_a15_opp_table: opp_table0 {

		compatible = "operating-points-v2";

		opp-shared;



		opp-1800000000 {

			opp-hz = /bits/ 64 <1800000000>;

			opp-microvolt = <1250000>;
@@ -111,6 +111,7 @@ 
	cluster_a7_opp_table: opp_table1 {

		compatible = "operating-points-v2";

		opp-shared;



		opp-1300000000 {

			opp-hz = /bits/ 64 <1300000000>;

			opp-microvolt = <1275000>;
@@ -153,6 +154,7 @@ 
		};

	};



	soc: soc {

		cci: cci@10d20000 {

			compatible = "arm,cci-400";

			#address-cells = <1>;
@@ -548,18 +550,6 @@ 
			status = "disabled";

		};



		adc: adc@12d10000 {

			compatible = "samsung,exynos-adc-v2";

			reg = <0x12D10000 0x100>;

			interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&clock CLK_TSADC>;

			clock-names = "adc";

			#io-channel-cells = <1>;

			io-channel-ranges;

			samsung,syscon-phandle = <&pmu_system_controller>;

			status = "disabled";

		};



		hsi2c_8: i2c@12e00000 {

			compatible = "samsung,exynos5250-hsi2c";

			reg = <0x12E00000 0x1000>;
@@ -1363,6 +1353,12 @@ 
	};

};



&adc {

	clocks = <&clock CLK_TSADC>;

	clock-names = "adc";

	samsung,syscon-phandle = <&pmu_system_controller>;

};



&dp {

	clocks = <&clock CLK_DP1>;

	clock-names = "dp";

arch/arm/boot/dts/exynos54xx.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -96,6 +96,15 @@ 
			interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;

		};



		adc: adc@12d10000 {

			compatible = "samsung,exynos-adc-v2";

			reg = <0x12d10000 0x100>;

			interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;

			#io-channel-cells = <1>;

			io-channel-ranges;

			status = "disabled";

		};



		/* i2c_0-3 are defined in exynos5.dtsi */

		hsi2c_4: i2c@12ca0000 {

			compatible = "samsung,exynos5250-hsi2c";

CRA Git | Maintained and supported by SUSTech CRA and CCSE