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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx6qdl-gw53xx.dtsi
diff --git
a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
index e8375e173873edc5dc39ef011321cbbac9378f00..ec3fe7444e154c4d39f28a5a4a6f8afef05eeb1f 100644
(file)
--- a/
arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
+++ b/
arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
@@
-462,7
+462,7
@@
pinctrl_pwm3: pwm3grp {
fsl,pins = <
- MX6QDL_PAD_SD
4
_DAT1__PWM3_OUT 0x1b0b1
+ MX6QDL_PAD_SD
1
_DAT1__PWM3_OUT 0x1b0b1
>;
};