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.
 -----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAl5vu5cQHGtyemtAa2Vy
 bmVsLm9yZwAKCRDBN2bmhouD19b+D/9qtEMSHaQWJjciRPY6rPCSonFE4AqIoIJR
 uMLWUW0Bb4ZBDGJgRyWaQh6uBzsv0y/HIr9RBU2dApapukVunV47SMQFzY/xvgjv
 5VJqEOvvQxhhLT1cG+BacNM944sKiY7I6vSHX9XjMhZTdnIHVpvCvDFOys8J4kXV
 oM45PrrBApOkRy2z3gsHQIgbPqjIBPAbLKRugSrjvUMQkrIf5zYm+21Zqp9UiqNV
 5k64wj2U5NdqjTzFfXh+2S+JJ1DGhxgU8f3zATzozkRwPTjwx7EDvgAJncTcNEji
 ecEARRhqOcAiwHW/A9wt+BYIBrfSqze+BpMn+M2iJUHn7Eu5wY1uEymrF9rNSV4G
 zsz5hZQKi8BxFwLbIPnS6nKDSZb9qRK2RHcJLDYSXgrqbeBZqO2sACqJURt8Hl9J
 St2CfZgD5bR5PNDCb2ALArFR1Fn8Udr/1jt0UqBg/KmBRq51Ex+aYT1gKPqTWeq2
 +m3srRRXOOVtcDFsXHO9RM8Uxh0aPrpXEq/VPujE9GNomJ5uMKwfw84LFmOpEv/S
 kkTx5VSv8370Yycu37e2yuKymUwLQ0sV8MtdCWuTMl+7aSpSitHXtKDOQITxJDj4
 Hvl492XDQqQGQqVykuRuBmmBrkkh3k+QQpOdYZR39NUctyUv96GRl3BwjZIjGYLS
 ctEz/FvFKg==
 =6UVu
 -----END PGP SIGNATURE-----

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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2020-03-25 21:52:09 +01:00
commit e4a78fd21a
9 changed files with 118 additions and 7 deletions

View File

@ -23,7 +23,7 @@
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x1ff00000>;
reg = <0x40000000 0x1f800000>;
};
firmware@205f000 {

View File

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

View File

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

View File

@ -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;
};
};

View File

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

View File

@ -31,6 +31,7 @@
operating-points-v2 = <&cluster_a7_opp_table>;
#cooling-cells = <2>; /* min followed by max */
capacity-dmips-mhz = <539>;
dynamic-power-coefficient = <90>;
};
cpu1: cpu@101 {
@ -43,6 +44,7 @@
operating-points-v2 = <&cluster_a7_opp_table>;
#cooling-cells = <2>; /* min followed by max */
capacity-dmips-mhz = <539>;
dynamic-power-coefficient = <90>;
};
cpu2: cpu@102 {
@ -55,6 +57,7 @@
operating-points-v2 = <&cluster_a7_opp_table>;
#cooling-cells = <2>; /* min followed by max */
capacity-dmips-mhz = <539>;
dynamic-power-coefficient = <90>;
};
cpu3: cpu@103 {
@ -67,6 +70,7 @@
operating-points-v2 = <&cluster_a7_opp_table>;
#cooling-cells = <2>; /* min followed by max */
capacity-dmips-mhz = <539>;
dynamic-power-coefficient = <90>;
};
cpu4: cpu@0 {
@ -79,6 +83,7 @@
operating-points-v2 = <&cluster_a15_opp_table>;
#cooling-cells = <2>; /* min followed by max */
capacity-dmips-mhz = <1024>;
dynamic-power-coefficient = <310>;
};
cpu5: cpu@1 {
@ -91,6 +96,7 @@
operating-points-v2 = <&cluster_a15_opp_table>;
#cooling-cells = <2>; /* min followed by max */
capacity-dmips-mhz = <1024>;
dynamic-power-coefficient = <310>;
};
cpu6: cpu@2 {
@ -103,6 +109,7 @@
operating-points-v2 = <&cluster_a15_opp_table>;
#cooling-cells = <2>; /* min followed by max */
capacity-dmips-mhz = <1024>;
dynamic-power-coefficient = <310>;
};
cpu7: cpu@3 {
@ -115,6 +122,7 @@
operating-points-v2 = <&cluster_a15_opp_table>;
#cooling-cells = <2>; /* min followed by max */
capacity-dmips-mhz = <1024>;
dynamic-power-coefficient = <310>;
};
};
};

View File

@ -901,6 +901,7 @@
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <1400000>;
regulator-boot-on;
regulator-always-on;
regulator-state-mem {
regulator-off-in-suspend;

View File

@ -215,6 +215,36 @@
};
};
};
gpu_thermal: gpu-thermal {
thermal-sensors = <&tmu_gpu 0>;
trips {
gpu_alert0: gpu-alert-0 {
temperature = <70000>;
hysteresis = <10000>;
type = "active";
};
gpu_alert1: gpu-alert-1 {
temperature = <85000>;
hysteresis = <10000>;
type = "active";
};
gpu_crit0: gpu-crit-0 {
temperature = <120000>;
hysteresis = <0>;
type = "critical";
};
};
cooling-maps {
map0 {
trip = <&gpu_alert0>;
cooling-device = <&gpu 0 2>;
};
map1 {
trip = <&gpu_alert1>;
cooling-device = <&gpu 3 6>;
};
};
};
};
};

View File

@ -357,6 +357,65 @@
};
};
};
gpu_thermal: gpu-thermal {
thermal-sensors = <&tmu_gpu 0>;
polling-delay-passive = <250>;
polling-delay = <0>;
trips {
gpu_alert0: gpu-alert-0 {
temperature = <50000>;
hysteresis = <5000>;
type = "active";
};
gpu_alert1: gpu-alert-1 {
temperature = <60000>;
hysteresis = <5000>;
type = "active";
};
gpu_alert2: gpu-alert-2 {
temperature = <70000>;
hysteresis = <5000>;
type = "active";
};
gpu_crit0: gpu-crit-0 {
temperature = <120000>;
hysteresis = <0>;
type = "critical";
};
gpu_alert3: gpu-alert-3 {
temperature = <70000>;
hysteresis = <10000>;
type = "passive";
};
gpu_alert4: gpu-alert-4 {
temperature = <85000>;
hysteresis = <10000>;
type = "passive";
};
};
cooling-maps {
map0 {
trip = <&gpu_alert0>;
cooling-device = <&fan0 0 1>;
};
map1 {
trip = <&gpu_alert1>;
cooling-device = <&fan0 1 2>;
};
map2 {
trip = <&gpu_alert2>;
cooling-device = <&fan0 2 3>;
};
map3 {
trip = <&gpu_alert3>;
cooling-device = <&gpu 0 2>;
};
map4 {
trip = <&gpu_alert4>;
cooling-device = <&gpu 3 6>;
};
};
};
};
};