Skip to content

L
linux
Commit 69516303 authored by Olof Johansson's avatar Olof Johansson
Browse files
Options

Merge tag 'stm32-dt-for-v4.3-1b' of... 

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

STM32 DT updates for v4.3, round 1.

Highlights:
-----------
 - Add RCC clocks support to STM32F429
 - Add STM32429i-EVAL board support
 - Use stdout-path instead of linux,stdout-path in Disco board

* tag 'stm32-dt-for-v4.3-1b' of https://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/stm32:
  ARM: dts: Use stdout-path in STM32F429 Discovery board
  ARM: dts: Add STM32429i-EVAL board support
  ARM: dts: stm32f429: Adopt STM32F4 clock driver
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a0227083 2303553f
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 58 deletions
arch/arm/boot/dts/Makefile
View file @ 69516303
......@@ -556,7 +556,9 @@ dtb-$(CONFIG_ARCH_STI) += \
stih416-b2020.dtb \
stih416-b2020e.dtb \
stih418-b2199.dtb
dtb-$(CONFIG_ARCH_STM32)+= stm32f429-disco.dtb
dtb-$(CONFIG_ARCH_STM32)+= \
stm32f429-disco.dtb \
stm32429i-eval.dtb
dtb-$(CONFIG_MACH_SUN4I) += \
sun4i-a10-a1000.dtb \
sun4i-a10-ba10-tvbox.dtb \
......
arch/arm/boot/dts/stm32429i-eval.dts 0 → 100644
View file @ 69516303
/*
* 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.
*
* You should have received a copy of the GNU General Public
* License along with this file; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
* MA 02110-1301 USA
*
* 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 "stm32f429.dtsi"
/ {
model = "STMicroelectronics STM32429i-EVAL board";
compatible = "st,stm32429i-eval", "st,stm32f429";
chosen {
bootargs = "root=/dev/ram rdinit=/linuxrc";
stdout-path = "serial0:115200n8";
};
memory {
reg = <0xc0000000 0x2000000>;
};
aliases {
serial0 = &usart1;
};
};
&clk_hse {
clock-frequency = <25000000>;
};
&usart1 {
status = "okay";
};
arch/arm/boot/dts/stm32f429-disco.dts
View file @ 69516303
......@@ -53,8 +53,8 @@ / {
compatible = "st,stm32f429i-disco", "st,stm32f429";
chosen {
bootargs = "console=ttyS0,115200 root=/dev/ram rdinit=/linuxrc";
linux,stdout-path = &usart1;
bootargs = "root=/dev/ram rdinit=/linuxrc";
stdout-path = "serial0:115200n8";
};
memory {
......@@ -66,6 +66,10 @@ aliases {
};
};
&clk_hse {
clock-frequency = <8000000>;
};
&usart1 {
status = "okay";
};
arch/arm/boot/dts/stm32f429.dtsi
View file @ 69516303
......@@ -49,48 +49,10 @@
/ {
clocks {
clk_sysclk: clk-sysclk {
clk_hse: clk-hse {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <180000000>;
};
clk_hclk: clk-hclk {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <180000000>;
};
clk_pclk1: clk-pclk1 {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <45000000>;
};
clk_pclk2: clk-pclk2 {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <90000000>;
};
clk_pmtr1: clk-pmtr1 {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <90000000>;
};
clk_pmtr2: clk-pmtr2 {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <180000000>;
};
clk_systick: clk-systick {
compatible = "fixed-factor-clock";
clocks = <&clk_hclk>;
#clock-cells = <0>;
clock-div = <8>;
clock-mult = <1>;
clock-frequency = <0>;
};
};
......@@ -99,7 +61,7 @@ timer2: timer@40000000 {
compatible = "st,stm32-timer";
reg = <0x40000000 0x400>;
interrupts = <28>;
clocks = <&clk_pmtr1>;
clocks = <&rcc 0 128>;
status = "disabled";
};
......@@ -107,7 +69,7 @@ timer3: timer@40000400 {
compatible = "st,stm32-timer";
reg = <0x40000400 0x400>;
interrupts = <29>;
clocks = <&clk_pmtr1>;
clocks = <&rcc 0 129>;
status = "disabled";
};
......@@ -115,7 +77,7 @@ timer4: timer@40000800 {
compatible = "st,stm32-timer";
reg = <0x40000800 0x400>;
interrupts = <30>;
clocks = <&clk_pmtr1>;
clocks = <&rcc 0 130>;
status = "disabled";
};
......@@ -123,14 +85,14 @@ timer5: timer@40000c00 {
compatible = "st,stm32-timer";
reg = <0x40000c00 0x400>;
interrupts = <50>;
clocks = <&clk_pmtr1>;
clocks = <&rcc 0 131>;
};
timer6: timer@40001000 {
compatible = "st,stm32-timer";
reg = <0x40001000 0x400>;
interrupts = <54>;
clocks = <&clk_pmtr1>;
clocks = <&rcc 0 132>;
status = "disabled";
};
......@@ -138,7 +100,7 @@ timer7: timer@40001400 {
compatible = "st,stm32-timer";
reg = <0x40001400 0x400>;
interrupts = <55>;
clocks = <&clk_pmtr1>;
clocks = <&rcc 0 133>;
status = "disabled";
};
......@@ -146,7 +108,7 @@ usart2: serial@40004400 {
compatible = "st,stm32-usart", "st,stm32-uart";
reg = <0x40004400 0x400>;
interrupts = <38>;
clocks = <&clk_pclk1>;
clocks = <&rcc 0 145>;
status = "disabled";
};
......@@ -154,7 +116,7 @@ usart3: serial@40004800 {
compatible = "st,stm32-usart", "st,stm32-uart";
reg = <0x40004800 0x400>;
interrupts = <39>;
clocks = <&clk_pclk1>;
clocks = <&rcc 0 146>;
status = "disabled";
};
......@@ -162,7 +124,7 @@ usart4: serial@40004c00 {
compatible = "st,stm32-uart";
reg = <0x40004c00 0x400>;
interrupts = <52>;
clocks = <&clk_pclk1>;
clocks = <&rcc 0 147>;
status = "disabled";
};
......@@ -170,7 +132,7 @@ usart5: serial@40005000 {
compatible = "st,stm32-uart";
reg = <0x40005000 0x400>;
interrupts = <53>;
clocks = <&clk_pclk1>;
clocks = <&rcc 0 148>;
status = "disabled";
};
......@@ -178,7 +140,7 @@ usart7: serial@40007800 {
compatible = "st,stm32-usart", "st,stm32-uart";
reg = <0x40007800 0x400>;
interrupts = <82>;
clocks = <&clk_pclk1>;
clocks = <&rcc 0 158>;
status = "disabled";
};
......@@ -186,7 +148,7 @@ usart8: serial@40007c00 {
compatible = "st,stm32-usart", "st,stm32-uart";
reg = <0x40007c00 0x400>;
interrupts = <83>;
clocks = <&clk_pclk1>;
clocks = <&rcc 0 159>;
status = "disabled";
};
......@@ -194,7 +156,7 @@ usart1: serial@40011000 {
compatible = "st,stm32-usart", "st,stm32-uart";
reg = <0x40011000 0x400>;
interrupts = <37>;
clocks = <&clk_pclk2>;
clocks = <&rcc 0 164>;
status = "disabled";
};
......@@ -202,13 +164,20 @@ usart6: serial@40011400 {
compatible = "st,stm32-usart", "st,stm32-uart";
reg = <0x40011400 0x400>;
interrupts = <71>;
clocks = <&clk_pclk2>;
clocks = <&rcc 0 165>;
status = "disabled";
};
rcc: rcc@40023810 {
#clock-cells = <2>;
compatible = "st,stm32f42xx-rcc", "st,stm32-rcc";
reg = <0x40023800 0x400>;
clocks = <&clk_hse>;
};
};
};
&systick {
clocks = <&clk_systick>;
clocks = <&rcc 1 0>;
status = "okay";
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7