diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-23 14:16:21 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-23 14:16:21 -0400 |
| commit | ff8c23e784f57a7098e91a200ed7f5a48612b653 (patch) | |
| tree | 2d007e81ba9fc0d6334a9568d31422bd0e9dba88 /arch/arm | |
| parent | 9565bd7c6f4241af746fd67ee5c8406a99c148b3 (diff) | |
| parent | 1f99eaff08f699472860c82480344e824a737d57 (diff) | |
Merge tag 'u-boot-stm32-20190723' of https://gitlab.denx.de/u-boot/custodians/u-boot-stm
- add rtc driver for stm32mp1
- add remoteproc driver for stm32mp1
- use kernel qspi compatible string for stm32
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/dts/stm32f469-disco-u-boot.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/dts/stm32f7-u-boot.dtsi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/dts/stm32f469-disco-u-boot.dtsi b/arch/arm/dts/stm32f469-disco-u-boot.dtsi index 2409cf746a..5a89f13054 100644 --- a/arch/arm/dts/stm32f469-disco-u-boot.dtsi +++ b/arch/arm/dts/stm32f469-disco-u-boot.dtsi @@ -67,7 +67,7 @@ }; qspi: quadspi@A0001000 { - compatible = "st,stm32-qspi"; + compatible = "st,stm32f469-qspi"; #address-cells = <1>; #size-cells = <0>; reg = <0xA0001000 0x1000>, <0x90000000 0x10000000>; diff --git a/arch/arm/dts/stm32f7-u-boot.dtsi b/arch/arm/dts/stm32f7-u-boot.dtsi index 3ba7f8410d..32613c9769 100644 --- a/arch/arm/dts/stm32f7-u-boot.dtsi +++ b/arch/arm/dts/stm32f7-u-boot.dtsi @@ -44,7 +44,7 @@ }; qspi: quadspi@A0001000 { - compatible = "st,stm32-qspi"; + compatible = "st,stm32f469-qspi"; #address-cells = <1>; #size-cells = <0>; reg = <0xA0001000 0x1000>, <0x90000000 0x10000000>; |