diff options
author | Dong Aisheng <aisheng.dong@nxp.com> | 2021-11-30 15:01:07 +0800 |
---|---|---|
committer | Dong Aisheng <aisheng.dong@nxp.com> | 2021-11-30 15:01:07 +0800 |
commit | e3ae0b9bbf16d3cbe449dab1240d42807c76b84c (patch) | |
tree | 257a27534cdaad0d1f9febabdc461e9b6d1dc9f6 /include/linux/mfd | |
parent | 01587d159cbc776b2d5a6d807395d75c41fa1ea4 (diff) | |
parent | 916e188b3d892f94f158b75a1d1e69d72df9757d (diff) |
Merge branch 'pinctrl/next' into next
* pinctrl/next: (17 commits)
pinctrl: s32v234: Add FlexCAN pins to S32V234 driver
dt-bindings: pinctrl: s32v234: Add defines for all pins
dt-bindings: pinctrl: s32v234: Add macros for MSCR and config pairs
pinctrl: s32v234: Remove s32v234_pins enum
dt-bindings: pinctrl: s32v234: Add macros for MSCR/IMCR numbers
...
Diffstat (limited to 'include/linux/mfd')
-rw-r--r-- | include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h b/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h index 7157a274a08a..275fa6e27c5e 100644 --- a/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h +++ b/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h @@ -435,6 +435,15 @@ #define IMX6SX_GPR4_FEC_ENET1_STOP_REQ (0x1 << 3) #define IMX6SX_GPR4_FEC_ENET2_STOP_REQ (0x1 << 4) +#define IMX6SX_GPR2_MQS_OVERSAMPLE_MASK (0x1 << 26) +#define IMX6SX_GPR2_MQS_OVERSAMPLE_SHIFT (26) +#define IMX6SX_GPR2_MQS_EN_MASK (0x1 << 25) +#define IMX6SX_GPR2_MQS_EN_SHIFT (25) +#define IMX6SX_GPR2_MQS_SW_RST_MASK (0x1 << 24) +#define IMX6SX_GPR2_MQS_SW_RST_SHIFT (24) +#define IMX6SX_GPR2_MQS_CLK_DIV_MASK (0xFF << 16) +#define IMX6SX_GPR2_MQS_CLK_DIV_SHIFT (16) + #define IMX6SX_GPR5_DISP_MUX_LDB_CTRL_MASK (0x1 << 3) #define IMX6SX_GPR5_DISP_MUX_LDB_CTRL_LCDIF1 (0x0 << 3) #define IMX6SX_GPR5_DISP_MUX_LDB_CTRL_LCDIF2 (0x1 << 3) |