git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx6q-cm-fx6.dts
diff --git
a/arch/arm/boot/dts/imx6q-cm-fx6.dts
b/arch/arm/boot/dts/imx6q-cm-fx6.dts
index cab9e92531c7f54636e174431aaaa6e2b087ad7e..bfb530f29d9deaaf1ee156ac5e6afd907b8e64d6 100644
(file)
--- a/
arch/arm/boot/dts/imx6q-cm-fx6.dts
+++ b/
arch/arm/boot/dts/imx6q-cm-fx6.dts
@@
-255,7
+255,7
@@
};
&ecspi1 {
- cs-gpios = <&gpio2 30 GPIO_ACTIVE_
HIGH>, <&gpio3 19 GPIO_ACTIVE_HIGH
>;
+ cs-gpios = <&gpio2 30 GPIO_ACTIVE_
LOW>, <&gpio3 19 GPIO_ACTIVE_LOW
>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay";