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

Commit 7af5664e authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

STM32 DT updates for v4.10, round 2.

Highlights:
----------
 - Add support of STM32F746 MCU and STM32746G-Eval board
 - Add QSPI support for STM32F469-Disco board

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

:
  ARM: dts: stm32f429: Add QSPI clock
  ARM: dts: Add STM32F746 MCU and STM32746g-EVAL board

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 1fc7210c 2ecaa477

arch/arm/boot/dts/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -730,7 +730,8 @@ dtb-$(CONFIG_ARCH_STI) += \ 
dtb-$(CONFIG_ARCH_STM32)+= \

	stm32f429-disco.dtb \

	stm32f469-disco.dtb \

	stm32429i-eval.dtb

	stm32429i-eval.dtb \

	stm32746g-eval.dtb

dtb-$(CONFIG_MACH_SUN4I) += \

	sun4i-a10-a1000.dtb \

	sun4i-a10-ba10-tvbox.dtb \

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

0 → 100644
+96 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2015 - Maxime Coquelin <mcoquelin.stm32@gmail.com>

 *

 * This file is dual-licensed: you can use it either under the terms

 * of the GPL or the X11 license, at your option. Note that this dual

 * licensing only applies to this file, and not this project as a

 * whole.

 *

 *  a) This file is free software; you can redistribute it and/or

 *     modify it under the terms of the GNU General Public License as

 *     published by the Free Software Foundation; either version 2 of the

 *     License, or (at your option) any later version.

 *

 *     This file is distributed in the hope that it will be useful,

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     GNU General Public License for more details.

 *

 * Or, alternatively,

 *

 *  b) Permission is hereby granted, free of charge, to any person

 *     obtaining a copy of this software and associated documentation

 *     files (the "Software"), to deal in the Software without

 *     restriction, including without limitation the rights to use,

 *     copy, modify, merge, publish, distribute, sublicense, and/or

 *     sell copies of the Software, and to permit persons to whom the

 *     Software is furnished to do so, subject to the following

 *     conditions:

 *

 *     The above copyright notice and this permission notice shall be

 *     included in all copies or substantial portions of the Software.

 *

 *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

 *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 *     OTHER DEALINGS IN THE SOFTWARE.

 */



/dts-v1/;

#include "stm32f746.dtsi"

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



/ {

	model = "STMicroelectronics STM32746g-EVAL board";

	compatible = "st,stm32746g-eval", "st,stm32f746";



	chosen {

		bootargs = "root=/dev/ram";

		stdout-path = "serial0:115200n8";

	};



	memory {

		reg = <0xc0000000 0x2000000>;

	};



	aliases {

		serial0 = &usart1;

	};



	leds {

		compatible = "gpio-leds";

		green {

			gpios = <&gpiof 10 1>;

			linux,default-trigger = "heartbeat";

		};

		red {

			gpios = <&gpiob 7 1>;

		};

	};



	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;

		autorepeat;

		button@0 {

			label = "Wake up";

			linux,code = <KEY_WAKEUP>;

			gpios = <&gpioc 13 0>;

		};

	};

};



&clk_hse {

	clock-frequency = <25000000>;

};



&usart1 {

	pinctrl-0 = <&usart1_pins_a>;

	pinctrl-names = "default";

	status = "okay";

};

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

+4 −0
Original line number Diff line number Diff line
@@ -70,6 +70,10 @@ 
	};

};



&rcc {

	compatible = "st,stm32f469-rcc", "st,stm32f42xx-rcc", "st,stm32-rcc";

};



&clk_hse {

	clock-frequency = <8000000>;

};

arch/arm/boot/dts/stm32f746.dtsi

0 → 100644
+304 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2015 - Maxime Coquelin <mcoquelin.stm32@gmail.com>

 *

 * This file is dual-licensed: you can use it either under the terms

 * of the GPL or the X11 license, at your option. Note that this dual

 * licensing only applies to this file, and not this project as a

 * whole.

 *

 *  a) This file is free software; you can redistribute it and/or

 *     modify it under the terms of the GNU General Public License as

 *     published by the Free Software Foundation; either version 2 of the

 *     License, or (at your option) any later version.

 *

 *     This file is distributed in the hope that it will be useful,

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     GNU General Public License for more details.

 *

 * Or, alternatively,

 *

 *  b) Permission is hereby granted, free of charge, to any person

 *     obtaining a copy of this software and associated documentation

 *     files (the "Software"), to deal in the Software without

 *     restriction, including without limitation the rights to use,

 *     copy, modify, merge, publish, distribute, sublicense, and/or

 *     sell copies of the Software, and to permit persons to whom the

 *     Software is furnished to do so, subject to the following

 *     conditions:

 *

 *     The above copyright notice and this permission notice shall be

 *     included in all copies or substantial portions of the Software.

 *

 *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

 *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 *     OTHER DEALINGS IN THE SOFTWARE.

 */



