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

Commit ed50c485 authored Apr 19, 2017 by Olof Johansson

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

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

STM32 DT updates for v4.12, round 1

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

 - ADD RTC support on STM32F746 MCU
 - Enable RTC on STM32F746 Eval board
 - Enable clocks on STM32F746 MCU
 - Enable DMA, pwm1 and pwm3 on STM32F429I Eval
 - Add support of STM32H743 MCU and his Eval board
 - Enable USB HS and FS on STM32F469 Disco board

* tag 'stm32-dt-for-v4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32

:
  dt-bindings: Document the STM32 USB OTG DWC2 core binding
  ARM: dts: stm32: Enable USB HS in FS mode (embedded phy) on stm32f429-disco
  ARM: dts: stm32: Enable USB FS on stm32f469-disco
  ARM: dts: stm32: Add USB FS support for STM32F429 MCU
  ARM: dts: stm32: Add STM32H743 MCU and STM32H743i-EVAL board
  ARM: dts: stm32: Enable pwm1 and pwm3 on stm32f429i-eval
  ARM: dts: stm32: Enable dma by default on stm32f4 adc
  ARM: dts: stm32: enable RTC on stm32746g-eval
  ARM: dts: stm32: Add RTC support for STM32F746 MCU
  ARM: dts: stm32: set HSE_RTC clock frequency to 1 MHz on stm32f746
  dt-bindings: mfd: Add STM32F7 RCC numeric constants into DT include file
  ARM: dts: stm32: Enable clocks for STM32F746 MCU

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

parents a47e3466 21b825e4

Documentation/devicetree/bindings/usb/dwc2.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,10 @@ Required properties:
		- "amlogic,meson-gxbb-usb": The DWC2 USB controller instance in Amlogic S905 SoCs;
		- "amcc,dwc-otg": The DWC2 USB controller instance in AMCC Canyonlands 460EX SoCs;
		- snps,dwc2: A generic DWC2 USB controller with default parameters.
		- "st,stm32f4x9-fsotg": The DWC2 USB FS/HS controller instance in STM32F4x9 SoCs
		configured in FS mode;
		- "st,stm32f4x9-hsotg": The DWC2 USB HS controller instance in STM32F4x9 SoCs
		configured in HS mode;
		- reg : Should contain 1 register range (address and length)
		- interrupts : Should contain 1 interrupt
		- clocks: clock provider specifier

arch/arm/boot/dts/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -776,7 +776,8 @@ dtb-$(CONFIG_ARCH_STM32)+= \
		stm32f429-disco.dtb \
		stm32f469-disco.dtb \
		stm32429i-eval.dtb \
		stm32746g-eval.dtb
		stm32746g-eval.dtb \
		stm32h743i-eval.dtb
		dtb-$(CONFIG_MACH_SUN4I) += \
		sun4i-a10-a1000.dtb \
		sun4i-a10-ba10-tvbox.dtb \

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

+28 −0

Original line number	Diff line number	Diff line
		@@ -167,6 +167,34 @@
		status = "okay";
		};

		&timers1 {
		status = "okay";

		pwm {
		pinctrl-0 = <&pwm1_pins>;
		pinctrl-names = "default";
		status = "okay";
		};

		timer@0 {
		status = "okay";
		};
		};

		&timers3 {
		status = "okay";

		pwm {
		pinctrl-0 = <&pwm3_pins>;
		pinctrl-names = "default";
		status = "okay";
		};

		timer@2 {
		status = "okay";
		};
		};

		&usart1 {
		pinctrl-0 = <&usart1_pins_a>;
		pinctrl-names = "default";

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -89,6 +89,10 @@
		clock-frequency = <25000000>;
		};

		&rtc {
		status = "okay";
		};

		&usart1 {
		pinctrl-0 = <&usart1_pins_a>;
		pinctrl-names = "default";

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

+16 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,14 @@
		gpios = <&gpioa 0 0>;
		};
		};

		/* This turns on vbus for otg for host mode (dwc2) */
		vcc5v_otg: vcc5v-otg-regulator {
		compatible = "regulator-fixed";
		gpio = <&gpioc 4 0>;
		regulator-name = "vcc5_host1";
		regulator-always-on;
		};
		};

		&clk_hse {
		@@ -105,3 +113,11 @@
		pinctrl-names = "default";
		status = "okay";
		};

		&usbotg_hs {
		compatible = "st,stm32f4x9-fsotg";
		dr_mode = "host";
		pinctrl-0 = <&usbotg_fs_pins_b>;
		pinctrl-names = "default";
		status = "okay";
		};