diff options
Diffstat (limited to 'arch/arm/boot/dts/imx6sx-14x14-arm2.dts')
-rw-r--r-- | arch/arm/boot/dts/imx6sx-14x14-arm2.dts | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/imx6sx-14x14-arm2.dts b/arch/arm/boot/dts/imx6sx-14x14-arm2.dts index 0b7bee2c0eea..42a903b47951 100644 --- a/arch/arm/boot/dts/imx6sx-14x14-arm2.dts +++ b/arch/arm/boot/dts/imx6sx-14x14-arm2.dts @@ -201,7 +201,6 @@ fsl,cpu_pupscr_sw = <0x1>; fsl,cpu_pdnscr_iso2sw = <0x1>; fsl,cpu_pdnscr_iso = <0x1>; - fsl,wdog-reset = <1>; /* watchdog select of reset source */ fsl,ldo-bypass = <1>; /* use ldo-bypass, u-boot will check it and configure */ }; @@ -372,8 +371,6 @@ MX6SX_PAD_QSPI1B_SS0_B__GPIO4_IO_30 0x17059 /* SD2_PWROFF */ MX6SX_PAD_KEY_COL1__GPIO2_IO_11 0x17059 - /* WDOG_B reset */ - MX6SX_PAD_GPIO1_IO13__WDOG1_WDOG_ANY 0x10b0 >; }; }; @@ -543,6 +540,12 @@ status = "okay"; }; +&wdog1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_wdog>; + fsl,wdog_b; +}; + &iomuxc { audmux { pinctrl_audmux_1: audmuxgrp-1 { @@ -1247,6 +1250,14 @@ }; + wdog { + pinctrl_wdog: wdoggrp { + fsl,pins = < + MX6SX_PAD_GPIO1_IO13__WDOG1_WDOG_ANY 0x10b0 + >; + }; + }; + weim { pinctrl_weim_cs0_1: weim_cs0grp-1 { fsl,pins = < |