Commit 86a24899 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'stm32-dt-for-v5.12-1' of... 

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

STM32 DT updates for v5.12, round 1

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

MCU part:
 -Rename mmc nodes to match with yaml validation.

MPU part:
 -Rename mmc nodes to match with yaml validation.
 -Move vdda1v1 & vdda1v8 (used by usbphyc) from boards files
  to SoC dtsi file.

 -LXA:
  -Fix leds schema for yaml validation.

 -DH:
  -Enable SDMMC1 internal pull-ups and disable CKIN feedabck clock
   on DHCOM.
  -Add SDMMC1 init state inorder to use some gpios during probing phase.
  -Disable KS8851 and FMC on PicoITX board.

* tag 'stm32-dt-for-v5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
  ARM: dts: stm32: add #clock-cells property to usbphyc node on stm32mp151
  ARM: dts: stm32: remove usbphyc ports vdda1v1 & vdda1v8 on stm32mp15 boards
  ARM: dts: stm32: add usbphyc vdda1v1 and vdda1v8 supplies on stm32mp151
  ARM: dts: stm32: Add STM32MP1 I2C6 SDA/SCL pinmux
  ARM: dts: stm32: Rename mmc controller nodes to mmc@
  ARM: dts: stm32: Enable voltage translator auto-detection on DHCOM
  ARM: dts: stm32: Add additional init state for SDMMC1 pins
  ARM: dts: stm32: Disable KS8851 and FMC on PicoITX board
  ARM: dts: stm32: Fix schema warnings for pwm-leds on lxa-mc1
  ARM: dts: stm32: Disable SDMMC1 CKIN feedback clock on DHCOM
  ARM: dts: stm32: Enable internal pull-ups for SDMMC1 on DHCOM SoM
  ARM: dts: stm32: Fix GPIO hog flags on DHCOM DRC02
  ARM: dts: stm32: Fix GPIO hog flags on DHCOM PicoITX
  ARM: dts: stm32: Fix GPIO hog names on DHCOM
  ARM: dts: stm32: Disable optional TSC2004 on DRC02 board
  ARM: dts: stm32: Disable WP on DHCOM uSD slot
  ARM: dts: stm32: Connect card-detect signal on DHCOM
  ARM: dts: stm32: Fix polarity of the DH DRC02 uSD card detect

Link: https://lore.kernel.org/r/5e8897a0-8f68-5e41-bfa0-ccdf1e23a3c1@foss.st.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents af911564 36be90f5

