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 tag 'v4.4.42' into linux-linaro-lsk-v4.4
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
imx6q-dmo-edmqmx6.dts
diff --git
a/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
b/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
index 4fa25434779828806c49a0d0477a46cb15cd2544..364578d707a570a5f77ca691525aa271b8a89b1c 100644
(file)
--- a/
arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
+++ b/
arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
@@
-109,7
+109,7
@@
status = "okay";
flash: m25p80@0 {
- compatible = "m25p80";
+ compatible = "m25p80"
, "jedec,spi-nor"
;
spi-max-frequency = <40000000>;
reg = <0>;
};