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
/
omap2420-n810.dts
diff --git
a/arch/arm/boot/dts/omap2420-n810.dts
b/arch/arm/boot/dts/omap2420-n810.dts
index 96b9913ecc1f9a281c01473118de715a4e67a076..09c1dbc0bb6904c82b0a94d95c97ff0a1f16446f 100644
(file)
--- a/
arch/arm/boot/dts/omap2420-n810.dts
+++ b/
arch/arm/boot/dts/omap2420-n810.dts
@@
-48,7
+48,7
@@
pinctrl-names = "default";
pinctrl-0 = <&aic33_pins>;
-
gpio-reset
= <&gpio4 22 GPIO_ACTIVE_LOW>; /* gpio118 */
+
reset-gpios
= <&gpio4 22 GPIO_ACTIVE_LOW>; /* gpio118 */
ai3x-gpio-func = <
10 /* AIC3X_GPIO1_FUNC_DIGITAL_MIC_MODCLK */