Commit 45351fa3 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'stm32-dt-for-v4.20-1' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 0ecee767 1ba23b1d

arch/arm/boot/dts/stm32429i-eval.dts

+1 −2
Original line number Diff line number Diff line
@@ -264,8 +264,7 @@ 
&sdio {

	status = "okay";

	vmmc-supply = <&mmc_vcard>;

	cd-gpios = <&stmpegpio 15 GPIO_ACTIVE_HIGH>;

	cd-inverted;

	cd-gpios = <&stmpegpio 15 GPIO_ACTIVE_LOW>;

	pinctrl-names = "default", "opendrain";

	pinctrl-0 = <&sdio_pins>;

	pinctrl-1 = <&sdio_pins_od>;

arch/arm/boot/dts/stm32f429.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
			clock-frequency = <0>;

		};



		clk-lse {

		clk_lse: clk-lse {

			#clock-cells = <0>;

			compatible = "fixed-clock";

			clock-frequency = <32768>;

arch/arm/boot/dts/stm32f469-disco.dts

+1 −2
Original line number Diff line number Diff line
@@ -210,8 +210,7 @@ 
&sdio {

	status = "okay";

	vmmc-supply = <&mmc_vcard>;

	cd-gpios = <&gpiog 2 GPIO_ACTIVE_HIGH>;

	cd-inverted;

	cd-gpios = <&gpiog 2 GPIO_ACTIVE_LOW>;

	broken-cd;

	pinctrl-names = "default", "opendrain";

	pinctrl-0 = <&sdio_pins>;

arch/arm/boot/dts/stm32f746-disco.dts

+1 −2
Original line number Diff line number Diff line
@@ -101,8 +101,7 @@ 
&sdio1 {

	status = "okay";

	vmmc-supply = <&mmc_vcard>;

	cd-gpios = <&gpioc 13 GPIO_ACTIVE_HIGH>;

	cd-inverted;

	cd-gpios = <&gpioc 13 GPIO_ACTIVE_LOW>;

	pinctrl-names = "default", "opendrain";

	pinctrl-0 = <&sdio_pins_a>;

	pinctrl-1 = <&sdio_pins_od_a>;

arch/arm/boot/dts/stm32f769-disco.dts

+1 −2
Original line number Diff line number Diff line
@@ -126,8 +126,7 @@ 
&sdio2 {

	status = "okay";

	vmmc-supply = <&mmc_vcard>;

	cd-gpios = <&gpioi 15 GPIO_ACTIVE_HIGH>;

	cd-inverted;

	cd-gpios = <&gpioi 15 GPIO_ACTIVE_LOW>;

	broken-cd;

	pinctrl-names = "default", "opendrain";

	pinctrl-0 = <&sdio_pins_b>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE