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

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

Samsung DTS ARM changes for v5.7

1. Various fixes:
 - Reboot of some Odroid Exynos4412-based boards,
 - MMC regulators on Arndale5250,
 - Memory mapping on Artik5,
 - GPU power domain on Exynos542x boards,
 - LCD SPI polarity on UniversalC210,
2. Add thermal cooling of GPU on Odroid XU3/XU4 family,
3. Add dynamic-power-coefficient to Exynos5422 for energy model.

* tag 'samsung-dt-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Fix polarity of the LCD SPI bus on UniversalC210 board
  ARM: dts: exynos: Fix G3D power domain supply on Arndale Octa boards
  ARM: dts: exynos: Fix G3D power domain supply on Odroid XU3/XU4/HC1 boards
  ARM: dts: exynos: Fix memory on Artik5 evaluation boards
  ARM: dts: exynos: Make fixed regulators always-on on Arndale5250
  ARM: dts: exynos: Fix MMC regulator on Arndale5250 board
  ARM: dts: exynos: Add dynamic-power-coefficient to Exynos5422 CPUs
  ARM: dts: exynos: Add GPU thermal zone cooling maps for Odroid XU3/XU4/HC1
  ARM: dts: exynos: Fix broken reboot on some Odroid U2/X2/U3 boards

Link: https://lore.kernel.org/r/20200316175652.5604-3-krzk@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 6eda1390 32a1671f

arch/arm/boot/dts/exynos3250-artik5.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


	memory@40000000 {

		device_type = "memory";

		reg = <0x40000000 0x1ff00000>;

		reg = <0x40000000 0x1f800000>;

	};



	firmware@205f000 {

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

+1 −3
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ 
		gpio-sck = <&gpy3 1 GPIO_ACTIVE_HIGH>;

		gpio-mosi = <&gpy3 3 GPIO_ACTIVE_HIGH>;

		num-chipselects = <1>;

		cs-gpios = <&gpy4 3 GPIO_ACTIVE_HIGH>;

		cs-gpios = <&gpy4 3 GPIO_ACTIVE_LOW>;



		lcd@0 {

			compatible = "samsung,ld9040";
@@ -124,8 +124,6 @@ 
			vci-supply = <&ldo17_reg>;

			reset-gpios = <&gpy4 5 GPIO_ACTIVE_HIGH>;

			spi-max-frequency = <1200000>;

			spi-cpol;

			spi-cpha;

			power-on-delay = <10>;

			reset-delay = <10>;

			panel-width-mm = <90>;

arch/arm/boot/dts/exynos4412-odroid-common.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -165,6 +165,15 @@ 
	cpu0-supply = <&buck2_reg>;

};



&cpu0_opp_table {

	opp-1000000000 {

		opp-suspend;

	};

	opp-800000000 {

		/delete-property/opp-suspend;

	};

};



&pinctrl_1 {

	gpio_power_key: power_key {

		samsung,pins = "gpx1-3";

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

+7 −3
Original line number Diff line number Diff line
@@ -93,22 +93,23 @@ 
			compatible = "regulator-fixed";

			reg = <0>;

			regulator-name = "MAIN_DC";

			regulator-always-on;

		};



		mmc_reg: regulator@1 {

			compatible = "regulator-fixed";

			reg = <1>;

			regulator-name = "VDD_33ON_2.8V";

			regulator-name = "VDD_MMC";

			regulator-min-microvolt = <2800000>;

			regulator-max-microvolt = <2800000>;

			gpio = <&gpx1 1 GPIO_ACTIVE_HIGH>;

			enable-active-high;

			regulator-always-on;

		};



		reg_hdmi_en: regulator@2 {

			compatible = "regulator-fixed";

			reg = <2>;

			regulator-name = "hdmi-en";

			regulator-always-on;

		};



		vcc_1v2_reg: regulator@3 {
@@ -117,6 +118,7 @@ 
			regulator-name = "VCC_1V2";

			regulator-min-microvolt = <1200000>;

			regulator-max-microvolt = <1200000>;

			regulator-always-on;

		};



		vcc_1v8_reg: regulator@4 {
@@ -125,6 +127,7 @@ 
			regulator-name = "VCC_1V8";

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			regulator-always-on;

		};



		vcc_3v3_reg: regulator@5 {
@@ -133,6 +136,7 @@ 
			regulator-name = "VCC_3V3";

			regulator-min-microvolt = <3300000>;

			regulator-max-microvolt = <3300000>;

			regulator-always-on;

		};

	};

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

+2 −0
Original line number Diff line number Diff line
@@ -584,6 +584,7 @@ 
				regulator-name = "PVDD_G3DS_1V0";

				regulator-min-microvolt = <800000>;

				regulator-max-microvolt = <1100000>;

				regulator-always-on;



				regulator-state-mem {

					regulator-on-in-suspend;
@@ -697,6 +698,7 @@ 
				regulator-name = "PVDD_G3D_1V0";

				regulator-min-microvolt = <800000>;

				regulator-max-microvolt = <1400000>;

				regulator-always-on;



				regulator-state-mem {

					regulator-off-in-suspend;

CRA Git | Maintained and supported by SUSTech CRA and CCSE