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 'powerpc-4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx6q-apalis-ixora.dts
diff --git
a/arch/arm/boot/dts/imx6q-apalis-ixora.dts
b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
index 469e3d0e28276e78c26a000ae3f9cda004706bd1..302fd6adc8a7d63fc318c1a9ebb1cc87aa4817ba 100644
(file)
--- a/
arch/arm/boot/dts/imx6q-apalis-ixora.dts
+++ b/
arch/arm/boot/dts/imx6q-apalis-ixora.dts
@@
-200,6
+200,8
@@
};
&pcie {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_reset_moci>;
/* active-high meaning opposite of regular PERST# active-low polarity */
reset-gpio = <&gpio1 28 GPIO_ACTIVE_HIGH>;
reset-gpio-active-high;