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.14-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into arm/fixes

STM32 DT fixes for v5.14, round 1

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

-Fixes are for DHCOM/DHCOR boards:
- Set HW RTC ad default RTC
- Disable EDPD LAN8710 feature as it is not a stable feature.
- Fix touchscreen IRQ line assignment

* tag 'stm32-dt-for-v5.14-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
ARM: dts: stm32: Fix touchscreen IRQ line assignment on DHCOM
ARM: dts: stm32: Disable LAN8710 EDPD on DHCOM
ARM: dts: stm32: Prefer HW RTC on DHCOM SoM

Link: https://lore.kernel.org/r/c0b6031b-2de7-2ef8-71b2-a0af8f475932@foss.st.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

+18 -11
+14 -10
arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi
··· 37 37 poll-interval = <20>; 38 38 39 39 /* 40 - * The EXTi IRQ line 3 is shared with touchscreen and ethernet, 40 + * The EXTi IRQ line 3 is shared with ethernet, 41 41 * so mark this as polled GPIO key. 42 42 */ 43 43 button-0 { 44 44 label = "TA1-GPIO-A"; 45 45 linux,code = <KEY_A>; 46 46 gpios = <&gpiof 3 GPIO_ACTIVE_LOW>; 47 + }; 48 + 49 + /* 50 + * The EXTi IRQ line 6 is shared with touchscreen, 51 + * so mark this as polled GPIO key. 52 + */ 53 + button-1 { 54 + label = "TA2-GPIO-B"; 55 + linux,code = <KEY_B>; 56 + gpios = <&gpiod 6 GPIO_ACTIVE_LOW>; 47 57 }; 48 58 49 59 /* ··· 70 60 gpio-keys { 71 61 compatible = "gpio-keys"; 72 62 73 - button-1 { 74 - label = "TA2-GPIO-B"; 75 - linux,code = <KEY_B>; 76 - gpios = <&gpiod 6 GPIO_ACTIVE_LOW>; 77 - wakeup-source; 78 - }; 79 - 80 63 button-3 { 81 64 label = "TA4-GPIO-D"; 82 65 linux,code = <KEY_D>; ··· 85 82 label = "green:led5"; 86 83 gpios = <&gpioc 6 GPIO_ACTIVE_HIGH>; 87 84 default-state = "off"; 85 + status = "disabled"; 88 86 }; 89 87 90 88 led-1 { ··· 189 185 touchscreen@38 { 190 186 compatible = "edt,edt-ft5406"; 191 187 reg = <0x38>; 192 - interrupt-parent = <&gpiog>; 193 - interrupts = <2 IRQ_TYPE_EDGE_FALLING>; /* GPIO E */ 188 + interrupt-parent = <&gpioc>; 189 + interrupts = <6 IRQ_TYPE_EDGE_FALLING>; /* GPIO E */ 194 190 }; 195 191 }; 196 192
+4 -1
arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi
··· 12 12 aliases { 13 13 ethernet0 = &ethernet0; 14 14 ethernet1 = &ksz8851; 15 + rtc0 = &hwrtc; 16 + rtc1 = &rtc; 15 17 }; 16 18 17 19 memory@c0000000 { ··· 140 138 reset-gpios = <&gpioh 3 GPIO_ACTIVE_LOW>; 141 139 reset-assert-us = <500>; 142 140 reset-deassert-us = <500>; 141 + smsc,disable-energy-detect; 143 142 interrupt-parent = <&gpioi>; 144 143 interrupts = <11 IRQ_TYPE_LEVEL_LOW>; 145 144 }; ··· 251 248 /delete-property/dmas; 252 249 /delete-property/dma-names; 253 250 254 - rtc@32 { 251 + hwrtc: rtc@32 { 255 252 compatible = "microcrystal,rv8803"; 256 253 reg = <0x32>; 257 254 };