mirror of
https://github.com/torvalds/linux.git
synced 2026-05-31 10:33:41 +02:00
Samsung DTS ARM changes for v6.9
1. Disable thermal polling by Linux in Eynos5422 Odroid XU3 boards,
because drivers implement now proper dynamic trip points management.
2. Mark crosc-ec-spi in Peach Pi and Peach Pit as wake-up source, to
reflect the hardware capabilities.
3. Samsung P4 Note (Exynos4412): add accelerometer.
4. Samsung Galaxy Tab (Exynos5420):
- Reduce available RAM to avoid conflict with TrustZone.
- Add WiFi on MMC.
-----BEGIN PGP SIGNATURE-----
iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAmXSSGIQHGtyemtAa2Vy
bmVsLm9yZwAKCRDBN2bmhouD17AID/0XwkOpYKAXweL2+zqp+aQgCux3/i+MV0Yq
ojnHq1e9chTApiBqT/cW8xHLFmXpVR/Jiu0BDtm/JnlFtoWCE0B1qBmm0+sEpMZ7
QxvY8f+p2veTDXYO4cnfPn7iBnjtqzd4ceMsmljz3Md8lWwguZ2Kn6X6K2c4MaYT
kY6ZP4/B2L12z847MkqqlXHVY89bTZbaD5ag7L90MQ8RWaKuXDnn7b2v/fKUXJm8
XMxo5R/xaSafEOScJ0wK6EX11yxOi5sZFqaD0vQhtZ7Z4TpfLk4g1cUPnUFxlF85
sO1CHxg7JaVgbTR9vuHRsxotydPOC/75qAa1mHV4j8J8GrUAyHkLLgIm/V3JoebS
uEajcG/CjapV5Qx/xMxj17p8nYSDQjtzM8qqnX84IGk/hA6JeYVEzegoODzg/+Px
1YDBgNegggpy+6vznygjvuwwFoxtVmkILgcABvue+q0u+7v5vc4j2Bu9SlMgWEZn
DEI6A6vvMl0LflDHHcXGLGH8aAmpb3KDIeuPrNlKzQqHdwSc2sm22Km2xUK87F4M
iGZ/3UHEulIWPtRDd6nvA9XOdibF27SuaJkJLQVQtR0GwkVSugeYfmKXWG6ku/il
+Q/8iU2cYOsWTC4UBiJBP43BddwokNF14jl6HH+N0vjSnpZBf+KwZMDRlMOvGZ7e
dWUYcjnoDQ==
=skUJ
-----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmXgnrYACgkQYKtH/8kJ
Uiemcw/+MK2CjJHqNHIumDK1d0xYQ8kNoxF+CrU0MTFL/4VZKquHRWx66QnVWP1O
qxBEhl+UBulbHtaa8u7xaRuxNo+R/Xx6gW40apAXQh9O4G9OgnOQQbWs/471mtiU
tHHVPYM5ZCHj06yEwxCfXCnlfMFHlBT1qaAIArUWA6qzrjhH9zeoelsv9eK5s+ZT
X3INwT40vBR0tPezM/KNHds3jEvM/7w7iZA0zH2UXG5d29GcQDyT+PbxTnEjGgLR
Ww7UHqOsKbj9btfAnPqvy2n3wdbYftr7RZuAbYUTTLNvtvcLIcoKZyBm1Fc0bujn
c0nar1XhS8gyhnb4KdWB1o9Iwjjta11fumH2uJAJqFmun/twn6W03CKTSrYrP6Bi
TL5LdeCtKgWH5meSJ4mgK3Hqxk4ZqfvJXJ/X1eSHEA0b90j0ELmqD8mzkwtZ2Hb0
8myoX2T0aIxdiZdeeuZjQ9CZPdeMiMXBGC7sAgAfVMZNf04u6+gQyzmsrkm9wo7H
Y8j24diDOQcjRi1Q7MBy0Bls5FO+3wRhRK742/bY8RJfMq2CE94B8rpInxU4lB+w
2jGJrOwCE4TUPiqW8YsAtbCTb8oKlmpCDb0kapnGv1OElxg0qhXjWuah+at2QCc6
GfmdFzX75V1qJOuy2g/vDRg4fNddKoCFkN1wms6867o95+j3A28=
=rmjy
-----END PGP SIGNATURE-----
Merge tag 'samsung-dt-6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into soc/dt
Samsung DTS ARM changes for v6.9
1. Disable thermal polling by Linux in Eynos5422 Odroid XU3 boards,
because drivers implement now proper dynamic trip points management.
2. Mark crosc-ec-spi in Peach Pi and Peach Pit as wake-up source, to
reflect the hardware capabilities.
3. Samsung P4 Note (Exynos4412): add accelerometer.
4. Samsung Galaxy Tab (Exynos5420):
- Reduce available RAM to avoid conflict with TrustZone.
- Add WiFi on MMC.
* tag 'samsung-dt-6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
ARM: dts: samsung: exynos5420-galaxy-tab-common: add wifi node
ARM: dts: samsung: exynos5420-galaxy-tab: decrease available memory
ARM: dts: samsung: exynos4412-p4note: add accelerometer and gyro to p4note
ARM: dts: samsung: exynos5800-peach: Enable cros-ec-spi as wake source
ARM: dts: samsung: exynos5420-peach: Enable cros-ec-spi as wake source
ARM: dts: samsung: exynos5422-odroidxu3: disable thermal polling
Link: https://lore.kernel.org/r/20240218182141.31213-3-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
eaab725ba2
|
|
@ -362,6 +362,39 @@ &hsotg {
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
&i2c_1 {
|
||||
samsung,i2c-sda-delay = <100>;
|
||||
samsung,i2c-slave-addr = <0x10>;
|
||||
samsung,i2c-max-bus-freq = <400000>;
|
||||
pinctrl-0 = <&i2c1_bus>;
|
||||
pinctrl-names = "default";
|
||||
status = "okay";
|
||||
|
||||
accelerometer@19 {
|
||||
compatible = "st,lsm330dlc-accel";
|
||||
reg = <0x19>;
|
||||
interrupt-parent = <&gpx0>;
|
||||
interrupts = <0 IRQ_TYPE_EDGE_RISING>;
|
||||
pinctrl-0 = <&accelerometer_irq>;
|
||||
pinctrl-names = "default";
|
||||
mount-matrix = "1", "0", "0",
|
||||
"0", "-1", "0",
|
||||
"0", "0", "-1";
|
||||
};
|
||||
|
||||
gyro@6b {
|
||||
compatible = "st,lsm330dlc-gyro";
|
||||
reg = <0x6b>;
|
||||
interrupt-parent = <&gpx0>;
|
||||
interrupts = <6 IRQ_TYPE_EDGE_RISING>;
|
||||
pinctrl-0 = <&gyro_data_enable &gyro_irq>;
|
||||
pinctrl-names = "default";
|
||||
mount-matrix = "1", "0", "0",
|
||||
"0", "-1", "0",
|
||||
"0", "0", "-1";
|
||||
};
|
||||
};
|
||||
|
||||
&i2c_3 {
|
||||
samsung,i2c-sda-delay = <100>;
|
||||
samsung,i2c-slave-addr = <0x10>;
|
||||
|
|
@ -844,6 +877,12 @@ bt_shutdown: bt-shutdown-pins {
|
|||
samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
|
||||
};
|
||||
|
||||
gyro_data_enable: gyro-data-enable-pins {
|
||||
samsung,pins = "gpl2-0";
|
||||
samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;
|
||||
samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
|
||||
};
|
||||
|
||||
uart_sel: uart-sel-pins {
|
||||
samsung,pins = "gpl2-7";
|
||||
samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;
|
||||
|
|
@ -894,12 +933,24 @@ ak8975_irq: ak8975-irq-pins {
|
|||
samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
|
||||
};
|
||||
|
||||
accelerometer_irq: accelerometer-irq-pins {
|
||||
samsung,pins = "gpx0-0";
|
||||
samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
|
||||
samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
|
||||
};
|
||||
|
||||
stmpe_adc_irq: stmpe-adc-irq-pins {
|
||||
samsung,pins = "gpx0-1";
|
||||
samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
|
||||
samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
|
||||
};
|
||||
|
||||
gyro_irq: gyro-irq-pins {
|
||||
samsung,pins = "gpx0-6";
|
||||
samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
|
||||
samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
|
||||
};
|
||||
|
||||
max77686_irq: max77686-irq-pins {
|
||||
samsung,pins = "gpx0-7";
|
||||
samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ / {
|
|||
|
||||
aliases {
|
||||
mmc0 = &mmc_0;
|
||||
mmc1 = &mmc_1;
|
||||
mmc2 = &mmc_2;
|
||||
};
|
||||
|
||||
|
|
@ -39,7 +40,7 @@ chosen {
|
|||
|
||||
memory@20000000 {
|
||||
device_type = "memory";
|
||||
reg = <0x20000000 0xc0000000>;
|
||||
reg = <0x20000000 0xbfa00000>;
|
||||
};
|
||||
|
||||
firmware@2073000 {
|
||||
|
|
@ -87,6 +88,13 @@ key-volume-down {
|
|||
linux,code = <KEY_VOLUMEDOWN>;
|
||||
};
|
||||
};
|
||||
|
||||
mmc1_pwrseq: pwrseq {
|
||||
compatible = "mmc-pwrseq-simple";
|
||||
reset-gpios = <&gpy7 7 GPIO_ACTIVE_LOW>;
|
||||
clocks = <&s2mps11_osc S2MPS11_CLK_BT>;
|
||||
clock-names = "ext_clock";
|
||||
};
|
||||
};
|
||||
|
||||
&cci {
|
||||
|
|
@ -620,6 +628,25 @@ &mmc_0 {
|
|||
vqmmc-supply = <&ldo3_reg>;
|
||||
};
|
||||
|
||||
/* WiFi */
|
||||
&mmc_1 {
|
||||
bus-width = <4>;
|
||||
cap-sd-highspeed;
|
||||
cap-sdio-irq;
|
||||
card-detect-delay = <200>;
|
||||
keep-power-in-suspend;
|
||||
mmc-pwrseq = <&mmc1_pwrseq>;
|
||||
non-removable;
|
||||
pinctrl-0 = <&sd1_clk>, <&sd1_cmd>, <&sd1_int>, <&sd1_bus1>,
|
||||
<&sd1_bus4>, <&wifi_en>;
|
||||
pinctrl-names = "default";
|
||||
vqmmc-supply = <&ldo2_reg>;
|
||||
samsung,dw-mshc-ciu-div = <1>;
|
||||
samsung,dw-mshc-ddr-timing = <0 2>;
|
||||
samsung,dw-mshc-sdr-timing = <0 1>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
/* External sdcard */
|
||||
&mmc_2 {
|
||||
status = "okay";
|
||||
|
|
@ -649,6 +676,11 @@ s2mps11_irq: s2mps11-irq-pins {
|
|||
samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
|
||||
samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
|
||||
};
|
||||
|
||||
wifi_en: wifi-en-pins {
|
||||
samsung,pins = "gpy7-7";
|
||||
samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
|
||||
};
|
||||
};
|
||||
|
||||
&rtc {
|
||||
|
|
|
|||
|
|
@ -967,6 +967,7 @@ cros_ec: cros-ec@0 {
|
|||
reg = <0>;
|
||||
spi-max-frequency = <3125000>;
|
||||
google,has-vbc-nvram;
|
||||
wakeup-source;
|
||||
|
||||
controller-data {
|
||||
samsung,spi-feedback-delay = <1>;
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ fan0: pwm-fan {
|
|||
thermal-zones {
|
||||
cpu0_thermal: cpu0-thermal {
|
||||
thermal-sensors = <&tmu_cpu0>;
|
||||
polling-delay-passive = <250>;
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
trips {
|
||||
cpu0_alert0: cpu-alert-0 {
|
||||
|
|
@ -78,12 +78,6 @@ cpu0_crit0: cpu-crit-0 {
|
|||
hysteresis = <0>; /* millicelsius */
|
||||
type = "critical";
|
||||
};
|
||||
/*
|
||||
* Exynos542x supports only 4 trip-points
|
||||
* so for these polling mode is required.
|
||||
* Start polling at temperature level of last
|
||||
* interrupt-driven trip: cpu0_alert2
|
||||
*/
|
||||
cpu0_alert3: cpu-alert-3 {
|
||||
temperature = <70000>; /* millicelsius */
|
||||
hysteresis = <10000>; /* millicelsius */
|
||||
|
|
@ -144,7 +138,7 @@ cpu0_cooling_map4: map4 {
|
|||
};
|
||||
cpu1_thermal: cpu1-thermal {
|
||||
thermal-sensors = <&tmu_cpu1>;
|
||||
polling-delay-passive = <250>;
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
trips {
|
||||
cpu1_alert0: cpu-alert-0 {
|
||||
|
|
@ -217,7 +211,7 @@ cpu1_cooling_map4: map4 {
|
|||
};
|
||||
cpu2_thermal: cpu2-thermal {
|
||||
thermal-sensors = <&tmu_cpu2>;
|
||||
polling-delay-passive = <250>;
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
trips {
|
||||
cpu2_alert0: cpu-alert-0 {
|
||||
|
|
@ -290,7 +284,7 @@ cpu2_cooling_map4: map4 {
|
|||
};
|
||||
cpu3_thermal: cpu3-thermal {
|
||||
thermal-sensors = <&tmu_cpu3>;
|
||||
polling-delay-passive = <250>;
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
trips {
|
||||
cpu3_alert0: cpu-alert-0 {
|
||||
|
|
@ -363,7 +357,7 @@ cpu3_cooling_map4: map4 {
|
|||
};
|
||||
gpu_thermal: gpu-thermal {
|
||||
thermal-sensors = <&tmu_gpu>;
|
||||
polling-delay-passive = <250>;
|
||||
polling-delay-passive = <0>;
|
||||
polling-delay = <0>;
|
||||
trips {
|
||||
gpu_alert0: gpu-alert-0 {
|
||||
|
|
|
|||
|
|
@ -949,6 +949,7 @@ cros_ec: cros-ec@0 {
|
|||
reg = <0>;
|
||||
spi-max-frequency = <3125000>;
|
||||
google,has-vbc-nvram;
|
||||
wakeup-source;
|
||||
|
||||
controller-data {
|
||||
samsung,spi-feedback-delay = <1>;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user