diff options
| author | Tom Rini <trini@konsulko.com> | 2019-04-14 00:03:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-04-14 00:03:06 -0400 |
| commit | 216800acf1fbf9f498455bf3c92d4513d9a4c681 (patch) | |
| tree | 08ee65c9c73a954c71b6f6051725338f0f23fdcb /arch/arm/dts/r8a77970-eagle-u-boot.dts | |
| parent | cf5eebeb18f7790d5030eb94f51fca0ebcd6e406 (diff) | |
| parent | 59aea29a31869ed0fd5ffc4b95050db966fcaf6d (diff) | |
| download | u-boot-216800acf1fbf9f498455bf3c92d4513d9a4c681.zip u-boot-216800acf1fbf9f498455bf3c92d4513d9a4c681.tar.gz u-boot-216800acf1fbf9f498455bf3c92d4513d9a4c681.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
Conflicts:
arch/arm/dts/armada-385-amc.dts
arch/arm/dts/armada-xp-theadorable.dts
arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/dts/r8a77970-eagle-u-boot.dts')
| -rw-r--r-- | arch/arm/dts/r8a77970-eagle-u-boot.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/dts/r8a77970-eagle-u-boot.dts b/arch/arm/dts/r8a77970-eagle-u-boot.dts index 5b17f1d..eb868ed 100644 --- a/arch/arm/dts/r8a77970-eagle-u-boot.dts +++ b/arch/arm/dts/r8a77970-eagle-u-boot.dts @@ -44,7 +44,7 @@ flash0: spi-flash@0 { #address-cells = <1>; #size-cells = <1>; - compatible = "s25fs512s", "spi-flash", "jedec,spi-nor"; + compatible = "s25fs512s", "jedec,spi-nor"; spi-max-frequency = <50000000>; spi-tx-bus-width = <1>; spi-rx-bus-width = <1>; |