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 branches 'pm-cpufreq' and 'acpi-cppc'
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
imx6sl-evk.dts
diff --git
a/arch/arm/boot/dts/imx6sl-evk.dts
b/arch/arm/boot/dts/imx6sl-evk.dts
index b84dff2e94ea1e4e44c15a054d90e67f9d06bde6..be118820e9f7f2593908d04c3df11944b498369f 100644
(file)
--- a/
arch/arm/boot/dts/imx6sl-evk.dts
+++ b/
arch/arm/boot/dts/imx6sl-evk.dts
@@
-126,7
+126,7
@@
flash: m25p80@0 {
#address-cells = <1>;
#size-cells = <1>;
- compatible = "st,m25p32";
+ compatible = "st,m25p32"
, "jedec,spi-nor"
;
spi-max-frequency = <20000000>;
reg = <0>;
};