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 branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
am335x-pepper.dts
diff --git
a/arch/arm/boot/dts/am335x-pepper.dts
b/arch/arm/boot/dts/am335x-pepper.dts
index 03c7d77023c6a303213328ab6bde8de5f9f32288..9fb7426070ce0dc9402520c3ee5210ae31e6e6da 100644
(file)
--- a/
arch/arm/boot/dts/am335x-pepper.dts
+++ b/
arch/arm/boot/dts/am335x-pepper.dts
@@
-139,7
+139,7
@@
&audio_codec {
status = "okay";
-
gpio-reset
= <&gpio1 16 GPIO_ACTIVE_LOW>;
+
reset-gpios
= <&gpio1 16 GPIO_ACTIVE_LOW>;
AVDD-supply = <&ldo3_reg>;
IOVDD-supply = <&ldo3_reg>;
DRVDD-supply = <&ldo3_reg>;