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

Commit 4d66fb81 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Highlights:
-----------
 - Add DMA controller node to stm32f429 MCU
 - Add pinctrl & gpio nodes to stm32f429 MCU
 - Remap stm32429-eval board SD-Ram to 0x0 for performance boost

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

:
  ARM: dts: stm32f429: Boost perfs by remapping SDRAM Bank 1 to 0x0
  ARM: dts: Add leds support to STM32F429 boards
  ARM: dts: Add USART1 pin config to STM32F429 boards
  ARM: dts: Add pinctrl node to STM32F429
  includes: dt-bindings: Add STM32F429 pinctrl DT bindings
  ARM: dts: Add STM32 DMA support for STM32F429 MCU

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 7fa12181 b2aa7f77

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

+20 −1
Original line number Diff line number Diff line
@@ -58,12 +58,29 @@ 
	};



	memory {

		reg = <0xc0000000 0x2000000>;

		reg = <0x00000000 0x2000000>;

	};



	aliases {

		serial0 = &usart1;

	};



	leds {

		compatible = "gpio-leds";

		green {

			gpios = <&gpiog 6 1>;

			linux,default-trigger = "heartbeat";

		};

		orange {

			gpios = <&gpiog 7 1>;

		};

		red {

			gpios = <&gpiog 10 1>;

		};

		blue {

			gpios = <&gpiog 12 1>;

		};

	};

};



&clk_hse {
@@ -71,5 +88,7 @@ 
};



&usart1 {

	pinctrl-0 = <&usart1_pins_a>;

	pinctrl-names = "default";

	status = "okay";

};

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

+13 −0
Original line number Diff line number Diff line
@@ -64,6 +64,17 @@ 
	aliases {

		serial0 = &usart1;

	};



	leds {

		compatible = "gpio-leds";

		red {

			gpios = <&gpiog 14 0>;

		};

		green {

			gpios = <&gpiog 13 0>;

			linux,default-trigger = "heartbeat";

		};

	};

};



&clk_hse {
@@ -71,5 +82,7 @@ 
};



&usart1 {

	pinctrl-0 = <&usart1_pins_a>;

	pinctrl-names = "default";

	status = "okay";

};

arch/arm/boot/dts/stm32f429.dtsi

+143 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
 */



#include "armv7-m.dtsi"

#include <dt-bindings/pinctrl/stm32f429-pinfunc.h>



/ {

	clocks {
@@ -57,6 +58,8 @@ 
	};



	soc {

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



		timer2: timer@40000000 {

			compatible = "st,stm32-timer";

			reg = <0x40000000 0x400>;
@@ -168,6 +171,115 @@ 
			status = "disabled";

		};



		pin-controller {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "st,stm32f429-pinctrl";

			ranges = <0 0x40020000 0x3000>;

			pins-are-numbered;



			gpioa: gpio@40020000 {

				gpio-controller;

				#gpio-cells = <2>;

				reg = <0x0 0x400>;

				clocks = <&rcc 0 256>;

				st,bank-name = "GPIOA";

			};



			gpiob: gpio@40020400 {

				gpio-controller;

				#gpio-cells = <2>;

				reg = <0x400 0x400>;

				clocks = <&rcc 0 257>;

				st,bank-name = "GPIOB";

			};



			gpioc: gpio@40020800 {

				gpio-controller;

				#gpio-cells = <2>;

				reg = <0x800 0x400>;

				clocks = <&rcc 0 258>;

				st,bank-name = "GPIOC";

			};



			gpiod: gpio@40020c00 {

				gpio-controller;

				#gpio-cells = <2>;

				reg = <0xc00 0x400>;

				clocks = <&rcc 0 259>;

				st,bank-name = "GPIOD";

			};



			gpioe: gpio@40021000 {

				gpio-controller;

				#gpio-cells = <2>;

				reg = <0x1000 0x400>;

				clocks = <&rcc 0 260>;

				st,bank-name = "GPIOE";

			};



			gpiof: gpio@40021400 {

				gpio-controller;

				#gpio-cells = <2>;

				reg = <0x1400 0x400>;

				clocks = <&rcc 0 261>;

				st,bank-name = "GPIOF";

			};



			gpiog: gpio@40021800 {

				gpio-controller;

				#gpio-cells = <2>;

				reg = <0x1800 0x400>;

				clocks = <&rcc 0 262>;

				st,bank-name = "GPIOG";

			};



			gpioh: gpio@40021c00 {

				gpio-controller;

				#gpio-cells = <2>;

				reg = <0x1c00 0x400>;

				clocks = <&rcc 0 263>;

				st,bank-name = "GPIOH";

			};



			gpioi: gpio@40022000 {

				gpio-controller;

				#gpio-cells = <2>;

				reg = <0x2000 0x400>;

				clocks = <&rcc 0 264>;

				st,bank-name = "GPIOI";

			};



			gpioj: gpio@40022400 {

				gpio-controller;

				#gpio-cells = <2>;

				reg = <0x2400 0x400>;

				clocks = <&rcc 0 265>;

				st,bank-name = "GPIOJ";

			};



			gpiok: gpio@40022800 {

				gpio-controller;

				#gpio-cells = <2>;

				reg = <0x2800 0x400>;

				clocks = <&rcc 0 266>;

				st,bank-name = "GPIOK";

			};



			usart1_pins_a: usart1@0 {

				pins1 {

					pinmux = <STM32F429_PA9_FUNC_USART1_TX>;

					bias-disable;

					drive-push-pull;

					slew-rate = <0>;

				};

				pins2 {

					pinmux = <STM32F429_PA10_FUNC_USART1_RX>;

					bias-disable;

				};

			};

		};



		rcc: rcc@40023810 {

			#clock-cells = <2>;

			compatible = "st,stm32f42xx-rcc", "st,stm32-rcc";
@@ -175,6 +287,37 @@ 
			clocks = <&clk_hse>;

		};



		dma1: dma-controller@40026000 {

			compatible = "st,stm32-dma";

			reg = <0x40026000 0x400>;

			interrupts = <11>,

				     <12>,

				     <13>,

				     <14>,

				     <15>,

				     <16>,

				     <17>,

				     <47>;

			clocks = <&rcc 0 21>;

			#dma-cells = <4>;

		};



		dma2: dma-controller@40026400 {

			compatible = "st,stm32-dma";

			reg = <0x40026400 0x400>;

			interrupts = <56>,

				     <57>,

				     <58>,

				     <59>,

				     <60>,

				     <68>,

				     <69>,

				     <70>;

			clocks = <&rcc 0 22>;

			#dma-cells = <4>;

			st,mem2mem;

		};



		rng: rng@50060800 {

			compatible = "st,stm32-rng";

			reg = <0x50060800 0x400>;

include/dt-bindings/pinctrl/stm32f429-pinfunc.h

0 → 100644
+1239 −0

File added.

Preview size limit exceeded, changes collapsed.