projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'for-4.4/upstream-fixes', 'for-4.5/async-suspend', 'for-4.5/container...
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
imx6qdl-aristainetos2.dtsi
diff --git
a/arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi
b/arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi
index
a47a039
..
7d81100
100644
(file)
--- a/
arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi
+++ b/
arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi
@@
-141,7
+141,7
@@
flash: m25p80@1 {
#address-cells = <1>;
#size-cells = <1>;
- compatible = "micron,n25q128a11";
+ compatible = "micron,n25q128a11"
, "jedec,spi-nor"
;
spi-max-frequency = <20000000>;
reg = <1>;
};