Hi Yongcai,
The original reply had the patch as an attachment, not sure if that worked so I'll try it this way:
Index: arch/arm/boot/dts/imx6qdl-mohawk-gpios.dtsi
===================================================================
--- arch/arm/boot/dts/imx6qdl-mohawk-gpios.dtsi (revision 6370)
+++ arch/arm/boot/dts/imx6qdl-mohawk-gpios.dtsi (working copy)
@@ -631,18 +631,17 @@
MX6QDL_PAD_GPIO_9__SD1_WP MX6DL_USDHC_PAD_CTRL
/* RGMIII Interface (GIGE) */
- /*MXDL_PAD_CTL_GRP_DDR_TYPE_RGMIII__1P2V_IO (PAD_CTL_RGMIII_1P2V)
- *MXDL_PAD_CTL_GRP_RGMIII_TERM__DISABLE 0x0
- */
+ MX6QDL_PAD_CTL_GRP_DDR_TYPE_RGMIII__1P2V_IO (PAD_CTL_RGMIII_1P2V)
+ MX6QDL_PAD_CTL_GRP_RGMIII_TERM__DISABLE 0x0
+
/* JTAG */
- /*MX6DL_PAD_JTAG_MOD__SJC_MOD (PAD_CTL_PUS_47K_UP|PAD_CTL_PUE|PAD_CTL_PKE|PAD_CTL_SPEED_MED|PAD_CTL_DSE_48ohm|PAD_CTL_SRE_FAST)
- *MX6DL_PAD_JTAG_TCK__SJC_TCK (PAD_CTL_PUS_47K_UP|PAD_CTL_PUE|PAD_CTL_PKE|PAD_CTL_SPEED_MED|PAD_CTL_DSE_48ohm|PAD_CTL_SRE_FAST)
- *MX6DL_PAD_JTAG_TDI__SJC_TDI (PAD_CTL_PUS_47K_UP|PAD_CTL_PUE|PAD_CTL_PKE|PAD_CTL_SPEED_MED|PAD_CTL_DSE_48ohm|PAD_CTL_SRE_FAST)
- *MX6DL_PAD_JTAG_TDO__SJC_TDO (PAD_CTL_PUS_100K_UP|PAD_CTL_PUE|PAD_CTL_PKE|PAD_CTL_SPEED_MED|PAD_CTL_DSE_48ohm|PAD_CTL_SRE_FAST)
- *MX6DL_PAD_JTAG_TMS__SJC_TMS (PAD_CTL_PUS_47K_UP|PAD_CTL_PUE|PAD_CTL_PKE|PAD_CTL_SPEED_MED|PAD_CTL_DSE_48ohm|PAD_CTL_SRE_FAST)
- *MX6DL_PAD_JTAG_TRSTB__SJC_TRSTB (PAD_CTL_PUS_47K_UP|PAD_CTL_PUE|PAD_CTL_PKE|PAD_CTL_SPEED_MED|PAD_CTL_DSE_48ohm|PAD_CTL_SRE_FAST)
- */
+ MX6QDL_PAD_JTAG_MOD__SJC_MOD (PAD_CTL_PUS_47K_UP|PAD_CTL_PUE|PAD_CTL_PKE|PAD_CTL_SPEED_MED|PAD_CTL_DSE_48ohm|PAD_CTL_SRE_FAST)
+ MX6QDL_PAD_JTAG_TCK__SJC_TCK (PAD_CTL_PUS_47K_UP|PAD_CTL_PUE|PAD_CTL_PKE|PAD_CTL_SPEED_MED|PAD_CTL_DSE_48ohm|PAD_CTL_SRE_FAST)
+ MX6QDL_PAD_JTAG_TDI__SJC_TDI (PAD_CTL_PUS_47K_UP|PAD_CTL_PUE|PAD_CTL_PKE|PAD_CTL_SPEED_MED|PAD_CTL_DSE_48ohm|PAD_CTL_SRE_FAST)
+ MX6QDL_PAD_JTAG_TDO__SJC_TDO (PAD_CTL_PUS_100K_UP|PAD_CTL_PUE|PAD_CTL_PKE|PAD_CTL_SPEED_MED|PAD_CTL_DSE_48ohm|PAD_CTL_SRE_FAST)
+ MX6QDL_PAD_JTAG_TMS__SJC_TMS (PAD_CTL_PUS_47K_UP|PAD_CTL_PUE|PAD_CTL_PKE|PAD_CTL_SPEED_MED|PAD_CTL_DSE_48ohm|PAD_CTL_SRE_FAST)
+ MX6QDL_PAD_JTAG_TRSTB__SJC_TRSTB (PAD_CTL_PUS_47K_UP|PAD_CTL_PUE|PAD_CTL_PKE|PAD_CTL_SPEED_MED|PAD_CTL_DSE_48ohm|PAD_CTL_SRE_FAST)
/* Mohawk GPIOs configured starting here */
MX6QDL_PAD_CSI0_DAT12__GPIO5_IO30 (MX6DL_GPIO_OUTPUT_CTL)
Index: arch/arm/boot/dts/imx6dl-mohawk-pinfunc.h
===================================================================
--- arch/arm/boot/dts/imx6dl-mohawk-pinfunc.h (revision 6316)
+++ arch/arm/boot/dts/imx6dl-mohawk-pinfunc.h (working copy)
@@ -1122,14 +1122,14 @@
#define MX6QDL_PAD_SD4_DAT7__GPIO2_IO15 0x35c 0x744 0x000 0x5 0x0
/* Exported from Old BSP */
-#define MXDL_PAD_CTL_GRP_DDR_TYPE_RGMIII__1P2V_IO 0x0 0x0768 0x0 0x0 0x0
-#define MXDL_PAD_CTL_GRP_RGMIII_TERM__DISABLE 0x0 0x0788 0x0 0x0 0x0
-#define MX6DL_PAD_JTAG_MOD__SJC_MOD 0x0 0x0614 0x0000 0 0
-#define MX6DL_PAD_JTAG_TCK__SJC_TCK 0x0 0x0618 0x0000 0 0
-#define MX6DL_PAD_JTAG_TDI__SJC_TDI 0x0 0x061C 0x0000 0 0
-#define MX6DL_PAD_JTAG_TDO__SJC_TDO 0x0 0x0620 0x0000 0 0
-#define MX6DL_PAD_JTAG_TMS__SJC_TMS 0x0 0x0624 0x0000 0 0
-#define MX6DL_PAD_JTAG_TRSTB__SJC_TRSTB 0x0 0x0628 0x0000 0 0
+#define MX6QDL_PAD_CTL_GRP_DDR_TYPE_RGMIII__1P2V_IO 0x0 0x0768 0x0 0x0 0x0
+#define MX6QDL_PAD_CTL_GRP_RGMIII_TERM__DISABLE 0x0 0x0788 0x0 0x0 0x0
+#define MX6QDL_PAD_JTAG_MOD__SJC_MOD 0x0 0x614 0x0000 0 0
+#define MX6QDL_PAD_JTAG_TCK__SJC_TCK 0x0 0x618 0x0000 0 0
+#define MX6QDL_PAD_JTAG_TDI__SJC_TDI 0x0 0x61C 0x0000 0 0
+#define MX6QDL_PAD_JTAG_TDO__SJC_TDO 0x0 0x620 0x0000 0 0
+#define MX6QDL_PAD_JTAG_TMS__SJC_TMS 0x0 0x624 0x0000 0 0
+#define MX6QDL_PAD_JTAG_TRSTB__SJC_TRSTB 0x0 0x628 0x0000 0 0
#endif /* __DTS_IMX6DL_MOHAWK_PINFUNC_H */
Index: drivers/pinctrl/pinctrl-imx6dl.c
===================================================================
--- drivers/pinctrl/pinctrl-imx6dl.c (revision 6311)
+++ drivers/pinctrl/pinctrl-imx6dl.c (working copy)
@@ -233,6 +233,14 @@
MX6DL_PAD_SD4_DAT5 = 213,
MX6DL_PAD_SD4_DAT6 = 214,
MX6DL_PAD_SD4_DAT7 = 215,
+ MX6DL_PAD_CTL_GRP_DDR_TYPE_RGMIII = 216,
+ MX6DL_PAD_CTL_GRP_RGMIII_TERM = 217,
+ MX6DL_PAD_JTAG_MOD = 218,
+ MX6DL_PAD_JTAG_TCK = 219,
+ MX6DL_PAD_JTAG_TDI = 220,
+ MX6DL_PAD_JTAG_TDO = 221,
+ MX6DL_PAD_JTAG_TMS = 222,
+ MX6DL_PAD_JTAG_TRSTB = 223,
};
/* Pad names for the pinmux subsystem */
@@ -453,6 +461,14 @@
IMX_PINCTRL_PIN(MX6DL_PAD_SD4_DAT5),
IMX_PINCTRL_PIN(MX6DL_PAD_SD4_DAT6),
IMX_PINCTRL_PIN(MX6DL_PAD_SD4_DAT7),
+ IMX_PINCTRL_PIN(MX6DL_PAD_CTL_GRP_DDR_TYPE_RGMIII),
+ IMX_PINCTRL_PIN(MX6DL_PAD_CTL_GRP_RGMIII_TERM),
+ IMX_PINCTRL_PIN(MX6DL_PAD_JTAG_MOD),
+ IMX_PINCTRL_PIN(MX6DL_PAD_JTAG_TCK),
+ IMX_PINCTRL_PIN(MX6DL_PAD_JTAG_TDI),
+ IMX_PINCTRL_PIN(MX6DL_PAD_JTAG_TDO),
+ IMX_PINCTRL_PIN(MX6DL_PAD_JTAG_TMS),
+ IMX_PINCTRL_PIN(MX6DL_PAD_JTAG_TRSTB),
};
static struct imx_pinctrl_soc_info imx6dl_pinctrl_info = {