#include "skeleton.dtsi"

#include "armv7-m.dtsi"

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



/ {

	clocks {

		clk_hse: clk-hse {

			#clock-cells = <0>;

			compatible = "fixed-clock";

			clock-frequency = <0>;

		};

	};



	soc {

		timer2: timer@40000000 {

			compatible = "st,stm32-timer";

			reg = <0x40000000 0x400>;

			interrupts = <28>;

			clocks = <&rcc 0 128>;

			status = "disabled";

		};



		timer3: timer@40000400 {

			compatible = "st,stm32-timer";

			reg = <0x40000400 0x400>;

			interrupts = <29>;

			clocks = <&rcc 0 129>;

			status = "disabled";

		};



		timer4: timer@40000800 {

			compatible = "st,stm32-timer";

			reg = <0x40000800 0x400>;

			interrupts = <30>;

			clocks = <&rcc 0 130>;

			status = "disabled";

		};



		timer5: timer@40000c00 {

			compatible = "st,stm32-timer";

			reg = <0x40000c00 0x400>;

			interrupts = <50>;

			clocks = <&rcc 0 131>;

		};



		timer6: timer@40001000 {

			compatible = "st,stm32-timer";

			reg = <0x40001000 0x400>;

			interrupts = <54>;

			clocks = <&rcc 0 132>;

			status = "disabled";

		};



		timer7: timer@40001400 {

			compatible = "st,stm32-timer";

			reg = <0x40001400 0x400>;

			interrupts = <55>;

			clocks = <&rcc 0 133>;

			status = "disabled";

		};



		usart2: serial@40004400 {

			compatible = "st,stm32f7-usart", "st,stm32f7-uart";

			reg = <0x40004400 0x400>;

			interrupts = <38>;

			clocks =  <&rcc 0 145>;

			status = "disabled";

		};



		usart3: serial@40004800 {

			compatible = "st,stm32f7-usart", "st,stm32f7-uart";

			reg = <0x40004800 0x400>;

			interrupts = <39>;

			clocks = <&rcc 0 146>;

			status = "disabled";

		};



		usart4: serial@40004c00 {

			compatible = "st,stm32f7-uart";

			reg = <0x40004c00 0x400>;

			interrupts = <52>;

			clocks = <&rcc 0 147>;

			status = "disabled";

		};



		usart5: serial@40005000 {

			compatible = "st,stm32f7-uart";

			reg = <0x40005000 0x400>;

			interrupts = <53>;

			clocks = <&rcc 0 148>;

			status = "disabled";

		};



		usart7: serial@40007800 {

			compatible = "st,stm32f7-usart", "st,stm32f7-uart";

			reg = <0x40007800 0x400>;

			interrupts = <82>;

			clocks = <&rcc 0 158>;

			status = "disabled";

		};



		usart8: serial@40007c00 {

			compatible = "st,stm32f7-usart", "st,stm32f7-uart";

			reg = <0x40007c00 0x400>;

			interrupts = <83>;

			clocks = <&rcc 0 159>;

			status = "disabled";

		};



		usart1: serial@40011000 {

			compatible = "st,stm32f7-usart", "st,stm32f7-uart";

			reg = <0x40011000 0x400>;

			interrupts = <37>;

			clocks = <&rcc 0 164>;

			status = "disabled";

		};



		usart6: serial@40011400 {

			compatible = "st,stm32f7-usart", "st,stm32f7-uart";

			reg = <0x40011400 0x400>;

			interrupts = <71>;

			clocks = <&rcc 0 165>;

			status = "disabled";

		};



		syscfg: system-config@40013800 {

			compatible = "syscon";

			reg = <0x40013800 0x400>;

		};



		exti: interrupt-controller@40013c00 {

			compatible = "st,stm32-exti";

			interrupt-controller;

			#interrupt-cells = <2>;

			reg = <0x40013C00 0x400>;

			interrupts = <1>, <2>, <3>, <6>, <7>, <8>, <9>, <10>, <23>, <40>, <41>, <42>, <62>, <76>;

		};



		pin-controller {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "st,stm32f746-pinctrl";

			ranges = <0 0x40020000 0x3000>;

			interrupt-parent = <&exti>;

			st,syscfg = <&syscfg 0x8>;

			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 = <STM32F746_PA9_FUNC_USART1_TX>;

					bias-disable;

					drive-push-pull;

					slew-rate = <0>;

				};

				pins2 {

					pinmux = <STM32F746_PA10_FUNC_USART1_RX>;

					bias-disable;

				};

			};

		};



		rcc: rcc@40023800 {

			#clock-cells = <2>;

			compatible = "st,stm32f42xx-rcc", "st,stm32-rcc";

			reg = <0x40023800 0x400>;

			clocks = <&clk_hse>;

		};

	};

};



&systick {

	clocks = <&rcc 1 0>;

	status = "okay";

};