diff mbox series

pinctrl: imx27: Fix redefinition of 'PC' in imx27 driver

Message ID ZwOc4o2i-Wzp5QIV@mail.google.com
State New
Headers show
Series pinctrl: imx27: Fix redefinition of 'PC' in imx27 driver | expand

Commit Message

Paulo Miguel Almeida Oct. 7, 2024, 8:33 a.m. UTC 
The `PC` macro in `drivers/pinctrl/freescale/pinctrl-imx27.c` is
clashing with an existing `PC` macro defined in
`arch/mips/include/uapi/asm/ptrace.h`. This leads to a compilation
error when building for MIPS architecture.

Rename those to use a more specific prefix (`MX27_`) to avoid
conflicts with other platform definitions.

Signed-off-by: Paulo Miguel Almeida <paulo.miguel.almeida.rodenas@gmail.com>
---
 drivers/pinctrl/freescale/pinctrl-imx27.c | 352 +++++++++++-----------
 1 file changed, 176 insertions(+), 176 deletions(-)

Comments

Fabio Estevam Oct. 7, 2024, 12:07 p.m. UTC | #1 
Hi Paulo,

Thanks for your patch.

On Mon, Oct 7, 2024 at 5:33 AM Paulo Miguel Almeida
<paulo.miguel.almeida.rodenas@gmail.com> wrote:
>
> The `PC` macro in `drivers/pinctrl/freescale/pinctrl-imx27.c` is
> clashing with an existing `PC` macro defined in
> `arch/mips/include/uapi/asm/ptrace.h`. This leads to a compilation
> error when building for MIPS architecture.
>
> Rename those to use a more specific prefix (`MX27_`) to avoid
> conflicts with other platform definitions.
>
> Signed-off-by: Paulo Miguel Almeida <paulo.miguel.almeida.rodenas@gmail.com>

Linus Walleij has already submitted a fix for this problem:
https://lore.kernel.org/linux-gpio/CAOMZO5DqwcM1U8FtybUHbHYZjLi-5BO6nGfifHXguKtcEY4DrA@mail.gmail.com/T/#t
diff mbox series

Patch

diff --git a/drivers/pinctrl/freescale/pinctrl-imx27.c b/drivers/pinctrl/freescale/pinctrl-imx27.c
index 1738df461235..67db00d501f7 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx27.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx27.c
@@ -15,189 +15,189 @@ 
 
 #include "pinctrl-imx1.h"
 
