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
/
imx53-smd.dts
diff --git
a/arch/arm/boot/dts/imx53-smd.dts
b/arch/arm/boot/dts/imx53-smd.dts
index fc89ce1e5763a2b03d5da06b38e6e3896e56dd20..542ab9e697fb4c5a57f9db6523ed069b79cdfec4 100644
(file)
--- a/
arch/arm/boot/dts/imx53-smd.dts
+++ b/
arch/arm/boot/dts/imx53-smd.dts
@@
-76,7
+76,7
@@
flash: m25p32@1 {
#address-cells = <1>;
#size-cells = <1>;
- compatible = "st,m25p32", "st,m25p";
+ compatible = "st,m25p32", "st,m25p"
, "jedec,spi-nor"
;
spi-max-frequency = <20000000>;
reg = <1>;