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>wifi-calibration
parent
dffe26383f
commit
1856c29e63
|
@ -623,7 +623,6 @@
|
|||
MX6QDL_PAD_SD3_RST__GPIO7_IO08 0x80000000
|
||||
MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x80000000
|
||||
MX6QDL_PAD_EIM_DA9__GPIO3_IO09 0x80000000
|
||||
MX6QDL_PAD_GPIO_1__WDOG2_B 0x80000000
|
||||
MX6QDL_PAD_NANDF_CS0__GPIO6_IO11 0x80000000
|
||||
MX6QDL_PAD_NANDF_CS1__GPIO6_IO14 0x80000000
|
||||
MX6QDL_PAD_NANDF_CS2__GPIO6_IO15 0x80000000
|
||||
|
|
|
@ -270,7 +270,6 @@
|
|||
imx6ul-evk {
|
||||
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 */
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
|
|
@ -840,6 +840,12 @@
|
|||
MX7D_PAD_GPIO1_IO07__GPIO1_IO7 0x14
|
||||
>;
|
||||
};
|
||||
|
||||
pinctrl_wdog: wdoggrp {
|
||||
fsl,pins = <
|
||||
MX7D_PAD_GPIO1_IO00__WDOD1_WDOG_B 0x74
|
||||
>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -990,3 +996,9 @@
|
|||
pinctrl-0 = <&pinctrl_sim1_1>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&wdog1 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_wdog>;
|
||||
fsl,wdog_b;
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue