projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
imx50-evk.dts
diff --git
a/arch/arm/boot/dts/imx50-evk.dts
b/arch/arm/boot/dts/imx50-evk.dts
index 1b22512c91bd88b7c0c6fa3c63ff5e4121575c65..27d763c7a307d91e9efc282fb29c8e8e5de093c7 100644
(file)
--- a/
arch/arm/boot/dts/imx50-evk.dts
+++ b/
arch/arm/boot/dts/imx50-evk.dts
@@
-33,7
+33,7
@@
flash: m25p32@1 {
#address-cells = <1>;
#size-cells = <1>;
- compatible = "m25p32", "
m25p80
";
+ compatible = "m25p32", "
jedec,spi-nor
";
spi-max-frequency = <25000000>;
reg = <1>;