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 'pm-extra-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx6dl-aristainetos_4.dts
diff --git
a/arch/arm/boot/dts/imx6dl-aristainetos_4.dts
b/arch/arm/boot/dts/imx6dl-aristainetos_4.dts
index d4c4a22db4888269c26a2294add2421dd4349c7e..32a812b1839ea0cc5e3ab4451b031e6053fb9b29 100644
(file)
--- a/
arch/arm/boot/dts/imx6dl-aristainetos_4.dts
+++ b/
arch/arm/boot/dts/imx6dl-aristainetos_4.dts
@@
-66,7
+66,6
@@
};
&ecspi2 {
- fsl,spi-num-chipselects = <1>;
cs-gpios = <&gpio3 24 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi2>;