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

Commit fb5d492d authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

STM32 DT updates for v4.10, round 1.

Highlights:
----------
 - Add LSI and LSE clocks support for STM32F429
 - Add GPIO IRQ support for STM32F429
 - Declare push button as GPIO keys on STM32F429 boards
 - Add DMA supports on USART1 & USART3 on STM32F429
 - Add Ethernet fixes

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

:
  ARM: dts: stm32f429: add LSI and LSE clocks
  ARM: dts: stm32f429: remove Ethernet wake on Lan support
  ARM: dts: stm32f429: Fix Ethernet node on Eval Board
  ARM: dts: stm32f429: Align Ethernet node with new bindings properties
  ARM: DT: stm32: move dma translation to board files
  ARM: DT: STM32: add dma for usart3 on F429
  ARM: DT: STM32: add dma for usart1 on F429
  ARM: dts: Declare push button as GPIO key on stm32f429 boards
  ARM: dts: Add GPIO irq support to STM32F429

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 403936bb f6dbbff4

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

+26 −3
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 


/dts-v1/;

#include "stm32f429.dtsi"

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



/ {

	model = "STMicroelectronics STM32429i-EVAL board";
@@ -65,6 +66,10 @@ 
		serial0 = &usart1;

	};



	soc {

		dma-ranges = <0xc0000000 0x0 0x10000000>;

	};



	leds {

		compatible = "gpio-leds";

		green {
@@ -82,6 +87,23 @@ 
		};

	};



	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;

		autorepeat;

		button@0 {

			label = "Wake up";

			linux,code = <KEY_WAKEUP>;

			gpios = <&gpioa 0 0>;

		};

		button@1 {

			label = "Tamper";

			linux,code = <KEY_RESTART>;

			gpios = <&gpioc 13 0>;

		};

	};



	usbotg_hs_phy: usbphy {

		#phy-cells = <0>;

		compatible = "usb-nop-xceiv";
@@ -94,11 +116,12 @@ 
	clock-frequency = <25000000>;

};



&ethernet0 {

&mac {

	status = "okay";

	pinctrl-0	= <&ethernet0_mii>;

	pinctrl-0	= <&ethernet_mii>;

	pinctrl-names	= "default";

	phy-mode	= "mii-id";

	phy-mode	= "mii";

	phy-handle	= <&phy1>;

	mdio0 {

		#address-cells = <1>;

		#size-cells = <0>;

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

+13 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 


/dts-v1/;

#include "stm32f429.dtsi"

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



/ {

	model = "STMicroelectronics STM32F429i-DISCO board";
@@ -75,6 +76,18 @@ 
			linux,default-trigger = "heartbeat";

		};

	};



	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;

		autorepeat;

		button@0 {

			label = "User";

			linux,code = <KEY_HOME>;

			gpios = <&gpioa 0 0>;

		};

	};

};



&clk_hse {

arch/arm/boot/dts/stm32f429.dtsi

+31 −9
Original line number Diff line number Diff line
@@ -56,11 +56,21 @@ 
			compatible = "fixed-clock";

			clock-frequency = <0>;

		};



		clk-lse {

			#clock-cells = <0>;

			compatible = "fixed-clock";

			clock-frequency = <32768>;

		};



	soc {

		dma-ranges = <0xc0000000 0x0 0x10000000>;

		clk-lsi {

			#clock-cells = <0>;

			compatible = "fixed-clock";

			clock-frequency = <32000>;

		};

	};



	soc {

		timer2: timer@40000000 {

			compatible = "st,stm32-timer";

			reg = <0x40000000 0x400>;
@@ -122,6 +132,9 @@ 
			interrupts = <39>;

			clocks = <&rcc 0 146>;

			status = "disabled";

			dmas = <&dma1 1 4 0x400 0x0>,

			       <&dma1 3 4 0x400 0x0>;

			dma-names = "rx", "tx";

		};



		usart4: serial@40004c00 {
@@ -162,6 +175,9 @@ 
			interrupts = <37>;

			clocks = <&rcc 0 164>;

			status = "disabled";

			dmas = <&dma2 2 4 0x400 0x0>,

			       <&dma2 7 4 0x400 0x0>;

			dma-names = "rx", "tx";

		};



		usart6: serial@40011400 {
@@ -185,11 +201,18 @@ 
			interrupts = <1>, <2>, <3>, <6>, <7>, <8>, <9>, <10>, <23>, <40>, <41>, <42>, <62>, <76>;

		};



		pwrcfg: power-config@40007000 {

			compatible = "syscon";

			reg = <0x40007000 0x400>;

		};



		pin-controller {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "st,stm32f429-pinctrl";

			ranges = <0 0x40020000 0x3000>;

			interrupt-parent = <&exti>;

			st,syscfg = <&syscfg 0x8>;

			pins-are-numbered;



			gpioa: gpio@40020000 {
@@ -313,7 +336,7 @@ 
				};

			};



			ethernet0_mii: mii@0 {

			ethernet_mii: mii@0 {

				pins {

					pinmux = <STM32F429_PG13_FUNC_ETH_MII_TXD0_ETH_RMII_TXD0>,

						 <STM32F429_PG14_FUNC_ETH_MII_TXD1_ETH_RMII_TXD1>,
@@ -340,6 +363,7 @@ 
			compatible = "st,stm32f42xx-rcc", "st,stm32-rcc";

			reg = <0x40023800 0x400>;

			clocks = <&clk_hse>;

			st,syscfg = <&pwrcfg>;

		};



		dma1: dma-controller@40026000 {
@@ -373,24 +397,22 @@ 
			st,mem2mem;

		};



		ethernet0: dwmac@40028000 {

		mac: ethernet@40028000 {

			compatible = "st,stm32-dwmac", "snps,dwmac-3.50a";

			reg = <0x40028000 0x8000>;

			reg-names = "stmmaceth";

			interrupts = <61>, <62>;

			interrupt-names = "macirq", "eth_wake_irq";

			clock-names = "stmmaceth", "tx-clk", "rx-clk";

			interrupts = <61>;

			interrupt-names = "macirq";

			clock-names = "stmmaceth", "mac-clk-tx", "mac-clk-rx";

			clocks = <&rcc 0 25>, <&rcc 0 26>, <&rcc 0 27>;

			st,syscon = <&syscfg 0x4>;

			snps,pbl = <8>;

			snps,mixed-burst;

			dma-ranges;

			status = "disabled";

		};



		usbotg_hs: usb@40040000 {

			compatible = "snps,dwc2";

			dma-ranges;

			reg = <0x40040000 0x40000>;

			interrupts = <77>;

			clocks = <&rcc 0 29>;

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

+4 −0
Original line number Diff line number Diff line
@@ -64,6 +64,10 @@ 
	aliases {

		serial0 = &usart3;

	};



	soc {

		dma-ranges = <0xc0000000 0x0 0x10000000>;

	};

};



&clk_hse {