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

Merge tag 'stm32-dt-for-v4.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into next/dt

STM32 DT updates for v4.20, round 1

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

- MCU platforms update:
- Add missing clock node's lobel on stm32f429
- Remove cd-inverted property for sdio nodes for all mcus
- Fix stm32h7 rtc binding

- MPU STM32MP157 platform update:
- Enable display: CEC and DSI
- Fix SPI node name to match with the new DTC

* tag 'stm32-dt-for-v4.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
ARM: dts: stm32: Fix SPI controller node names
ARM: dts: stm32: enable display on stm32mp157c-ev1 board
ARM: dts: stm32: update rtc st,syscfg property on stm32h743
ARM: dts: stm32: Remove cd-inverted property for stm32f746-disco
ARM: dts: stm32: Remove cd-inverted property for stm32f769-disco
ARM: dts: stm32: Remove cd-inverted property for stm32f469-disco
ARM: dts: stm32: Remove cd-inverted property for stm32429i-eval
ARM: dts: stm32: Add clk-lse node's label on stm32f429

Signed-off-by: Olof Johansson <olof@lixom.net>

+74 -17
+1 -2
arch/arm/boot/dts/stm32429i-eval.dts
··· 264 264 &sdio { 265 265 status = "okay"; 266 266 vmmc-supply = <&mmc_vcard>; 267 - cd-gpios = <&stmpegpio 15 GPIO_ACTIVE_HIGH>; 268 - cd-inverted; 267 + cd-gpios = <&stmpegpio 15 GPIO_ACTIVE_LOW>; 269 268 pinctrl-names = "default", "opendrain"; 270 269 pinctrl-0 = <&sdio_pins>; 271 270 pinctrl-1 = <&sdio_pins_od>;
+1 -1
arch/arm/boot/dts/stm32f429.dtsi
··· 58 58 clock-frequency = <0>; 59 59 }; 60 60 61 - clk-lse { 61 + clk_lse: clk-lse { 62 62 #clock-cells = <0>; 63 63 compatible = "fixed-clock"; 64 64 clock-frequency = <32768>;
+1 -2
arch/arm/boot/dts/stm32f469-disco.dts
··· 210 210 &sdio { 211 211 status = "okay"; 212 212 vmmc-supply = <&mmc_vcard>; 213 - cd-gpios = <&gpiog 2 GPIO_ACTIVE_HIGH>; 214 - cd-inverted; 213 + cd-gpios = <&gpiog 2 GPIO_ACTIVE_LOW>; 215 214 broken-cd; 216 215 pinctrl-names = "default", "opendrain"; 217 216 pinctrl-0 = <&sdio_pins>;
+1 -2
arch/arm/boot/dts/stm32f746-disco.dts
··· 101 101 &sdio1 { 102 102 status = "okay"; 103 103 vmmc-supply = <&mmc_vcard>; 104 - cd-gpios = <&gpioc 13 GPIO_ACTIVE_HIGH>; 105 - cd-inverted; 104 + cd-gpios = <&gpioc 13 GPIO_ACTIVE_LOW>; 106 105 pinctrl-names = "default", "opendrain"; 107 106 pinctrl-0 = <&sdio_pins_a>; 108 107 pinctrl-1 = <&sdio_pins_od_a>;
+1 -2
arch/arm/boot/dts/stm32f769-disco.dts
··· 126 126 &sdio2 { 127 127 status = "okay"; 128 128 vmmc-supply = <&mmc_vcard>; 129 - cd-gpios = <&gpioi 15 GPIO_ACTIVE_HIGH>; 130 - cd-inverted; 129 + cd-gpios = <&gpioi 15 GPIO_ACTIVE_LOW>; 131 130 broken-cd; 132 131 pinctrl-names = "default", "opendrain"; 133 132 pinctrl-0 = <&sdio_pins_b>;
+1 -1
arch/arm/boot/dts/stm32h743.dtsi
··· 472 472 interrupt-parent = <&exti>; 473 473 interrupts = <17 IRQ_TYPE_EDGE_RISING>; 474 474 interrupt-names = "alarm"; 475 - st,syscfg = <&pwrcfg>; 475 + st,syscfg = <&pwrcfg 0x00 0x100>; 476 476 status = "disabled"; 477 477 }; 478 478
+67 -6
arch/arm/boot/dts/stm32mp157c-ev1.dts
··· 6 6 /dts-v1/; 7 7 8 8 #include "stm32mp157c-ed1.dts" 9 + #include <dt-bindings/gpio/gpio.h> 9 10 10 11 / { 11 12 model = "STMicroelectronics STM32MP157C eval daughter on eval mother"; ··· 19 18 aliases { 20 19 serial0 = &uart4; 21 20 ethernet0 = &ethernet0; 21 + }; 22 + 23 + panel_backlight: panel-backlight { 24 + compatible = "gpio-backlight"; 25 + gpios = <&gpiod 13 GPIO_ACTIVE_LOW>; 26 + default-on; 27 + status = "okay"; 28 + }; 29 + }; 30 + 31 + &cec { 32 + pinctrl-names = "default"; 33 + pinctrl-0 = <&cec_pins_a>; 34 + status = "okay"; 35 + }; 36 + 37 + &dsi { 38 + #address-cells = <1>; 39 + #size-cells = <0>; 40 + status = "okay"; 41 + 42 + ports { 43 + #address-cells = <1>; 44 + #size-cells = <0>; 45 + 46 + port@0 { 47 + reg = <0>; 48 + dsi_in: endpoint { 49 + remote-endpoint = <&ltdc_ep0_out>; 50 + }; 51 + }; 52 + 53 + port@1 { 54 + reg = <1>; 55 + dsi_out: endpoint { 56 + remote-endpoint = <&dsi_panel_in>; 57 + }; 58 + }; 59 + }; 60 + 61 + panel-dsi@0 { 62 + compatible = "raydium,rm68200"; 63 + reg = <0>; 64 + reset-gpios = <&gpiof 15 GPIO_ACTIVE_LOW>; 65 + backlight = <&panel_backlight>; 66 + status = "okay"; 67 + 68 + port { 69 + dsi_panel_in: endpoint { 70 + remote-endpoint = <&dsi_out>; 71 + }; 72 + }; 22 73 }; 23 74 }; 24 75 ··· 93 40 }; 94 41 }; 95 42 96 - &cec { 97 - pinctrl-names = "default"; 98 - pinctrl-0 = <&cec_pins_a>; 99 - status = "okay"; 100 - }; 101 - 102 43 &i2c2 { 103 44 pinctrl-names = "default"; 104 45 pinctrl-0 = <&i2c2_pins_a>; ··· 107 60 i2c-scl-rising-time-ns = <185>; 108 61 i2c-scl-falling-time-ns = <20>; 109 62 status = "okay"; 63 + }; 64 + 65 + &ltdc { 66 + status = "okay"; 67 + 68 + port { 69 + #address-cells = <1>; 70 + #size-cells = <0>; 71 + 72 + ltdc_ep0_out: endpoint@0 { 73 + reg = <0>; 74 + remote-endpoint = <&dsi_in>; 75 + }; 76 + }; 110 77 }; 111 78 112 79 &m_can1 {
+1 -1
arch/arm/boot/dts/stm32mp157c.dtsi
··· 947 947 dma-requests = <48>; 948 948 }; 949 949 950 - qspi: qspi@58003000 { 950 + qspi: spi@58003000 { 951 951 compatible = "st,stm32f469-qspi"; 952 952 reg = <0x58003000 0x1000>, <0x70000000 0x10000000>; 953 953 reg-names = "qspi", "qspi_mm";