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/x86/dts/chromebox_panther.dts | |
| parent | cf5eebeb18f7790d5030eb94f51fca0ebcd6e406 (diff) | |
| parent | 59aea29a31869ed0fd5ffc4b95050db966fcaf6d (diff) | |
| download | u-boot-216800acf1fbf9f498455bf3c92d4513d9a4c681.tar.gz | |
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/x86/dts/chromebox_panther.dts')
| -rw-r--r-- | arch/x86/dts/chromebox_panther.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/dts/chromebox_panther.dts b/arch/x86/dts/chromebox_panther.dts index f56e482944..bcd4c4d9c1 100644 --- a/arch/x86/dts/chromebox_panther.dts +++ b/arch/x86/dts/chromebox_panther.dts @@ -47,7 +47,7 @@ #address-cells = <1>; reg = <0>; compatible = "winbond,w25q64", - "spi-flash"; + "jedec,spi-nor"; memory-map = <0xff800000 0x00800000>; rw-mrc-cache { label = "rw-mrc-cache"; |