projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pm-cpufreq'
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
imx6qdl-gw551x.dtsi
diff --git
a/arch/arm/boot/dts/imx6qdl-gw551x.dtsi
b/arch/arm/boot/dts/imx6qdl-gw551x.dtsi
index
118bea5
..
4b9fef8
100644
(file)
--- a/
arch/arm/boot/dts/imx6qdl-gw551x.dtsi
+++ b/
arch/arm/boot/dts/imx6qdl-gw551x.dtsi
@@
-239,6
+239,12
@@
status = "okay";
};
status = "okay";
};
+&wdog1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_wdog>;
+ fsl,ext-reset-output;
+};
+
&iomuxc {
imx6qdl-gw51xx {
pinctrl_flexcan1: flexcan1grp {
&iomuxc {
imx6qdl-gw51xx {
pinctrl_flexcan1: flexcan1grp {
@@
-333,5
+339,11
@@
MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
>;
};
MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
>;
};
+
+ pinctrl_wdog: wdoggrp {
+ fsl,pins = <
+ MX6QDL_PAD_DISP0_DAT8__WDOG1_B 0x1b0b0
+ >;
+ };
};
};
};
};