Commit 72146720 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-dt-5.4-2' of... 

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

Samsung DTS ARM changes for v5.4, part 2

1. Fix Exynos542x Chromebooks boot with multi_v7 defconfig,
2. Add GPU (Mali) support to Exynos5250 boards,
3. Minor cleanup for Exynos3250 ADC.

* tag 'samsung-dt-5.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Enable GPU/Mali T604 on Arndale board
  ARM: dts: exynos: Enable GPU/Mali T604 on Chromebook Snow
  ARM: dts: exynos: Add GPU/Mali T604 node to Exynos5250
  ARM: dts: exynos: Fix min/max buck4 for GPU on Arndale board
  ARM: dts: exynos: Mark LDO10 as always-on on Peach Pit/Pi Chromebooks
  ARM: dts: exynos: Remove not accurate secondary ADC compatible

Link: https://lore.kernel.org/r/20190904175002.10487-4-krzk@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 20dcfe69 51c88919

arch/arm/boot/dts/exynos3250.dtsi

+1 −2
Original line number Diff line number Diff line
@@ -450,8 +450,7 @@ 
		};



		adc: adc@126c0000 {

			compatible = "samsung,exynos3250-adc",

				     "samsung,exynos-adc-v2";

			compatible = "samsung,exynos3250-adc";

			reg = <0x126C0000 0x100>;

			interrupts = <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>;

			clock-names = "adc", "sclk";

arch/arm/boot/dts/exynos5250-arndale.dts

+7 −2
Original line number Diff line number Diff line
@@ -461,8 +461,8 @@ 


			buck4_reg: BUCK4 {

				regulator-name = "vdd_g3d";

				regulator-min-microvolt = <1000000>;

				regulator-max-microvolt = <1000000>;

				regulator-min-microvolt = <850000>;

				regulator-max-microvolt = <1300000>;

				regulator-always-on;

				regulator-boot-on;

				op_mode = <1>;
@@ -543,6 +543,11 @@ 
	status = "okay";

};



&mali {

	mali-supply = <&buck4_reg>;

	status = "okay";

};



&mixer {

	status = "okay";

};

arch/arm/boot/dts/exynos5250-snow-common.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -529,6 +529,11 @@ 
	status = "okay";

};



&mali {

	mali-supply = <&buck4_reg>;

	status = "okay";

};



&mixer {

	status = "okay";

};

arch/arm/boot/dts/exynos5250.dtsi

+47 −0
Original line number Diff line number Diff line
@@ -328,6 +328,53 @@ 
			iommus = <&sysmmu_rotator>;

		};



		mali: gpu@11800000 {

			compatible = "samsung,exynos5250-mali", "arm,mali-t604";

			reg = <0x11800000 0x5000>;

			interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "job", "mmu", "gpu";

			clocks = <&clock CLK_G3D>;

			clock-names = "core";

			operating-points-v2 = <&gpu_opp_table>;

			power-domains = <&pd_g3d>;

			status = "disabled";



			gpu_opp_table: gpu-opp-table {

				compatible = "operating-points-v2";



				opp-100000000 {

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

					opp-microvolt = <925000>;

				};

				opp-160000000 {

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

					opp-microvolt = <925000>;

				};

				opp-266000000 {

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

					opp-microvolt = <1025000>;

				};

				opp-350000000 {

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

					opp-microvolt = <1075000>;

				};

				opp-400000000 {

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

					opp-microvolt = <1125000>;

				};

				opp-450000000 {

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

					opp-microvolt = <1150000>;

				};

				opp-533000000 {

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

					opp-microvolt = <1250000>;

				};

			};

		};



		tmu: tmu@10060000 {

			compatible = "samsung,exynos5250-tmu";

			reg = <0x10060000 0x100>;

arch/arm/boot/dts/exynos5420-peach-pit.dts

+1 −0
Original line number Diff line number Diff line
@@ -440,6 +440,7 @@ 
				regulator-name = "vdd_ldo10";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;

				regulator-state-mem {

					regulator-off-in-suspend;

				};

CRA Git | Maintained and supported by SUSTech CRA and CCSE