Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'stm32-dt-for-v5.10-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into arm/fixes

STM32 DT fixes for v5.10, round 2

Highlights:
-----------

-Fixes are for DHCOM/DHCOR boards:
- Fix TA3-GPIO-C button
- Fix LED5 mapping
- Define VIO regulator supply on DHCOM
- Enable thermal sensor support on stm32mp15xx-dhcor
- Keep VDDA LDO1 always on to avoid leakage

* tag 'stm32-dt-for-v5.10-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
ARM: dts: stm32: Keep VDDA LDO1 always on on DHCOM
ARM: dts: stm32: Enable thermal sensor support on stm32mp15xx-dhcor
ARM: dts: stm32: Define VIO regulator supply on DHCOM
ARM: dts: stm32: Fix LED5 on STM32MP1 DHCOM PDK2
ARM: dts: stm32: Fix TA3-GPIO-C key on STM32MP1 DHCOM PDK2

Link: https://lore.kernel.org/r/65bfc73d-aae1-5309-2e11-1e3da647ad46@st.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

+17 -8
+11 -8
arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi
··· 46 46 linux,code = <KEY_A>; 47 47 gpios = <&gpiof 3 GPIO_ACTIVE_LOW>; 48 48 }; 49 + 50 + /* 51 + * The EXTi IRQ line 0 is shared with PMIC, 52 + * so mark this as polled GPIO key. 53 + */ 54 + button-2 { 55 + label = "TA3-GPIO-C"; 56 + linux,code = <KEY_C>; 57 + gpios = <&gpiog 0 GPIO_ACTIVE_LOW>; 58 + }; 49 59 }; 50 60 51 61 gpio-keys { ··· 66 56 label = "TA2-GPIO-B"; 67 57 linux,code = <KEY_B>; 68 58 gpios = <&gpiod 6 GPIO_ACTIVE_LOW>; 69 - wakeup-source; 70 - }; 71 - 72 - button-2 { 73 - label = "TA3-GPIO-C"; 74 - linux,code = <KEY_C>; 75 - gpios = <&gpioi 11 GPIO_ACTIVE_LOW>; 76 59 wakeup-source; 77 60 }; 78 61 ··· 82 79 83 80 led-0 { 84 81 label = "green:led5"; 85 - gpios = <&gpiog 2 GPIO_ACTIVE_HIGH>; 82 + gpios = <&gpioc 6 GPIO_ACTIVE_HIGH>; 86 83 default-state = "off"; 87 84 }; 88 85
+2
arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi
··· 68 68 gpio = <&gpiog 3 GPIO_ACTIVE_LOW>; 69 69 regulator-always-on; 70 70 regulator-boot-on; 71 + vin-supply = <&vdd>; 71 72 }; 72 73 }; 73 74 ··· 203 202 204 203 vdda: ldo1 { 205 204 regulator-name = "vdda"; 205 + regulator-always-on; 206 206 regulator-min-microvolt = <2900000>; 207 207 regulator-max-microvolt = <2900000>; 208 208 interrupts = <IT_CURLIM_LDO1 0>;
+4
arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi
··· 21 21 }; 22 22 }; 23 23 24 + &dts { 25 + status = "okay"; 26 + }; 27 + 24 28 &i2c4 { 25 29 pinctrl-names = "default"; 26 30 pinctrl-0 = <&i2c4_pins_a>;