arch/arm/boot/dts/stm32f429.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -566,7 +566,7 @@ adc3: adc@200 { 
			};

		};



		sdio: sdio@40012c00 {

		sdio: mmc@40012c00 {

			compatible = "arm,pl180", "arm,primecell";

			arm,primecell-periphid = <0x00880180>;

			reg = <0x40012c00 0x400>;

arch/arm/boot/dts/stm32f746.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -473,7 +473,7 @@ usart6: serial@40011400 { 
			status = "disabled";

		};



		sdio2: sdio2@40011c00 {

		sdio2: mmc@40011c00 {

			compatible = "arm,pl180", "arm,primecell";

			arm,primecell-periphid = <0x00880180>;

			reg = <0x40011c00 0x400>;
@@ -484,7 +484,7 @@ sdio2: sdio2@40011c00 { 
			status = "disabled";

		};



		sdio1: sdio1@40012c00 {

		sdio1: mmc@40012c00 {

			compatible = "arm,pl180", "arm,primecell";

			arm,primecell-periphid = <0x00880180>;

			reg = <0x40012c00 0x400>;

arch/arm/boot/dts/stm32h743.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ mdma1: dma-controller@52000000 { 
			dma-requests = <32>;

		};



		sdmmc1: sdmmc@52007000 {

		sdmmc1: mmc@52007000 {

			compatible = "arm,pl18x", "arm,primecell";

			arm,primecell-periphid = <0x10153180>;

			reg = <0x52007000 0x1000>;

arch/arm/boot/dts/stm32mp15-pinctrl.dtsi

+40 −0
Original line number Diff line number Diff line
@@ -1273,6 +1273,18 @@ pins3 { 
		};

	};



	sdmmc1_b4_init_pins_a: sdmmc1-b4-init-0 {

		pins1 {

			pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDMMC1_D0 */

				 <STM32_PINMUX('C', 9, AF12)>, /* SDMMC1_D1 */

				 <STM32_PINMUX('C', 10, AF12)>, /* SDMMC1_D2 */

				 <STM32_PINMUX('C', 11, AF12)>; /* SDMMC1_D3 */

			slew-rate = <1>;

			drive-push-pull;

			bias-disable;

		};

	};



	sdmmc1_b4_sleep_pins_a: sdmmc1-b4-sleep-0 {

		pins {

			pinmux = <STM32_PINMUX('C', 8, ANALOG)>, /* SDMMC1_D0 */
@@ -1299,6 +1311,17 @@ pins2{ 
		};

	};



	sdmmc1_dir_init_pins_a: sdmmc1-dir-init-0 {

		pins1 {

			pinmux = <STM32_PINMUX('F', 2, AF11)>, /* SDMMC1_D0DIR */

				 <STM32_PINMUX('C', 7, AF8)>, /* SDMMC1_D123DIR */

				 <STM32_PINMUX('B', 9, AF11)>; /* SDMMC1_CDIR */

			slew-rate = <1>;

			drive-push-pull;

			bias-pull-up;

		};

	};



	sdmmc1_dir_sleep_pins_a: sdmmc1-dir-sleep-0 {

		pins {

			pinmux = <STM32_PINMUX('F', 2, ANALOG)>, /* SDMMC1_D0DIR */
@@ -2018,6 +2041,23 @@ pins { 
		};

	};



	i2c6_pins_a: i2c6-0 {

		pins {

			pinmux = <STM32_PINMUX('Z', 6, AF2)>, /* I2C6_SCL */

				 <STM32_PINMUX('Z', 7, AF2)>; /* I2C6_SDA */

			bias-disable;

			drive-open-drain;

			slew-rate = <0>;

		};

	};



	i2c6_sleep_pins_a: i2c6-sleep-0 {

		pins {

			pinmux = <STM32_PINMUX('Z', 6, ANALOG)>, /* I2C6_SCL */

				 <STM32_PINMUX('Z', 7, ANALOG)>; /* I2C6_SDA */

		};

	};



	spi1_pins_a: spi1-0 {

		pins1 {

			pinmux = <STM32_PINMUX('Z', 0, AF5)>, /* SPI1_SCK */

arch/arm/boot/dts/stm32mp151.dtsi

+6 −3
Original line number Diff line number Diff line
@@ -1047,7 +1047,7 @@ adc2: adc@100 { 
			};

		};



		sdmmc3: sdmmc@48004000 {

		sdmmc3: mmc@48004000 {

			compatible = "arm,pl18x", "arm,primecell";

			arm,primecell-periphid = <0x00253180>;

			reg = <0x48004000 0x400>;
@@ -1368,7 +1368,7 @@ qspi: spi@58003000 { 
			status = "disabled";

		};



		sdmmc1: sdmmc@58005000 {

		sdmmc1: mmc@58005000 {

			compatible = "arm,pl18x", "arm,primecell";

			arm,primecell-periphid = <0x00253180>;

			reg = <0x58005000 0x1000>;
@@ -1383,7 +1383,7 @@ sdmmc1: sdmmc@58005000 { 
			status = "disabled";

		};



		sdmmc2: sdmmc@58007000 {

		sdmmc2: mmc@58007000 {

			compatible = "arm,pl18x", "arm,primecell";

			arm,primecell-periphid = <0x00253180>;

			reg = <0x58007000 0x1000>;
@@ -1482,10 +1482,13 @@ iwdg2: watchdog@5a002000 { 
		usbphyc: usbphyc@5a006000 {

			#address-cells = <1>;

			#size-cells = <0>;

			#clock-cells = <0>;

			compatible = "st,stm32mp1-usbphyc";

			reg = <0x5a006000 0x1000>;

			clocks = <&rcc USBPHY_K>;

			resets = <&rcc USBPHY_R>;

			vdda1v1-supply = <&reg11>;

			vdda1v8-supply = <&reg18>;

			status = "disabled";



			usbphyc_port0: usb-phy@0 {