diff options
| author | Tom Rini <trini@konsulko.com> | 2018-05-30 14:51:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-05-30 14:51:37 -0400 |
| commit | 8ada17dde84954e36d8bc6ff62a6956686eb0ec4 (patch) | |
| tree | bdcd62c9e31adfed1aed06c0f41cb4719e2c0912 /arch | |
| parent | 964d4f7211ec85b890e852d0226adba0b4f8c1c9 (diff) | |
| parent | a2569f12f0efaad2b1e0754a19f373275562f91e (diff) | |
| download | u-boot-8ada17dde84954e36d8bc6ff62a6956686eb0ec4.zip u-boot-8ada17dde84954e36d8bc6ff62a6956686eb0ec4.tar.gz u-boot-8ada17dde84954e36d8bc6ff62a6956686eb0ec4.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
- Fix a conflict in drivers/spi/atcspi200_spi.c related to the riscv
tree fixing a warning.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/stm32f746.dtsi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/dts/stm32f746.dtsi b/arch/arm/dts/stm32f746.dtsi index 8581df9..afa7832 100644 --- a/arch/arm/dts/stm32f746.dtsi +++ b/arch/arm/dts/stm32f746.dtsi @@ -88,10 +88,11 @@ #address-cells = <1>; #size-cells = <0>; reg = <0xA0001000 0x1000>, <0x90000000 0x10000000>; - reg-names = "QuadSPI", "QuadSPI-memory"; + reg-names = "qspi", "qspi_mm"; interrupts = <92>; spi-max-frequency = <108000000>; clocks = <&rcc 0 STM32F7_AHB3_CLOCK(QSPI)>; + resets = <&rcc STM32F7_AHB3_RESET(QSPI)>; status = "disabled"; }; usart1: serial@40011000 { |