Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfbecbc7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Pull "STM32 DT updates for v4.17, round 1" from Alexandre Torgue:

Highlights:
-----------
 -Add support of STM32MP157 MPU and stm32mp157c eval board
 -Add SD supports on F4 and F7 boards
 -Add leds support on stm32f469 and stm32f769 disco boards
 -Add push button support on stm32f469 and stm32f769 disco boards
 -Add EXTI, SPI, RTC, USB HS/FS support on STM32H743 MCU
 -Add RTC and USB OTG HS on stm32f769-disco
 -Use dedicated files for F7 pinctrl

* tag 'stm32-dt-for-v4.17-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32: (34 commits)
  ARM: dts: stm32: Fix sdio2 rcc hard coded value
  dt-bindings: mfd: Add STM32F7 SDMMC2 rcc entry
  ARM: dts: stm32: Enable sdio1 for stm32f769-disco
  ARM: dts: stm32: Enable sdio1 for stm32f746-eval
  ARM: dts: stm32: Enable sdio1 for stm32f746-disco
  ARM: dts: stm32: Add sdio pins definition for stm32f7
  ARM: dts: stm32: add SPI support on STM32H743 SoC
  ARM: dts: stm32: enable RTC on stm32h743i-eval
  ARM: dts: stm32: add RTC support on STM32H743
  ARM: dts: stm32: enable USB OTG HS on stm32h743i-eval
  ARM: dts: stm32: add USB OTG HS and FS support for STM32H743 SoC
  ARM: dts: stm32: enable RTC on stm32f769-disco
  ARM: dts: stm32: enable USB HS on stm32f769-disco
  ARM: dts: stm32: select otg mode for usbotg_hs on stm32746g_eval
  ARM: dts: stm32: add gadget fifo sizes to usbotg_hs on stm32f746
  ARM: dts: stm32: Add push button to stm32f769 Discovery board
  ARM: dts: stm32: Add push button to stm32f469 Discovery board
  ARM: dts: stm32: Add leds support to stm32f769 Discovery board
  ARM: dts: stm32: Add leds support to stm32f469 Discovery board
  ARM: dts: stm32: Fix HSE clock frequency for stm32h743i-disco board
  ...
parents 0517a093 193ca00b

Documentation/devicetree/bindings/arm/stm32.txt

+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ using one of the following compatible strings: 
  st,stm32f469

  st,stm32f746

  st,stm32h743

  st,stm32mp157

Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ Required properies: 
   "st,stm32f429-pinctrl"

   "st,stm32f469-pinctrl"

   "st,stm32f746-pinctrl"

   "st,stm32f769-pinctrl"

   "st,stm32h743-pinctrl"

   "st,stm32mp157-pinctrl"

   "st,stm32mp157-z-pinctrl"

arch/arm/boot/dts/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -874,7 +874,9 @@ dtb-$(CONFIG_ARCH_STM32)+= \ 
	stm32429i-eval.dtb \

	stm32746g-eval.dtb \

	stm32h743i-eval.dtb \

	stm32h743i-disco.dtb

	stm32h743i-disco.dtb \

	stm32mp157c-ed1.dtb \

	stm32mp157c-ev1.dtb

dtb-$(CONFIG_MACH_SUN4I) += \

	sun4i-a10-a1000.dtb \

	sun4i-a10-ba10-tvbox.dtb \

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

+19 −0
Original line number Diff line number Diff line
@@ -144,6 +144,13 @@ 
			};

		};

	};



	mmc_vcard: mmc_vcard {

		compatible = "regulator-fixed";

		regulator-name = "mmc_vcard";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};

};



&adc {
@@ -254,6 +261,18 @@ 
	status = "okay";

};



&sdio {

	status = "okay";

	vmmc-supply = <&mmc_vcard>;

	cd-gpios = <&stmpegpio 15 GPIO_ACTIVE_HIGH>;

	cd-inverted;

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

	pinctrl-0 = <&sdio_pins>;

	pinctrl-1 = <&sdio_pins_od>;

	bus-width = <4>;

	max-frequency = <12500000>;

};



&timers1 {

	status = "okay";

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

+19 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 


/dts-v1/;

#include "stm32f746.dtsi"

#include "stm32f746-pinctrl.dtsi"

#include <dt-bindings/input/input.h>



/ {
@@ -90,6 +91,13 @@ 
		clocks = <&rcc 0 STM32F7_AHB1_CLOCK(OTGHSULPI)>;

		clock-names = "main_clk";

	};



	mmc_vcard: mmc_vcard {

		compatible = "regulator-fixed";

		regulator-name = "mmc_vcard";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};

};



&clk_hse {
@@ -112,6 +120,16 @@ 
	status = "okay";

};



&sdio1 {

	status = "okay";

	vmmc-supply = <&mmc_vcard>;

	broken-cd;

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

	pinctrl-0 = <&sdio_pins_a>;

	pinctrl-1 = <&sdio_pins_od_a>;

	bus-width = <4>;

};



&usart1 {

	pinctrl-0 = <&usart1_pins_a>;

	pinctrl-names = "default";
@@ -119,7 +137,7 @@ 
};



&usbotg_hs {

	dr_mode = "host";

	dr_mode = "otg";

	phys = <&usbotg_hs_phy>;

	phy-names = "usb2-phy";

	pinctrl-0 = <&usbotg_hs_pins_a>;