-#define PAD_ID(port, pin) (port*32 + pin)
-#define PA 0
-#define PB 1
-#define PC 2
-#define PD 3
-#define PE 4
-#define PF 5
+#define MX27_PAD_ID(port, pin) (port*32 + pin)
+#define MX27_PA 0
+#define MX27_PB 1
+#define MX27_PC 2
+#define MX27_PD 3
+#define MX27_PE 4
+#define MX27_PF 5
 
 enum imx27_pads {
-	MX27_PAD_USBH2_CLK = PAD_ID(PA, 0),
-	MX27_PAD_USBH2_DIR = PAD_ID(PA, 1),
-	MX27_PAD_USBH2_DATA7 = PAD_ID(PA, 2),
-	MX27_PAD_USBH2_NXT = PAD_ID(PA, 3),
-	MX27_PAD_USBH2_STP = PAD_ID(PA, 4),
-	MX27_PAD_LSCLK = PAD_ID(PA, 5),
-	MX27_PAD_LD0 = PAD_ID(PA, 6),
-	MX27_PAD_LD1 = PAD_ID(PA, 7),
-	MX27_PAD_LD2 = PAD_ID(PA, 8),
-	MX27_PAD_LD3 = PAD_ID(PA, 9),
-	MX27_PAD_LD4 = PAD_ID(PA, 10),
-	MX27_PAD_LD5 = PAD_ID(PA, 11),
-	MX27_PAD_LD6 = PAD_ID(PA, 12),
-	MX27_PAD_LD7 = PAD_ID(PA, 13),
-	MX27_PAD_LD8 = PAD_ID(PA, 14),
-	MX27_PAD_LD9 = PAD_ID(PA, 15),
-	MX27_PAD_LD10 = PAD_ID(PA, 16),
-	MX27_PAD_LD11 = PAD_ID(PA, 17),
-	MX27_PAD_LD12 = PAD_ID(PA, 18),
-	MX27_PAD_LD13 = PAD_ID(PA, 19),
-	MX27_PAD_LD14 = PAD_ID(PA, 20),
-	MX27_PAD_LD15 = PAD_ID(PA, 21),
-	MX27_PAD_LD16 = PAD_ID(PA, 22),
-	MX27_PAD_LD17 = PAD_ID(PA, 23),
-	MX27_PAD_REV = PAD_ID(PA, 24),
-	MX27_PAD_CLS = PAD_ID(PA, 25),
-	MX27_PAD_PS = PAD_ID(PA, 26),
-	MX27_PAD_SPL_SPR = PAD_ID(PA, 27),
-	MX27_PAD_HSYNC = PAD_ID(PA, 28),
-	MX27_PAD_VSYNC = PAD_ID(PA, 29),
-	MX27_PAD_CONTRAST = PAD_ID(PA, 30),
-	MX27_PAD_OE_ACD = PAD_ID(PA, 31),
+	MX27_PAD_USBH2_CLK = MX27_PAD_ID(MX27_PA, 0),
+	MX27_PAD_USBH2_DIR = MX27_PAD_ID(MX27_PA, 1),
+	MX27_PAD_USBH2_DATA7 = MX27_PAD_ID(MX27_PA, 2),
+	MX27_PAD_USBH2_NXT = MX27_PAD_ID(MX27_PA, 3),
+	MX27_PAD_USBH2_STP = MX27_PAD_ID(MX27_PA, 4),
+	MX27_PAD_LSCLK = MX27_PAD_ID(MX27_PA, 5),
+	MX27_PAD_LD0 = MX27_PAD_ID(MX27_PA, 6),
+	MX27_PAD_LD1 = MX27_PAD_ID(MX27_PA, 7),
+	MX27_PAD_LD2 = MX27_PAD_ID(MX27_PA, 8),
+	MX27_PAD_LD3 = MX27_PAD_ID(MX27_PA, 9),
+	MX27_PAD_LD4 = MX27_PAD_ID(MX27_PA, 10),
+	MX27_PAD_LD5 = MX27_PAD_ID(MX27_PA, 11),
+	MX27_PAD_LD6 = MX27_PAD_ID(MX27_PA, 12),
+	MX27_PAD_LD7 = MX27_PAD_ID(MX27_PA, 13),
+	MX27_PAD_LD8 = MX27_PAD_ID(MX27_PA, 14),
+	MX27_PAD_LD9 = MX27_PAD_ID(MX27_PA, 15),
+	MX27_PAD_LD10 = MX27_PAD_ID(MX27_PA, 16),
+	MX27_PAD_LD11 = MX27_PAD_ID(MX27_PA, 17),
+	MX27_PAD_LD12 = MX27_PAD_ID(MX27_PA, 18),
+	MX27_PAD_LD13 = MX27_PAD_ID(MX27_PA, 19),
+	MX27_PAD_LD14 = MX27_PAD_ID(MX27_PA, 20),
+	MX27_PAD_LD15 = MX27_PAD_ID(MX27_PA, 21),
+	MX27_PAD_LD16 = MX27_PAD_ID(MX27_PA, 22),
+	MX27_PAD_LD17 = MX27_PAD_ID(MX27_PA, 23),
+	MX27_PAD_REV = MX27_PAD_ID(MX27_PA, 24),
+	MX27_PAD_CLS = MX27_PAD_ID(MX27_PA, 25),
+	MX27_PAD_PS = MX27_PAD_ID(MX27_PA, 26),
+	MX27_PAD_SPL_SPR = MX27_PAD_ID(MX27_PA, 27),
+	MX27_PAD_HSYNC = MX27_PAD_ID(MX27_PA, 28),
+	MX27_PAD_VSYNC = MX27_PAD_ID(MX27_PA, 29),
+	MX27_PAD_CONTRAST = MX27_PAD_ID(MX27_PA, 30),
+	MX27_PAD_OE_ACD = MX27_PAD_ID(MX27_PA, 31),
 
-	MX27_PAD_SD2_D0 = PAD_ID(PB, 4),
-	MX27_PAD_SD2_D1 = PAD_ID(PB, 5),
-	MX27_PAD_SD2_D2 = PAD_ID(PB, 6),
-	MX27_PAD_SD2_D3 = PAD_ID(PB, 7),
-	MX27_PAD_SD2_CMD = PAD_ID(PB, 8),
-	MX27_PAD_SD2_CLK = PAD_ID(PB, 9),
-	MX27_PAD_CSI_D0 = PAD_ID(PB, 10),
-	MX27_PAD_CSI_D1 = PAD_ID(PB, 11),
-	MX27_PAD_CSI_D2 = PAD_ID(PB, 12),
-	MX27_PAD_CSI_D3 = PAD_ID(PB, 13),
-	MX27_PAD_CSI_D4 = PAD_ID(PB, 14),
-	MX27_PAD_CSI_MCLK = PAD_ID(PB, 15),
-	MX27_PAD_CSI_PIXCLK = PAD_ID(PB, 16),
-	MX27_PAD_CSI_D5 = PAD_ID(PB, 17),
-	MX27_PAD_CSI_D6 = PAD_ID(PB, 18),
-	MX27_PAD_CSI_D7 = PAD_ID(PB, 19),
-	MX27_PAD_CSI_VSYNC = PAD_ID(PB, 20),
-	MX27_PAD_CSI_HSYNC = PAD_ID(PB, 21),
-	MX27_PAD_USBH1_SUSP = PAD_ID(PB, 22),
-	MX27_PAD_USB_PWR = PAD_ID(PB, 23),
-	MX27_PAD_USB_OC_B = PAD_ID(PB, 24),
-	MX27_PAD_USBH1_RCV = PAD_ID(PB, 25),
-	MX27_PAD_USBH1_FS = PAD_ID(PB, 26),
-	MX27_PAD_USBH1_OE_B = PAD_ID(PB, 27),
-	MX27_PAD_USBH1_TXDM = PAD_ID(PB, 28),
-	MX27_PAD_USBH1_TXDP = PAD_ID(PB, 29),
-	MX27_PAD_USBH1_RXDM = PAD_ID(PB, 30),
-	MX27_PAD_USBH1_RXDP = PAD_ID(PB, 31),
+	MX27_PAD_SD2_D0 = MX27_PAD_ID(MX27_PB, 4),
+	MX27_PAD_SD2_D1 = MX27_PAD_ID(MX27_PB, 5),
+	MX27_PAD_SD2_D2 = MX27_PAD_ID(MX27_PB, 6),
+	MX27_PAD_SD2_D3 = MX27_PAD_ID(MX27_PB, 7),
+	MX27_PAD_SD2_CMD = MX27_PAD_ID(MX27_PB, 8),
+	MX27_PAD_SD2_CLK = MX27_PAD_ID(MX27_PB, 9),
+	MX27_PAD_CSI_D0 = MX27_PAD_ID(MX27_PB, 10),
+	MX27_PAD_CSI_D1 = MX27_PAD_ID(MX27_PB, 11),
+	MX27_PAD_CSI_D2 = MX27_PAD_ID(MX27_PB, 12),
+	MX27_PAD_CSI_D3 = MX27_PAD_ID(MX27_PB, 13),
+	MX27_PAD_CSI_D4 = MX27_PAD_ID(MX27_PB, 14),
+	MX27_PAD_CSI_MCLK = MX27_PAD_ID(MX27_PB, 15),
+	MX27_PAD_CSI_PIXCLK = MX27_PAD_ID(MX27_PB, 16),
+	MX27_PAD_CSI_D5 = MX27_PAD_ID(MX27_PB, 17),
+	MX27_PAD_CSI_D6 = MX27_PAD_ID(MX27_PB, 18),
+	MX27_PAD_CSI_D7 = MX27_PAD_ID(MX27_PB, 19),
+	MX27_PAD_CSI_VSYNC = MX27_PAD_ID(MX27_PB, 20),
+	MX27_PAD_CSI_HSYNC = MX27_PAD_ID(MX27_PB, 21),
+	MX27_PAD_USBH1_SUSP = MX27_PAD_ID(MX27_PB, 22),
+	MX27_PAD_USB_PWR = MX27_PAD_ID(MX27_PB, 23),
+	MX27_PAD_USB_OC_B = MX27_PAD_ID(MX27_PB, 24),
+	MX27_PAD_USBH1_RCV = MX27_PAD_ID(MX27_PB, 25),
+	MX27_PAD_USBH1_FS = MX27_PAD_ID(MX27_PB, 26),
+	MX27_PAD_USBH1_OE_B = MX27_PAD_ID(MX27_PB, 27),
+	MX27_PAD_USBH1_TXDM = MX27_PAD_ID(MX27_PB, 28),
+	MX27_PAD_USBH1_TXDP = MX27_PAD_ID(MX27_PB, 29),
+	MX27_PAD_USBH1_RXDM = MX27_PAD_ID(MX27_PB, 30),
+	MX27_PAD_USBH1_RXDP = MX27_PAD_ID(MX27_PB, 31),
 
-	MX27_PAD_I2C2_SDA = PAD_ID(PC, 5),
-	MX27_PAD_I2C2_SCL = PAD_ID(PC, 6),
-	MX27_PAD_USBOTG_DATA5 = PAD_ID(PC, 7),
-	MX27_PAD_USBOTG_DATA6 = PAD_ID(PC, 8),
-	MX27_PAD_USBOTG_DATA0 = PAD_ID(PC, 9),
-	MX27_PAD_USBOTG_DATA2 = PAD_ID(PC, 10),
-	MX27_PAD_USBOTG_DATA1 = PAD_ID(PC, 11),
-	MX27_PAD_USBOTG_DATA4 = PAD_ID(PC, 12),
-	MX27_PAD_USBOTG_DATA3 = PAD_ID(PC, 13),
-	MX27_PAD_TOUT = PAD_ID(PC, 14),
-	MX27_PAD_TIN = PAD_ID(PC, 15),
-	MX27_PAD_SSI4_FS = PAD_ID(PC, 16),
-	MX27_PAD_SSI4_RXDAT = PAD_ID(PC, 17),
-	MX27_PAD_SSI4_TXDAT = PAD_ID(PC, 18),
-	MX27_PAD_SSI4_CLK = PAD_ID(PC, 19),
-	MX27_PAD_SSI1_FS = PAD_ID(PC, 20),
-	MX27_PAD_SSI1_RXDAT = PAD_ID(PC, 21),
-	MX27_PAD_SSI1_TXDAT = PAD_ID(PC, 22),
-	MX27_PAD_SSI1_CLK = PAD_ID(PC, 23),
-	MX27_PAD_SSI2_FS = PAD_ID(PC, 24),
-	MX27_PAD_SSI2_RXDAT = PAD_ID(PC, 25),
-	MX27_PAD_SSI2_TXDAT = PAD_ID(PC, 26),
-	MX27_PAD_SSI2_CLK = PAD_ID(PC, 27),
-	MX27_PAD_SSI3_FS = PAD_ID(PC, 28),
-	MX27_PAD_SSI3_RXDAT = PAD_ID(PC, 29),
-	MX27_PAD_SSI3_TXDAT = PAD_ID(PC, 30),
-	MX27_PAD_SSI3_CLK = PAD_ID(PC, 31),
+	MX27_PAD_I2C2_SDA = MX27_PAD_ID(MX27_PC, 5),
+	MX27_PAD_I2C2_SCL = MX27_PAD_ID(MX27_PC, 6),
+	MX27_PAD_USBOTG_DATA5 = MX27_PAD_ID(MX27_PC, 7),
+	MX27_PAD_USBOTG_DATA6 = MX27_PAD_ID(MX27_PC, 8),
+	MX27_PAD_USBOTG_DATA0 = MX27_PAD_ID(MX27_PC, 9),
+	MX27_PAD_USBOTG_DATA2 = MX27_PAD_ID(MX27_PC, 10),
+	MX27_PAD_USBOTG_DATA1 = MX27_PAD_ID(MX27_PC, 11),
+	MX27_PAD_USBOTG_DATA4 = MX27_PAD_ID(MX27_PC, 12),
+	MX27_PAD_USBOTG_DATA3 = MX27_PAD_ID(MX27_PC, 13),
+	MX27_PAD_TOUT = MX27_PAD_ID(MX27_PC, 14),
+	MX27_PAD_TIN = MX27_PAD_ID(MX27_PC, 15),
+	MX27_PAD_SSI4_FS = MX27_PAD_ID(MX27_PC, 16),
+	MX27_PAD_SSI4_RXDAT = MX27_PAD_ID(MX27_PC, 17),
+	MX27_PAD_SSI4_TXDAT = MX27_PAD_ID(MX27_PC, 18),
+	MX27_PAD_SSI4_CLK = MX27_PAD_ID(MX27_PC, 19),
+	MX27_PAD_SSI1_FS = MX27_PAD_ID(MX27_PC, 20),
+	MX27_PAD_SSI1_RXDAT = MX27_PAD_ID(MX27_PC, 21),
+	MX27_PAD_SSI1_TXDAT = MX27_PAD_ID(MX27_PC, 22),
+	MX27_PAD_SSI1_CLK = MX27_PAD_ID(MX27_PC, 23),
+	MX27_PAD_SSI2_FS = MX27_PAD_ID(MX27_PC, 24),
+	MX27_PAD_SSI2_RXDAT = MX27_PAD_ID(MX27_PC, 25),
+	MX27_PAD_SSI2_TXDAT = MX27_PAD_ID(MX27_PC, 26),
+	MX27_PAD_SSI2_CLK = MX27_PAD_ID(MX27_PC, 27),
+	MX27_PAD_SSI3_FS = MX27_PAD_ID(MX27_PC, 28),
+	MX27_PAD_SSI3_RXDAT = MX27_PAD_ID(MX27_PC, 29),
+	MX27_PAD_SSI3_TXDAT = MX27_PAD_ID(MX27_PC, 30),
+	MX27_PAD_SSI3_CLK = MX27_PAD_ID(MX27_PC, 31),
 
-	MX27_PAD_SD3_CMD = PAD_ID(PD, 0),
-	MX27_PAD_SD3_CLK = PAD_ID(PD, 1),
-	MX27_PAD_ATA_DATA0 = PAD_ID(PD, 2),
-	MX27_PAD_ATA_DATA1 = PAD_ID(PD, 3),
-	MX27_PAD_ATA_DATA2 = PAD_ID(PD, 4),
-	MX27_PAD_ATA_DATA3 = PAD_ID(PD, 5),
-	MX27_PAD_ATA_DATA4 = PAD_ID(PD, 6),
-	MX27_PAD_ATA_DATA5 = PAD_ID(PD, 7),
-	MX27_PAD_ATA_DATA6 = PAD_ID(PD, 8),
-	MX27_PAD_ATA_DATA7 = PAD_ID(PD, 9),
-	MX27_PAD_ATA_DATA8 = PAD_ID(PD, 10),
-	MX27_PAD_ATA_DATA9 = PAD_ID(PD, 11),
-	MX27_PAD_ATA_DATA10 = PAD_ID(PD, 12),
-	MX27_PAD_ATA_DATA11 = PAD_ID(PD, 13),
-	MX27_PAD_ATA_DATA12 = PAD_ID(PD, 14),
-	MX27_PAD_ATA_DATA13 = PAD_ID(PD, 15),
-	MX27_PAD_ATA_DATA14 = PAD_ID(PD, 16),
-	MX27_PAD_I2C_DATA = PAD_ID(PD, 17),
-	MX27_PAD_I2C_CLK = PAD_ID(PD, 18),
-	MX27_PAD_CSPI2_SS2 = PAD_ID(PD, 19),
-	MX27_PAD_CSPI2_SS1 = PAD_ID(PD, 20),
-	MX27_PAD_CSPI2_SS0 = PAD_ID(PD, 21),
-	MX27_PAD_CSPI2_SCLK = PAD_ID(PD, 22),
-	MX27_PAD_CSPI2_MISO = PAD_ID(PD, 23),
-	MX27_PAD_CSPI2_MOSI = PAD_ID(PD, 24),
-	MX27_PAD_CSPI1_RDY = PAD_ID(PD, 25),
-	MX27_PAD_CSPI1_SS2 = PAD_ID(PD, 26),
-	MX27_PAD_CSPI1_SS1 = PAD_ID(PD, 27),
-	MX27_PAD_CSPI1_SS0 = PAD_ID(PD, 28),
-	MX27_PAD_CSPI1_SCLK = PAD_ID(PD, 29),
-	MX27_PAD_CSPI1_MISO = PAD_ID(PD, 30),
-	MX27_PAD_CSPI1_MOSI = PAD_ID(PD, 31),
+	MX27_PAD_SD3_CMD = MX27_PAD_ID(MX27_PD, 0),
+	MX27_PAD_SD3_CLK = MX27_PAD_ID(MX27_PD, 1),
+	MX27_PAD_ATA_DATA0 = MX27_PAD_ID(MX27_PD, 2),
+	MX27_PAD_ATA_DATA1 = MX27_PAD_ID(MX27_PD, 3),
+	MX27_PAD_ATA_DATA2 = MX27_PAD_ID(MX27_PD, 4),
+	MX27_PAD_ATA_DATA3 = MX27_PAD_ID(MX27_PD, 5),
+	MX27_PAD_ATA_DATA4 = MX27_PAD_ID(MX27_PD, 6),
+	MX27_PAD_ATA_DATA5 = MX27_PAD_ID(MX27_PD, 7),
+	MX27_PAD_ATA_DATA6 = MX27_PAD_ID(MX27_PD, 8),
+	MX27_PAD_ATA_DATA7 = MX27_PAD_ID(MX27_PD, 9),
+	MX27_PAD_ATA_DATA8 = MX27_PAD_ID(MX27_PD, 10),
+	MX27_PAD_ATA_DATA9 = MX27_PAD_ID(MX27_PD, 11),
+	MX27_PAD_ATA_DATA10 = MX27_PAD_ID(MX27_PD, 12),
+	MX27_PAD_ATA_DATA11 = MX27_PAD_ID(MX27_PD, 13),
+	MX27_PAD_ATA_DATA12 = MX27_PAD_ID(MX27_PD, 14),
+	MX27_PAD_ATA_DATA13 = MX27_PAD_ID(MX27_PD, 15),
+	MX27_PAD_ATA_DATA14 = MX27_PAD_ID(MX27_PD, 16),
+	MX27_PAD_I2C_DATA = MX27_PAD_ID(MX27_PD, 17),
+	MX27_PAD_I2C_CLK = MX27_PAD_ID(MX27_PD, 18),
+	MX27_PAD_CSPI2_SS2 = MX27_PAD_ID(MX27_PD, 19),
+	MX27_PAD_CSPI2_SS1 = MX27_PAD_ID(MX27_PD, 20),
+	MX27_PAD_CSPI2_SS0 = MX27_PAD_ID(MX27_PD, 21),
+	MX27_PAD_CSPI2_SCLK = MX27_PAD_ID(MX27_PD, 22),
+	MX27_PAD_CSPI2_MISO = MX27_PAD_ID(MX27_PD, 23),
+	MX27_PAD_CSPI2_MOSI = MX27_PAD_ID(MX27_PD, 24),
+	MX27_PAD_CSPI1_RDY = MX27_PAD_ID(MX27_PD, 25),
+	MX27_PAD_CSPI1_SS2 = MX27_PAD_ID(MX27_PD, 26),
+	MX27_PAD_CSPI1_SS1 = MX27_PAD_ID(MX27_PD, 27),
+	MX27_PAD_CSPI1_SS0 = MX27_PAD_ID(MX27_PD, 28),
+	MX27_PAD_CSPI1_SCLK = MX27_PAD_ID(MX27_PD, 29),
+	MX27_PAD_CSPI1_MISO = MX27_PAD_ID(MX27_PD, 30),
+	MX27_PAD_CSPI1_MOSI = MX27_PAD_ID(MX27_PD, 31),
 
-	MX27_PAD_USBOTG_NXT = PAD_ID(PE, 0),
-	MX27_PAD_USBOTG_STP = PAD_ID(PE, 1),
-	MX27_PAD_USBOTG_DIR = PAD_ID(PE, 2),
-	MX27_PAD_UART2_CTS = PAD_ID(PE, 3),
-	MX27_PAD_UART2_RTS = PAD_ID(PE, 4),
-	MX27_PAD_PWMO = PAD_ID(PE, 5),
-	MX27_PAD_UART2_TXD = PAD_ID(PE, 6),
-	MX27_PAD_UART2_RXD = PAD_ID(PE, 7),
-	MX27_PAD_UART3_TXD = PAD_ID(PE, 8),
-	MX27_PAD_UART3_RXD = PAD_ID(PE, 9),
-	MX27_PAD_UART3_CTS = PAD_ID(PE, 10),
-	MX27_PAD_UART3_RTS = PAD_ID(PE, 11),
-	MX27_PAD_UART1_TXD = PAD_ID(PE, 12),
-	MX27_PAD_UART1_RXD = PAD_ID(PE, 13),
-	MX27_PAD_UART1_CTS = PAD_ID(PE, 14),
-	MX27_PAD_UART1_RTS = PAD_ID(PE, 15),
-	MX27_PAD_RTCK = PAD_ID(PE, 16),
-	MX27_PAD_RESET_OUT_B = PAD_ID(PE, 17),
-	MX27_PAD_SD1_D0 = PAD_ID(PE, 18),
-	MX27_PAD_SD1_D1 = PAD_ID(PE, 19),
-	MX27_PAD_SD1_D2 = PAD_ID(PE, 20),
-	MX27_PAD_SD1_D3 = PAD_ID(PE, 21),
-	MX27_PAD_SD1_CMD = PAD_ID(PE, 22),
-	MX27_PAD_SD1_CLK = PAD_ID(PE, 23),
-	MX27_PAD_USBOTG_CLK = PAD_ID(PE, 24),
-	MX27_PAD_USBOTG_DATA7 = PAD_ID(PE, 25),
+	MX27_PAD_USBOTG_NXT = MX27_PAD_ID(MX27_PE, 0),
+	MX27_PAD_USBOTG_STP = MX27_PAD_ID(MX27_PE, 1),
+	MX27_PAD_USBOTG_DIR = MX27_PAD_ID(MX27_PE, 2),
+	MX27_PAD_UART2_CTS = MX27_PAD_ID(MX27_PE, 3),
+	MX27_PAD_UART2_RTS = MX27_PAD_ID(MX27_PE, 4),
+	MX27_PAD_PWMO = MX27_PAD_ID(MX27_PE, 5),
+	MX27_PAD_UART2_TXD = MX27_PAD_ID(MX27_PE, 6),
+	MX27_PAD_UART2_RXD = MX27_PAD_ID(MX27_PE, 7),
+	MX27_PAD_UART3_TXD = MX27_PAD_ID(MX27_PE, 8),
+	MX27_PAD_UART3_RXD = MX27_PAD_ID(MX27_PE, 9),
+	MX27_PAD_UART3_CTS = MX27_PAD_ID(MX27_PE, 10),
+	MX27_PAD_UART3_RTS = MX27_PAD_ID(MX27_PE, 11),
+	MX27_PAD_UART1_TXD = MX27_PAD_ID(MX27_PE, 12),
+	MX27_PAD_UART1_RXD = MX27_PAD_ID(MX27_PE, 13),
+	MX27_PAD_UART1_CTS = MX27_PAD_ID(MX27_PE, 14),
+	MX27_PAD_UART1_RTS = MX27_PAD_ID(MX27_PE, 15),
+	MX27_PAD_RTCK = MX27_PAD_ID(MX27_PE, 16),
+	MX27_PAD_RESET_OUT_B = MX27_PAD_ID(MX27_PE, 17),
+	MX27_PAD_SD1_D0 = MX27_PAD_ID(MX27_PE, 18),
+	MX27_PAD_SD1_D1 = MX27_PAD_ID(MX27_PE, 19),
+	MX27_PAD_SD1_D2 = MX27_PAD_ID(MX27_PE, 20),
+	MX27_PAD_SD1_D3 = MX27_PAD_ID(MX27_PE, 21),
+	MX27_PAD_SD1_CMD = MX27_PAD_ID(MX27_PE, 22),
+	MX27_PAD_SD1_CLK = MX27_PAD_ID(MX27_PE, 23),
+	MX27_PAD_USBOTG_CLK = MX27_PAD_ID(MX27_PE, 24),
+	MX27_PAD_USBOTG_DATA7 = MX27_PAD_ID(MX27_PE, 25),
 
-	MX27_PAD_NFRB = PAD_ID(PF, 0),
-	MX27_PAD_NFCLE = PAD_ID(PF, 1),
-	MX27_PAD_NFWP_B = PAD_ID(PF, 2),
-	MX27_PAD_NFCE_B = PAD_ID(PF, 3),
-	MX27_PAD_NFALE = PAD_ID(PF, 4),
-	MX27_PAD_NFRE_B = PAD_ID(PF, 5),
-	MX27_PAD_NFWE_B = PAD_ID(PF, 6),
-	MX27_PAD_PC_POE = PAD_ID(PF, 7),
-	MX27_PAD_PC_RW_B = PAD_ID(PF, 8),
-	MX27_PAD_IOIS16 = PAD_ID(PF, 9),
-	MX27_PAD_PC_RST = PAD_ID(PF, 10),
-	MX27_PAD_PC_BVD2 = PAD_ID(PF, 11),
-	MX27_PAD_PC_BVD1 = PAD_ID(PF, 12),
-	MX27_PAD_PC_VS2 = PAD_ID(PF, 13),
-	MX27_PAD_PC_VS1 = PAD_ID(PF, 14),
-	MX27_PAD_CLKO = PAD_ID(PF, 15),
-	MX27_PAD_PC_PWRON = PAD_ID(PF, 16),
-	MX27_PAD_PC_READY = PAD_ID(PF, 17),
-	MX27_PAD_PC_WAIT_B = PAD_ID(PF, 18),
-	MX27_PAD_PC_CD2_B = PAD_ID(PF, 19),
-	MX27_PAD_PC_CD1_B = PAD_ID(PF, 20),
-	MX27_PAD_CS4_B = PAD_ID(PF, 21),
-	MX27_PAD_CS5_B = PAD_ID(PF, 22),
-	MX27_PAD_ATA_DATA15 = PAD_ID(PF, 23),
+	MX27_PAD_NFRB = MX27_PAD_ID(MX27_PF, 0),
+	MX27_PAD_NFCLE = MX27_PAD_ID(MX27_PF, 1),
+	MX27_PAD_NFWP_B = MX27_PAD_ID(MX27_PF, 2),
+	MX27_PAD_NFCE_B = MX27_PAD_ID(MX27_PF, 3),
+	MX27_PAD_NFALE = MX27_PAD_ID(MX27_PF, 4),
+	MX27_PAD_NFRE_B = MX27_PAD_ID(MX27_PF, 5),
+	MX27_PAD_NFWE_B = MX27_PAD_ID(MX27_PF, 6),
+	MX27_PAD_PC_POE = MX27_PAD_ID(MX27_PF, 7),
+	MX27_PAD_PC_RW_B = MX27_PAD_ID(MX27_PF, 8),
+	MX27_PAD_IOIS16 = MX27_PAD_ID(MX27_PF, 9),
+	MX27_PAD_PC_RST = MX27_PAD_ID(MX27_PF, 10),
+	MX27_PAD_PC_BVD2 = MX27_PAD_ID(MX27_PF, 11),
+	MX27_PAD_PC_BVD1 = MX27_PAD_ID(MX27_PF, 12),
+	MX27_PAD_PC_VS2 = MX27_PAD_ID(MX27_PF, 13),
+	MX27_PAD_PC_VS1 = MX27_PAD_ID(MX27_PF, 14),
+	MX27_PAD_CLKO = MX27_PAD_ID(MX27_PF, 15),
+	MX27_PAD_PC_PWRON = MX27_PAD_ID(MX27_PF, 16),
+	MX27_PAD_PC_READY = MX27_PAD_ID(MX27_PF, 17),
+	MX27_PAD_PC_WAIT_B = MX27_PAD_ID(MX27_PF, 18),
+	MX27_PAD_PC_CD2_B = MX27_PAD_ID(MX27_PF, 19),
+	MX27_PAD_PC_CD1_B = MX27_PAD_ID(MX27_PF, 20),
+	MX27_PAD_CS4_B = MX27_PAD_ID(MX27_PF, 21),
+	MX27_PAD_CS5_B = MX27_PAD_ID(MX27_PF, 22),
+	MX27_PAD_ATA_DATA15 = MX27_PAD_ID(MX27_PF, 23),
 };
 
 /* Pad names for the pinmux subsystem */