diff options
| author | Robin Gong <b38343@freescale.com> | 2016-01-06 11:06:45 +0800 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@nxp.com> | 2016-01-14 11:03:06 -0600 |
| commit | 1856c29e63d45089ab7975f6d6114bc71d513f2e (patch) | |
| tree | 8b761c624e1f9675805ff5ac29356a37f9e7a7a7 /arch/arm/boot/dts/imx6ul-9x9-evk.dts | |
| parent | dffe26383f7fac9b161e5a363dc62b3fe5f8bfc1 (diff) | |
MLK-12126 ARM: dts: imx6/imx7d: correct wdog pinctrl setting
We move WDOG_B pinctrl setting from pinctrl_hog to wdog driver, so need to
remove the original setting in pinctl_hog device node, otherwise the below
warning message will be caught:
[ 1.284161] imx6ul-pinctrl 20e0000.iomuxc: pin MX6UL_PAD_LCD_RESET already requested by 20e0000.iomuxc; cannot claim for 20bc000.wdog
[ 1.294990] imx6ul-pinctrl 20e0000.iomuxc: pin-69 (20bc000.wdog) status -22
[ 1.300689] imx6ul-pinctrl 20e0000.iomuxc: could not request pin 69 (MX6UL_PAD_LCD_RESET) from group wdoggrp on device 20e0000.iomuxc
[ 1.311550] imx2-wdt 20bc000.wdog: Error applying setting, reverse things back
Signed-off-by: Robin Gong <b38343@freescale.com>
Diffstat (limited to 'arch/arm/boot/dts/imx6ul-9x9-evk.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx6ul-9x9-evk.dts | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6ul-9x9-evk.dts b/arch/arm/boot/dts/imx6ul-9x9-evk.dts index 691884809423..7f57b520e86c 100644 --- a/arch/arm/boot/dts/imx6ul-9x9-evk.dts +++ b/arch/arm/boot/dts/imx6ul-9x9-evk.dts @@ -445,7 +445,6 @@ pinctrl_hog_1: hoggrp-1 { fsl,pins = < - MX6UL_PAD_LCD_RESET__WDOG1_WDOG_ANY 0x30b0 MX6UL_PAD_UART1_RTS_B__GPIO1_IO19 0x17059 /* SD1 CD */ MX6UL_PAD_GPIO1_IO05__USDHC1_VSELECT 0x17059 /* SD1 VSELECT */ MX6UL_PAD_GPIO1_IO09__GPIO1_IO09 0x17059 /* SD1 RESET */ @@ -631,6 +630,12 @@ MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17059 >; }; + + pinctrl_wdog: wdoggrp { + fsl,pins = < + MX6UL_PAD_LCD_RESET__WDOG1_WDOG_ANY 0x30b0 + >; + }; }; }; @@ -777,3 +782,9 @@ enable-sdio-wakeup; status = "okay"; }; + +&wdog1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_wdog>; + fsl,wdog_b; +}; |