ARM: tegra: powermon: Fix copyrights from GPLv3 to GPLv2
[linux-3.10.git] / arch / arm / mach-tegra / pinmux-t12-tables.c
index e6deb6d..45c723d 100644 (file)
@@ -269,7 +269,7 @@ const struct tegra_drive_pingroup_desc tegra_soc_drive_pingroups[TEGRA_MAX_DRIVE
        PINGROUP(KB_ROW3,         PR3,          SYS,        KBC,        DISPLAYA,   DTV,        DISPLAYB,   RSVD,       INPUT,  0x32c8),\
        PINGROUP(KB_ROW4,         PR4,          SYS,        KBC,        DISPLAYA,   SPI2,       DISPLAYB,   RSVD,       INPUT,  0x32cc),\
        PINGROUP(KB_ROW5,         PR5,          SYS,        KBC,        DISPLAYA,   SPI2,       DISPLAYB,   RSVD,       INPUT,  0x32d0),\
-       PINGROUP(KB_ROW6,         PR6,          SYS,        KBC,        DISPLAYA,   RSVD,       DISPLAYB,   RSVD,       INPUT,  0x32d4),\
+       PINGROUP(KB_ROW6,         PR6,          SYS,        KBC,        DISPLAYA,   DISPLAYA_ALT,       DISPLAYB,   DISPLAYA_ALT,       INPUT,  0x32d4),\
        PINGROUP(KB_ROW7,         PR7,          SYS,        KBC,        RSVD,       RSVD2,      UARTA,      RSVD,       INPUT,  0x32d8),\
        PINGROUP(KB_ROW8,         PS0,          SYS,        KBC,        RSVD,       RSVD2,      UARTA,      RSVD,       INPUT,  0x32dc),\
        PINGROUP(KB_ROW9,         PS1,          SYS,        KBC,        RSVD,       RSVD2,      UARTA,      RSVD,       INPUT,  0x32e0),\
@@ -328,22 +328,22 @@ const struct tegra_drive_pingroup_desc tegra_soc_drive_pingroups[TEGRA_MAX_DRIVE
 /* !!!FIXME!!! FILL IN fSafe COLUMN IN TABLE ....... */
 #define PINGROUPS      \
        /*       NAME           GPIO    VDD     f0              f1              f2              f3              fSafe           io      reg */\
-       PINGROUP(ULPI_DATA0,    PO1,    BB,     SPI3,           HSI,            UARTA,          ULPI,           RSVD,           INPUT,  0x3000),\
-       PINGROUP(ULPI_DATA1,    PO2,    BB,     SPI3,           HSI,            UARTA,          ULPI,           RSVD,           INPUT,  0x3004),\
-       PINGROUP(ULPI_DATA2,    PO3,    BB,     SPI3,           HSI,            UARTA,          ULPI,           RSVD,           INPUT,  0x3008),\
-       PINGROUP(ULPI_DATA3,    PO4,    BB,     SPI3,           HSI,            UARTA,          ULPI,           RSVD,           INPUT,  0x300c),\
-       PINGROUP(ULPI_DATA4,    PO5,    BB,     SPI2,           HSI,            UARTA,          ULPI,           RSVD,           INPUT,  0x3010),\
-       PINGROUP(ULPI_DATA5,    PO6,    BB,     SPI2,           HSI,            UARTA,          ULPI,           RSVD,           INPUT,  0x3014),\
-       PINGROUP(ULPI_DATA6,    PO7,    BB,     SPI2,           HSI,            UARTA,          ULPI,           RSVD,           INPUT,  0x3018),\
-       PINGROUP(ULPI_DATA7,    PO0,    BB,     SPI2,           HSI,            UARTA,          ULPI,           RSVD,           INPUT,  0x301c),\
+       PINGROUP(ULPI_DATA0,    PO1,    BB,     SPI3,           HSI,            UARTA,          ULPI,           SPI3,           INPUT,  0x3000),\
+       PINGROUP(ULPI_DATA1,    PO2,    BB,     SPI3,           HSI,            UARTA,          ULPI,           SPI3,           INPUT,  0x3004),\
+       PINGROUP(ULPI_DATA2,    PO3,    BB,     SPI3,           HSI,            UARTA,          ULPI,           SPI3,           INPUT,  0x3008),\
+       PINGROUP(ULPI_DATA3,    PO4,    BB,     SPI3,           HSI,            UARTA,          ULPI,           SPI3,           INPUT,  0x300c),\
+       PINGROUP(ULPI_DATA4,    PO5,    BB,     SPI2,           HSI,            UARTA,          ULPI,           SPI2,           INPUT,  0x3010),\
+       PINGROUP(ULPI_DATA5,    PO6,    BB,     SPI2,           HSI,            UARTA,          ULPI,           SPI2,           INPUT,  0x3014),\
+       PINGROUP(ULPI_DATA6,    PO7,    BB,     SPI2,           HSI,            UARTA,          ULPI,           SPI2,           INPUT,  0x3018),\
+       PINGROUP(ULPI_DATA7,    PO0,    BB,     SPI2,           HSI,            UARTA,          ULPI,           SPI2,           INPUT,  0x301c),\
        PINGROUP(ULPI_CLK,      PY0,    BB,     SPI1,           SPI5,           UARTD,          ULPI,           RSVD,           INPUT,  0x3020),\
        PINGROUP(ULPI_DIR,      PY1,    BB,     SPI1,           SPI5,           UARTD,          ULPI,           RSVD,           INPUT,  0x3024),\
        PINGROUP(ULPI_NXT,      PY2,    BB,     SPI1,           SPI5,           UARTD,          ULPI,           RSVD,           INPUT,  0x3028),\
        PINGROUP(ULPI_STP,      PY3,    BB,     SPI1,           SPI5,           UARTD,          ULPI,           RSVD,           INPUT,  0x302c),\
-       PINGROUP(DAP3_FS,       PP0,    BB,     I2S2,           SPI5,           DISPLAYA,       DISPLAYB,       RSVD,           INPUT,  0x3030),\
-       PINGROUP(DAP3_DIN,      PP1,    BB,     I2S2,           SPI5,           DISPLAYA,       DISPLAYB,       RSVD,           INPUT,  0x3034),\
-       PINGROUP(DAP3_DOUT,     PP2,    BB,     I2S2,           SPI5,           DISPLAYA,       RSVD3,          RSVD,           INPUT,  0x3038),\
-       PINGROUP(DAP3_SCLK,     PP3,    BB,     I2S2,           SPI5,           RSVD2,          DISPLAYB,       RSVD,           INPUT,  0x303c),\
+       PINGROUP(DAP3_FS,       PP0,    BB,     I2S2,           SPI5,           DISPLAYA,       DISPLAYB,       I2S2,           INPUT,  0x3030),\
+       PINGROUP(DAP3_DIN,      PP1,    BB,     I2S2,           SPI5,           DISPLAYA,       DISPLAYB,       I2S2,           INPUT,  0x3034),\
+       PINGROUP(DAP3_DOUT,     PP2,    BB,     I2S2,           SPI5,           DISPLAYA,       RSVD3,          I2S2,           INPUT,  0x3038),\
+       PINGROUP(DAP3_SCLK,     PP3,    BB,     I2S2,           SPI5,           RSVD2,          DISPLAYB,       I2S2,           INPUT,  0x303c),\
        PINGROUP(GPIO_PV0,      PV0,    BB,     RSVD0,          RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x3040),\
        PINGROUP(GPIO_PV1,      PV1,    BB,     RSVD0,          RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x3044),\
        PINGROUP(SDMMC1_CLK,    PZ0,    SDMMC1, SDMMC1,         CLK12,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x3048),\
@@ -352,9 +352,9 @@ const struct tegra_drive_pingroup_desc tegra_soc_drive_pingroups[TEGRA_MAX_DRIVE
        PINGROUP(SDMMC1_DAT2,   PY5,    SDMMC1, SDMMC1,         PWM0,           SPI4,           UARTA,          RSVD,           INPUT,  0x3054),\
        PINGROUP(SDMMC1_DAT1,   PY6,    SDMMC1, SDMMC1,         PWM1,           SPI4,           UARTA,          RSVD,           INPUT,  0x3058),\
        PINGROUP(SDMMC1_DAT0,   PY7,    SDMMC1, SDMMC1,         RSVD1,          SPI4,           UARTA,          RSVD,           INPUT,  0x305c),\
-       PINGROUP(CLK2_OUT,      PW5,    SDMMC1, EXTPERIPH2,     RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x3068),\
-       PINGROUP(CLK2_REQ,      PCC5,   SDMMC1, DAP,            RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x306c),\
-       PINGROUP(HDMI_INT,      PN7,    HV,     RSVD0,          RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x3110),\
+       PINGROUP(CLK2_OUT,      PW5,    SDMMC1, EXTPERIPH2,     RSVD1,          RSVD2,          RSVD3,          EXTPERIPH2,     INPUT,  0x3068),\
+       PINGROUP(CLK2_REQ,      PCC5,   SDMMC1, DAP,            RSVD1,          RSVD2,          RSVD3,          DAP,            INPUT,  0x306c),\
+       PINGROUP(HDMI_INT,      PN7,    HV,     RSVD0,          RSVD1,          RSVD2,          RSVD3,          RSVD0,          INPUT,  0x3110),\
        PINGROUP(DDC_SCL,       PV4,    HV,     I2C4,           RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x3114),\
        PINGROUP(DDC_SDA,       PV5,    HV,     I2C4,           RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x3118),\
        PINGROUP(UART2_RXD,     PC3,    UART,   IRDA,           SPDIF,          UARTA,          SPI4,           RSVD,           INPUT,  0x3164),\
@@ -365,13 +365,13 @@ const struct tegra_drive_pingroup_desc tegra_soc_drive_pingroups[TEGRA_MAX_DRIVE
        PINGROUP(UART3_RXD,     PW7,    UART,   UARTC,          RSVD1,          GMI,            SPI4,           RSVD,           INPUT,  0x3178),\
        PINGROUP(UART3_CTS_N,   PA1,    UART,   UARTC,          SDMMC1,         DTV,            GMI,            RSVD,           INPUT,  0x317c),\
        PINGROUP(UART3_RTS_N,   PC0,    UART,   UARTC,          PWM0,           DTV,            GMI,            RSVD,           INPUT,  0x3180),\
-       PINGROUP(GPIO_PU0,      PU0,    UART,   OWR,            UARTA,          GMI,            RSVD3,          RSVD,           INPUT,  0x3184),\
-       PINGROUP(GPIO_PU1,      PU1,    UART,   RSVD0,          UARTA,          GMI,            RSVD3,          RSVD,           INPUT,  0x3188),\
-       PINGROUP(GPIO_PU2,      PU2,    UART,   RSVD0,          UARTA,          GMI,            RSVD3,          RSVD,           INPUT,  0x318c),\
-       PINGROUP(GPIO_PU3,      PU3,    UART,   PWM0,           UARTA,          GMI,            DISPLAYB,       RSVD,           INPUT,  0x3190),\
-       PINGROUP(GPIO_PU4,      PU4,    UART,   PWM1,           UARTA,          GMI,            DISPLAYB,       RSVD,           INPUT,  0x3194),\
-       PINGROUP(GPIO_PU5,      PU5,    UART,   PWM2,           UARTA,          GMI,            DISPLAYB,       RSVD,           INPUT,  0x3198),\
-       PINGROUP(GPIO_PU6,      PU6,    UART,   PWM3,           UARTA,          RSVD2,          GMI,            RSVD,           INPUT,  0x319c),\
+       PINGROUP(GPIO_PU0,      PU0,    UART,   OWR,            UARTA,          GMI,            RSVD3,          RSVD3,          INPUT,  0x3184),\
+       PINGROUP(GPIO_PU1,      PU1,    UART,   RSVD0,          UARTA,          GMI,            RSVD3,          RSVD3,          INPUT,  0x3188),\
+       PINGROUP(GPIO_PU2,      PU2,    UART,   RSVD0,          UARTA,          GMI,            RSVD3,          RSVD3,          INPUT,  0x318c),\
+       PINGROUP(GPIO_PU3,      PU3,    UART,   PWM0,           UARTA,          GMI,            DISPLAYB,       PWM0,           INPUT,  0x3190),\
+       PINGROUP(GPIO_PU4,      PU4,    UART,   PWM1,           UARTA,          GMI,            DISPLAYB,       PWM1,           INPUT,  0x3194),\
+       PINGROUP(GPIO_PU5,      PU5,    UART,   PWM2,           UARTA,          GMI,            DISPLAYB,       PWM2,           INPUT,  0x3198),\
+       PINGROUP(GPIO_PU6,      PU6,    UART,   PWM3,           UARTA,          RSVD2,          GMI,            RSVD2,          INPUT,  0x319c),\
        PINGROUP(GEN1_I2C_SCL,  PC4,    UART,   I2C1,           RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x31a0),\
        PINGROUP(GEN1_I2C_SDA,  PC5,    UART,   I2C1,           RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x31a4),\
        PINGROUP(DAP4_FS,       PP4,    UART,   I2S3,           GMI,            DTV,            RSVD3,          RSVD,           INPUT,  0x31a8),\
@@ -379,43 +379,43 @@ const struct tegra_drive_pingroup_desc tegra_soc_drive_pingroups[TEGRA_MAX_DRIVE
        PINGROUP(DAP4_DOUT,     PP6,    UART,   I2S3,           GMI,            DTV,            RSVD3,          RSVD,           INPUT,  0x31b0),\
        PINGROUP(DAP4_SCLK,     PP7,    UART,   I2S3,           GMI,            RSVD2,          RSVD3,          RSVD,           INPUT,  0x31b4),\
        PINGROUP(CLK3_OUT,      PE0,    UART,   EXTPERIPH3,     RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x31b8),\
-       PINGROUP(CLK3_REQ,      PE1,    UART,   DEV3,           RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x31bc),\
-       PINGROUP(GPIO_PC7,      PC7,    GMI,    RSVD0,          RSVD1,          GMI,            GMI_ALT,        RSVD,           INPUT,  0x31c0),\
-       PINGROUP(GPIO_PI5,      PI5,    GMI,    SDMMC2,         RSVD1,          GMI,            RSVD3,          RSVD,           INPUT,  0x31c4),\
-       PINGROUP(GPIO_PI7,      PI7,    GMI,    RSVD0,          TRACE,          GMI,            DTV,            RSVD,           INPUT,  0x31c8),\
+       PINGROUP(CLK3_REQ,      PE1,    UART,   DEV3,           RSVD1,          RSVD2,          RSVD3,          RSVD3,          INPUT,  0x31bc),\
+       PINGROUP(GPIO_PC7,      PC7,    GMI,    RSVD0,          RSVD1,          GMI,            GMI_ALT,        RSVD0,          INPUT,  0x31c0),\
+       PINGROUP(GPIO_PI5,      PI5,    GMI,    SDMMC2,         RSVD1,          GMI,            RSVD3,          GMI,            INPUT,  0x31c4),\
+       PINGROUP(GPIO_PI7,      PI7,    GMI,    RSVD0,          TRACE,          GMI,            DTV,            RSVD0,          INPUT,  0x31c8),\
        PINGROUP(GPIO_PK0,      PK0,    GMI,    RSVD0,          SDMMC3,         GMI,            SOC,            RSVD,           INPUT,  0x31cc),\
-       PINGROUP(GPIO_PK1,      PK1,    GMI,    SDMMC2,         TRACE,          GMI,            RSVD3,          RSVD,           INPUT,  0x31d0),\
-       PINGROUP(GPIO_PJ0,      PJ0,    GMI,    RSVD0,          RSVD1,          GMI,            USB,            RSVD,           INPUT,  0x31d4),\
+       PINGROUP(GPIO_PK1,      PK1,    GMI,    SDMMC2,         TRACE,          GMI,            RSVD3,          GMI,            INPUT,  0x31d0),\
+       PINGROUP(GPIO_PJ0,      PJ0,    GMI,    RSVD0,          RSVD1,          GMI,            USB,            RSVD0,          INPUT,  0x31d4),\
        PINGROUP(GPIO_PJ2,      PJ2,    GMI,    RSVD0,          RSVD1,          GMI,            SOC,            RSVD,           INPUT,  0x31d8),\
-       PINGROUP(GPIO_PK3,      PK3,    GMI,    SDMMC2,         TRACE,          GMI,            CCLA,           RSVD,           INPUT,  0x31dc),\
-       PINGROUP(GPIO_PK4,      PK4,    GMI,    SDMMC2,         RSVD1,          GMI,            GMI_ALT,        RSVD,           INPUT,  0x31e0),\
-       PINGROUP(GPIO_PK2,      PK2,    GMI,    RSVD0,          RSVD1,          GMI,            RSVD3,          RSVD,           INPUT,  0x31e4),\
-       PINGROUP(GPIO_PI3,      PI3,    GMI,    RSVD0,          RSVD1,          GMI,            SPI4,           RSVD,           INPUT,  0x31e8),\
-       PINGROUP(GPIO_PI6,      PI6,    GMI,    RSVD0,          RSVD1,          GMI,            SDMMC2,         RSVD,           INPUT,  0x31ec),\
-       PINGROUP(GPIO_PG0,      PG0,    GMI,    RSVD0,          RSVD1,          GMI,            RSVD3,          RSVD,           INPUT,  0x31f0),\
-       PINGROUP(GPIO_PG1,      PG1,    GMI,    RSVD0,          RSVD1,          GMI,            RSVD3,          RSVD,           INPUT,  0x31f4),\
-       PINGROUP(GPIO_PG2,      PG2,    GMI,    RSVD0,          TRACE,          GMI,            RSVD3,          RSVD,           INPUT,  0x31f8),\
-       PINGROUP(GPIO_PG3,      PG3,    GMI,    RSVD0,          TRACE,          GMI,            RSVD3,          RSVD,           INPUT,  0x31fc),\
+       PINGROUP(GPIO_PK3,      PK3,    GMI,    SDMMC2,         TRACE,          GMI,            CCLA,           GMI,            INPUT,  0x31dc),\
+       PINGROUP(GPIO_PK4,      PK4,    GMI,    SDMMC2,         RSVD1,          GMI,            GMI_ALT,        GMI,            INPUT,  0x31e0),\
+       PINGROUP(GPIO_PK2,      PK2,    GMI,    RSVD0,          RSVD1,          GMI,            RSVD3,          RSVD3,          INPUT,  0x31e4),\
+       PINGROUP(GPIO_PI3,      PI3,    GMI,    RSVD0,          RSVD1,          GMI,            SPI4,           RSVD0,          INPUT,  0x31e8),\
+       PINGROUP(GPIO_PI6,      PI6,    GMI,    RSVD0,          RSVD1,          GMI,            SDMMC2,         RSVD0,          INPUT,  0x31ec),\
+       PINGROUP(GPIO_PG0,      PG0,    GMI,    RSVD0,          RSVD1,          GMI,            RSVD3,          RSVD3,          INPUT,  0x31f0),\
+       PINGROUP(GPIO_PG1,      PG1,    GMI,    RSVD0,          RSVD1,          GMI,            RSVD3,          RSVD3,          INPUT,  0x31f4),\
+       PINGROUP(GPIO_PG2,      PG2,    GMI,    RSVD0,          TRACE,          GMI,            RSVD3,          RSVD3,          INPUT,  0x31f8),\
+       PINGROUP(GPIO_PG3,      PG3,    GMI,    RSVD0,          TRACE,          GMI,            RSVD3,          RSVD3,          INPUT,  0x31fc),\
        PINGROUP(GPIO_PG4,      PG4,    GMI,    RSVD0,          TMDS,           GMI,            SPI4,           RSVD,           INPUT,  0x3200),\
        PINGROUP(GPIO_PG5,      PG5,    GMI,    RSVD0,          RSVD1,          GMI,            SPI4,           RSVD,           INPUT,  0x3204),\
        PINGROUP(GPIO_PG6,      PG6,    GMI,    RSVD0,          RSVD1,          GMI,            SPI4,           RSVD,           INPUT,  0x3208),\
        PINGROUP(GPIO_PG7,      PG7,    GMI,    RSVD0,          RSVD1,          GMI,            SPI4,           RSVD,           INPUT,  0x320c),\
        PINGROUP(GPIO_PH0,      PH0,    GMI,    PWM0,           TRACE,          GMI,            DTV,            RSVD,           INPUT,  0x3210),\
        PINGROUP(GPIO_PH1,      PH1,    GMI,    PWM1,           TMDS,           GMI,            DISPLAYA,       RSVD,           INPUT,  0x3214),\
-       PINGROUP(GPIO_PH2,      PH2,    GMI,    PWM2,           TMDS,           GMI,            CLDVFS,         RSVD,           INPUT,  0x3218),\
-       PINGROUP(GPIO_PH3,      PH3,    GMI,    PWM3,           SPI4,           GMI,            CLDVFS,         RSVD,           INPUT,  0x321c),\
-       PINGROUP(GPIO_PH4,      PH4,    GMI,    SDMMC2,         RSVD1,          GMI,            RSVD3,          RSVD,           INPUT,  0x3220),\
-       PINGROUP(GPIO_PH5,      PH5,    GMI,    SDMMC2,         RSVD1,          GMI,            RSVD3,          RSVD,           INPUT,  0x3224),\
-       PINGROUP(GPIO_PH6,      PH6,    GMI,    SDMMC2,         TRACE,          GMI,            DTV,            RSVD,           INPUT,  0x3228),\
-       PINGROUP(GPIO_PH7,      PH7,    GMI,    SDMMC2,         TRACE,          GMI,            DTV,            RSVD,           INPUT,  0x322c),\
+       PINGROUP(GPIO_PH2,      PH2,    GMI,    PWM2,           TMDS,           GMI,            CLDVFS,         GMI,            INPUT,  0x3218),\
+       PINGROUP(GPIO_PH3,      PH3,    GMI,    PWM3,           SPI4,           GMI,            CLDVFS,         GMI,            INPUT,  0x321c),\
+       PINGROUP(GPIO_PH4,      PH4,    GMI,    SDMMC2,         RSVD1,          GMI,            RSVD3,          GMI,            INPUT,  0x3220),\
+       PINGROUP(GPIO_PH5,      PH5,    GMI,    SDMMC2,         RSVD1,          GMI,            RSVD3,          GMI,            INPUT,  0x3224),\
+       PINGROUP(GPIO_PH6,      PH6,    GMI,    SDMMC2,         TRACE,          GMI,            DTV,            GMI,            INPUT,  0x3228),\
+       PINGROUP(GPIO_PH7,      PH7,    GMI,    SDMMC2,         TRACE,          GMI,            DTV,            GMI,            INPUT,  0x322c),\
        PINGROUP(GPIO_PJ7,      PJ7,    GMI,    UARTD,          RSVD1,          GMI,            GMI_ALT,        RSVD,           INPUT,  0x3230),\
        PINGROUP(GPIO_PB0,      PB0,    GMI,    UARTD,          RSVD1,          GMI,            RSVD3,          RSVD,           INPUT,  0x3234),\
        PINGROUP(GPIO_PB1,      PB1,    GMI,    UARTD,          RSVD1,          GMI,            RSVD3,          RSVD,           INPUT,  0x3238),\
        PINGROUP(GPIO_PK7,      PK7,    GMI,    UARTD,          RSVD1,          GMI,            RSVD3,          RSVD,           INPUT,  0x323c),\
-       PINGROUP(GPIO_PI0,      PI0,    GMI,    RSVD0,          RSVD1,          GMI,            RSVD3,          RSVD,           INPUT,  0x3240),\
-       PINGROUP(GPIO_PI1,      PI1,    GMI,    RSVD0,          RSVD1,          GMI,            RSVD3,          RSVD,           INPUT,  0x3244),\
-       PINGROUP(GPIO_PI2,      PI2,    GMI,    SDMMC2,         TRACE,          GMI,            RSVD3,          RSVD,           INPUT,  0x3248),\
-       PINGROUP(GPIO_PI4,      PI4,    GMI,    SPI4,           TRACE,          GMI,            DISPLAYA,       RSVD,           INPUT,  0x324c),\
+       PINGROUP(GPIO_PI0,      PI0,    GMI,    RSVD0,          RSVD1,          GMI,            RSVD3,          RSVD3,          INPUT,  0x3240),\
+       PINGROUP(GPIO_PI1,      PI1,    GMI,    RSVD0,          RSVD1,          GMI,            RSVD3,          RSVD0,          INPUT,  0x3244),\
+       PINGROUP(GPIO_PI2,      PI2,    GMI,    SDMMC2,         TRACE,          GMI,            RSVD3,          GMI,            INPUT,  0x3248),\
+       PINGROUP(GPIO_PI4,      PI4,    GMI,    SPI4,           TRACE,          GMI,            DISPLAYA,       GMI,            INPUT,  0x324c),\
        PINGROUP(GEN2_I2C_SCL,  PT5,    GMI,    I2C2,           RSVD1,          GMI,            RSVD3,          RSVD,           INPUT,  0x3250),\
        PINGROUP(GEN2_I2C_SDA,  PT6,    GMI,    I2C2,           RSVD1,          GMI,            RSVD3,          RSVD,           INPUT,  0x3254),\
        PINGROUP(SDMMC4_CLK,    PCC4,   SDMMC4, SDMMC4,         RSVD1,          GMI,            RSVD3,          RSVD,           INPUT,  0x3258),\
@@ -429,95 +429,95 @@ const struct tegra_drive_pingroup_desc tegra_soc_drive_pingroups[TEGRA_MAX_DRIVE
        PINGROUP(SDMMC4_DAT6,   PA6,    SDMMC4, SDMMC4,         SPI3,           GMI,            RSVD3,          RSVD,           INPUT,  0x3278),\
        PINGROUP(SDMMC4_DAT7,   PA7,    SDMMC4, SDMMC4,         RSVD1,          GMI,            RSVD3,          RSVD,           INPUT,  0x327c),\
        PINGROUP(CAM_MCLK,      PCC0,   CAM,    VI,             VI_ALT1,        VI_ALT3,        SDMMC2,         RSVD,           INPUT,  0x3284),\
-       PINGROUP(GPIO_PCC1,     PCC1,   CAM,    I2S4,           RSVD1,          RSVD2,          SDMMC2,         RSVD,           INPUT,  0x3288),\
+       PINGROUP(GPIO_PCC1,     PCC1,   CAM,    I2S4,           RSVD1,          RSVD2,          SDMMC2,         I2S4,           INPUT,  0x3288),\
        PINGROUP(GPIO_PBB0,     PBB0,   CAM,    VGP6,           VIMCLK2,        SDMMC2,         VIMCLK2_ALT,    RSVD,           INPUT,  0x328c),\
        PINGROUP(CAM_I2C_SCL,   PBB1,   CAM,    VGP1,           I2C3,           RSVD2,          SDMMC2,         RSVD,           INPUT,  0x3290),\
        PINGROUP(CAM_I2C_SDA,   PBB2,   CAM,    VGP2,           I2C3,           RSVD2,          SDMMC2,         RSVD,           INPUT,  0x3294),\
-       PINGROUP(GPIO_PBB3,     PBB3,   CAM,    VGP3,           DISPLAYA,       DISPLAYB,       SDMMC2,         RSVD,           INPUT,  0x3298),\
-       PINGROUP(GPIO_PBB4,     PBB4,   CAM,    VGP4,           DISPLAYA,       DISPLAYB,       SDMMC2,         RSVD,           INPUT,  0x329c),\
-       PINGROUP(GPIO_PBB5,     PBB5,   CAM,    VGP5,           DISPLAYA,       RSVD2,          SDMMC2,         RSVD,           INPUT,  0x32a0),\
-       PINGROUP(GPIO_PBB6,     PBB6,   CAM,    I2S4,           RSVD1,          DISPLAYB,       SDMMC2,         RSVD,           INPUT,  0x32a4),\
-       PINGROUP(GPIO_PBB7,     PBB7,   CAM,    I2S4,           RSVD1,          RSVD2,          SDMMC2,         RSVD,           INPUT,  0x32a8),\
-       PINGROUP(GPIO_PCC2,     PCC2,   CAM,    I2S4,           RSVD1,          SDMMC3,         SDMMC2,         RSVD,           INPUT,  0x32ac),\
+       PINGROUP(GPIO_PBB3,     PBB3,   CAM,    VGP3,           DISPLAYA,       DISPLAYB,       SDMMC2,         VGP3,           INPUT,  0x3298),\
+       PINGROUP(GPIO_PBB4,     PBB4,   CAM,    VGP4,           DISPLAYA,       DISPLAYB,       SDMMC2,         VGP4,           INPUT,  0x329c),\
+       PINGROUP(GPIO_PBB5,     PBB5,   CAM,    VGP5,           DISPLAYA,       RSVD2,          SDMMC2,         VGP5,           INPUT,  0x32a0),\
+       PINGROUP(GPIO_PBB6,     PBB6,   CAM,    I2S4,           RSVD1,          DISPLAYB,       SDMMC2,         I2S4,           INPUT,  0x32a4),\
+       PINGROUP(GPIO_PBB7,     PBB7,   CAM,    I2S4,           RSVD1,          RSVD2,          SDMMC2,         I2S4,           INPUT,  0x32a8),\
+       PINGROUP(GPIO_PCC2,     PCC2,   CAM,    I2S4,           RSVD1,          SDMMC3,         SDMMC2,         I2S4,           INPUT,  0x32ac),\
        PINGROUP(JTAG_RTCK,     INVALID, SYS,   RTCK,           RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x32b0),\
        PINGROUP(PWR_I2C_SCL,   PZ6,    SYS,    I2CPWR,         RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x32b4),\
        PINGROUP(PWR_I2C_SDA,   PZ7,    SYS,    I2CPWR,         RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x32b8),\
-       PINGROUP(KB_ROW0,       PR0,    SYS,    KBC,            RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x32bc),\
-       PINGROUP(KB_ROW1,       PR1,    SYS,    KBC,            RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x32c0),\
-       PINGROUP(KB_ROW2,       PR2,    SYS,    KBC,            RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x32c4),\
+       PINGROUP(KB_ROW0,       PR0,    SYS,    KBC,            RSVD1,          RSVD2,          RSVD3,          RSVD3,          INPUT,  0x32bc),\
+       PINGROUP(KB_ROW1,       PR1,    SYS,    KBC,            RSVD1,          RSVD2,          RSVD3,          RSVD3,          INPUT,  0x32c0),\
+       PINGROUP(KB_ROW2,       PR2,    SYS,    KBC,            RSVD1,          RSVD2,          RSVD3,          RSVD3,          INPUT,  0x32c4),\
        PINGROUP(KB_ROW3,       PR3,    SYS,    KBC,            DISPLAYA,       SYS,            DISPLAYB,       RSVD,           INPUT,  0x32c8),\
-       PINGROUP(KB_ROW4,       PR4,    SYS,    KBC,            DISPLAYA,       RSVD2,          DISPLAYB,       RSVD,           INPUT,  0x32cc),\
-       PINGROUP(KB_ROW5,       PR5,    SYS,    KBC,            DISPLAYA,       RSVD2,          DISPLAYB,       RSVD,           INPUT,  0x32d0),\
+       PINGROUP(KB_ROW4,       PR4,    SYS,    KBC,            DISPLAYA,       RSVD2,          DISPLAYB,       RSVD2,          INPUT,  0x32cc),\
+       PINGROUP(KB_ROW5,       PR5,    SYS,    KBC,            DISPLAYA,       RSVD2,          DISPLAYB,       RSVD2,          INPUT,  0x32d0),\
        PINGROUP(KB_ROW6,       PR6,    SYS,    KBC,            DISPLAYA,       DISPLAYA_ALT,   DISPLAYB,       RSVD,           INPUT,  0x32d4),\
-       PINGROUP(KB_ROW7,       PR7,    SYS,    KBC,            RSVD1,          CLDVFS,         UARTA,          RSVD,           INPUT,  0x32d8),\
-       PINGROUP(KB_ROW8,       PS0,    SYS,    KBC,            RSVD1,          CLDVFS,         UARTA,          RSVD,           INPUT,  0x32dc),\
+       PINGROUP(KB_ROW7,       PR7,    SYS,    KBC,            RSVD1,          CLDVFS,         UARTA,          RSVD1,          INPUT,  0x32d8),\
+       PINGROUP(KB_ROW8,       PS0,    SYS,    KBC,            RSVD1,          CLDVFS,         UARTA,          RSVD1,          INPUT,  0x32dc),\
        PINGROUP(KB_ROW9,       PS1,    SYS,    KBC,            RSVD1,          RSVD2,          UARTA,          RSVD,           INPUT,  0x32e0),\
        PINGROUP(KB_ROW10,      PS2,    SYS,    KBC,            RSVD1,          RSVD2,          UARTA,          RSVD,           INPUT,  0x32e4),\
-       PINGROUP(KB_ROW11,      PS3,    SYS,    KBC,            RSVD1,          RSVD2,          IRDA,           RSVD,           INPUT,  0x32e8),\
-       PINGROUP(KB_ROW12,      PS4,    SYS,    KBC,            RSVD1,          RSVD2,          IRDA,           RSVD,           INPUT,  0x32ec),\
-       PINGROUP(KB_ROW13,      PS5,    SYS,    KBC,            RSVD1,          SPI2,           RSVD3,          RSVD,           INPUT,  0x32f0),\
-       PINGROUP(KB_ROW14,      PS6,    SYS,    KBC,            RSVD1,          SPI2,           RSVD3,          RSVD,           INPUT,  0x32f4),\
+       PINGROUP(KB_ROW11,      PS3,    SYS,    KBC,            RSVD1,          RSVD2,          IRDA,           RSVD2,          INPUT,  0x32e8),\
+       PINGROUP(KB_ROW12,      PS4,    SYS,    KBC,            RSVD1,          RSVD2,          IRDA,           RSVD2,          INPUT,  0x32ec),\
+       PINGROUP(KB_ROW13,      PS5,    SYS,    KBC,            RSVD1,          SPI2,           RSVD3,          RSVD3,          INPUT,  0x32f0),\
+       PINGROUP(KB_ROW14,      PS6,    SYS,    KBC,            RSVD1,          SPI2,           RSVD3,          RSVD3,          INPUT,  0x32f4),\
        PINGROUP(KB_ROW15,      PS7,    SYS,    KBC,            SOC,            RSVD2,          RSVD3,          RSVD,           INPUT,  0x32f8),\
-       PINGROUP(KB_COL0,       PQ0,    SYS,    KBC,            RSVD1,          SPI2,           RSVD3,          RSVD,           INPUT,  0x32fc),\
-       PINGROUP(KB_COL1,       PQ1,    SYS,    KBC,            RSVD1,          SPI2,           RSVD3,          RSVD,           INPUT,  0x3300),\
-       PINGROUP(KB_COL2,       PQ2,    SYS,    KBC,            RSVD1,          SPI2,           RSVD3,          RSVD,           INPUT,  0x3304),\
-       PINGROUP(KB_COL3,       PQ3,    SYS,    KBC,            DISPLAYA,       PWM2,           UARTA,          RSVD,           INPUT,  0x3308),\
+       PINGROUP(KB_COL0,       PQ0,    SYS,    KBC,            RSVD1,          SPI2,           RSVD3,          RSVD3,          INPUT,  0x32fc),\
+       PINGROUP(KB_COL1,       PQ1,    SYS,    KBC,            RSVD1,          SPI2,           RSVD3,          RSVD3,          INPUT,  0x3300),\
+       PINGROUP(KB_COL2,       PQ2,    SYS,    KBC,            RSVD1,          SPI2,           RSVD3,          RSVD3,          INPUT,  0x3304),\
+       PINGROUP(KB_COL3,       PQ3,    SYS,    KBC,            DISPLAYA,       PWM2,           UARTA,          KBC,            INPUT,  0x3308),\
        PINGROUP(KB_COL4,       PQ4,    SYS,    KBC,            OWR,            SDMMC3,         UARTA,          RSVD,           INPUT,  0x330c),\
-       PINGROUP(KB_COL5,       PQ5,    SYS,    KBC,            RSVD1,          SDMMC3,         RSVD3,          RSVD,           INPUT,  0x3310),\
-       PINGROUP(KB_COL6,       PQ6,    SYS,    KBC,            RSVD1,          SPI2,           UARTD,          RSVD,           INPUT,  0x3314),\
-       PINGROUP(KB_COL7,       PQ7,    SYS,    KBC,            RSVD1,          SPI2,           UARTD,          RSVD,           INPUT,  0x3318),\
+       PINGROUP(KB_COL5,       PQ5,    SYS,    KBC,            RSVD1,          SDMMC3,         RSVD3,          RSVD3,          INPUT,  0x3310),\
+       PINGROUP(KB_COL6,       PQ6,    SYS,    KBC,            RSVD1,          SPI2,           UARTD,          RSVD1,          INPUT,  0x3314),\
+       PINGROUP(KB_COL7,       PQ7,    SYS,    KBC,            RSVD1,          SPI2,           UARTD,          RSVD1,          INPUT,  0x3318),\
        PINGROUP(CLK_32K_OUT,   PA0,    SYS,    BLINK,          SOC,            RSVD2,          RSVD3,          RSVD,           INPUT,  0x331c),\
        PINGROUP(CORE_PWR_REQ,  INVALID, SYS,   PWRON,          RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x3324),\
        PINGROUP(CPU_PWR_REQ,   INVALID, SYS,   CPU,            RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x3328),\
        PINGROUP(PWR_INT_N,     INVALID, SYS,   PMI,            RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x332c),\
        PINGROUP(CLK_32K_IN,    INVALID, SYS,   CLK,            RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x3330),\
-       PINGROUP(OWR,           INVALID, HV,    OWR,            RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x3334),\
+       PINGROUP(OWR,           INVALID, HV,    OWR,            RSVD1,          RSVD2,          RSVD3,          RSVD1,          INPUT,  0x3334),\
        PINGROUP(DAP1_FS,       PN0,    AUDIO,  I2S0,           HDA,            GMI,            RSVD3,          RSVD,           INPUT,  0x3338),\
        PINGROUP(DAP1_DIN,      PN1,    AUDIO,  I2S0,           HDA,            GMI,            RSVD3,          RSVD,           INPUT,  0x333c),\
        PINGROUP(DAP1_DOUT,     PN2,    AUDIO,  I2S0,           HDA,            GMI,            SATA,           RSVD,           INPUT,  0x3340),\
        PINGROUP(DAP1_SCLK,     PN3,    AUDIO,  I2S0,           HDA,            GMI,            RSVD3,          RSVD,           INPUT,  0x3344),\
-       PINGROUP(DAP_MCLK1_REQ, PEE2,   AUDIO,  DAP,            DAP1,           SATA,           RSVD3,          RSVD,           INPUT,  0x3348),\
+       PINGROUP(DAP_MCLK1_REQ, PEE2,   AUDIO,  DAP,            DAP1,           SATA,           RSVD3,          DAP,            INPUT,  0x3348),\
        PINGROUP(DAP_MCLK1,     PW4,    AUDIO,  EXTPERIPH1,     DAP2,           RSVD2,          RSVD3,          RSVD,           INPUT,  0x334c),\
-       PINGROUP(SPDIF_IN,      PK6,    HV,     SPDIF,          RSVD1,          RSVD2,          I2C3,           RSVD,           INPUT,  0x3350),\
-       PINGROUP(SPDIF_OUT,     PK5,    HV,     SPDIF,          RSVD1,          RSVD2,          I2C3,           RSVD,           INPUT,  0x3354),\
+       PINGROUP(SPDIF_IN,      PK6,    HV,     SPDIF,          RSVD1,          RSVD2,          I2C3,           RSVD2,          INPUT,  0x3350),\
+       PINGROUP(SPDIF_OUT,     PK5,    HV,     SPDIF,          RSVD1,          RSVD2,          I2C3,           RSVD2,          INPUT,  0x3354),\
        PINGROUP(DAP2_FS,       PA2,    AUDIO,  I2S1,           HDA,            GMI,            RSVD3,          RSVD,           INPUT,  0x3358),\
        PINGROUP(DAP2_DIN,      PA4,    AUDIO,  I2S1,           HDA,            GMI,            RSVD3,          RSVD,           INPUT,  0x335c),\
        PINGROUP(DAP2_DOUT,     PA5,    AUDIO,  I2S1,           HDA,            GMI,            RSVD3,          RSVD,           INPUT,  0x3360),\
        PINGROUP(DAP2_SCLK,     PA3,    AUDIO,  I2S1,           HDA,            GMI,            RSVD3,          RSVD,           INPUT,  0x3364),\
        PINGROUP(DVFS_PWM,      PX0,    AUDIO,  SPI6,           CLDVFS,         GMI,            RSVD3,          RSVD,           INPUT,  0x3368),\
-       PINGROUP(GPIO_X1_AUD,   PX1,    AUDIO,  SPI6,           RSVD1,          GMI,            RSVD3,          RSVD,           INPUT,  0x336c),\
-       PINGROUP(GPIO_X3_AUD,   PX3,    AUDIO,  SPI6,           SPI1,           GMI,            RSVD3,          RSVD,           INPUT,  0x3370),\
+       PINGROUP(GPIO_X1_AUD,   PX1,    AUDIO,  SPI6,           RSVD1,          GMI,            RSVD3,          SPI6,           INPUT,  0x336c),\
+       PINGROUP(GPIO_X3_AUD,   PX3,    AUDIO,  SPI6,           SPI1,           GMI,            RSVD3,          SPI6,           INPUT,  0x3370),\
        PINGROUP(DVFS_CLK,      PX2,    AUDIO,  SPI6,           CLDVFS,         GMI,            RSVD3,          RSVD,           INPUT,  0x3374),\
-       PINGROUP(GPIO_X4_AUD,   PX4,    AUDIO,  GMI,            SPI1,           SPI2,           DAP2,           RSVD,           INPUT,  0x3378),\
-       PINGROUP(GPIO_X5_AUD,   PX5,    AUDIO,  GMI,            SPI1,           SPI2,           RSVD3,          RSVD,           INPUT,  0x337c),\
-       PINGROUP(GPIO_X6_AUD,   PX6,    AUDIO,  SPI6,           SPI1,           SPI2,           GMI,            RSVD,           INPUT,  0x3380),\
-       PINGROUP(GPIO_X7_AUD,   PX7,    AUDIO,  RSVD0,          SPI1,           SPI2,           RSVD3,          RSVD,           INPUT,  0x3384),\
+       PINGROUP(GPIO_X4_AUD,   PX4,    AUDIO,  GMI,            SPI1,           SPI2,           DAP2,           SPI1,           INPUT,  0x3378),\
+       PINGROUP(GPIO_X5_AUD,   PX5,    AUDIO,  GMI,            SPI1,           SPI2,           RSVD3,          SPI1,           INPUT,  0x337c),\
+       PINGROUP(GPIO_X6_AUD,   PX6,    AUDIO,  SPI6,           SPI1,           SPI2,           GMI,            SPI1,           INPUT,  0x3380),\
+       PINGROUP(GPIO_X7_AUD,   PX7,    AUDIO,  RSVD0,          SPI1,           SPI2,           RSVD3,          SPI1,           INPUT,  0x3384),\
        PINGROUP(SDMMC3_CLK,    PA6,    SDMMC3, SDMMC3,         RSVD1,          RSVD2,          SPI3,           RSVD,           INPUT,  0x3390),\
        PINGROUP(SDMMC3_CMD,    PA7,    SDMMC3, SDMMC3,         PWM3,           UARTA,          SPI3,           RSVD,           INPUT,  0x3394),\
        PINGROUP(SDMMC3_DAT0,   PB7,    SDMMC3, SDMMC3,         RSVD1,          RSVD2,          SPI3,           RSVD,           INPUT,  0x3398),\
        PINGROUP(SDMMC3_DAT1,   PB6,    SDMMC3, SDMMC3,         PWM2,           UARTA,          SPI3,           RSVD,           INPUT,  0x339c),\
        PINGROUP(SDMMC3_DAT2,   PB5,    SDMMC3, SDMMC3,         PWM1,           DISPLAYA,       SPI3,           RSVD,           INPUT,  0x33a0),\
        PINGROUP(SDMMC3_DAT3,   PB4,    SDMMC3, SDMMC3,         PWM0,           DISPLAYB,       SPI3,           RSVD,           INPUT,  0x33a4),\
-       PINGROUP(PEX_L0_RST_N,  PDD1,   PEXCTL, PE0,            RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x33bc),\
-       PINGROUP(PEX_L0_CLKREQ_N, PDD2, PEXCTL, PE0,            RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x33c0),\
-       PINGROUP(PEX_WAKE_N,    PDD3,   PEXCTL, PE,             RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x33c4),\
-       PINGROUP(PEX_L1_RST_N,  PDD5,   PEXCTL, PE1,            RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x33cc),\
-       PINGROUP(PEX_L1_CLKREQ_N, PDD6, PEXCTL, PE1,            RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x33d0),\
+       PINGROUP(PEX_L0_RST_N,  PDD1,   PEXCTL, PE0,            RSVD1,          RSVD2,          RSVD3,          PE0,            INPUT,  0x33bc),\
+       PINGROUP(PEX_L0_CLKREQ_N, PDD2, PEXCTL, PE0,            RSVD1,          RSVD2,          RSVD3,          PE0,            INPUT,  0x33c0),\
+       PINGROUP(PEX_WAKE_N,    PDD3,   PEXCTL, PE,             RSVD1,          RSVD2,          RSVD3,          PE,             INPUT,  0x33c4),\
+       PINGROUP(PEX_L1_RST_N,  PDD5,   PEXCTL, PE1,            RSVD1,          RSVD2,          RSVD3,          PE1,            INPUT,  0x33cc),\
+       PINGROUP(PEX_L1_CLKREQ_N, PDD6, PEXCTL, PE1,            RSVD1,          RSVD2,          RSVD3,          PE1,            INPUT,  0x33d0),\
        PINGROUP(HDMI_CEC,      PEE3,   HV,     CEC,            RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x33e0),\
-       PINGROUP(SDMMC1_WP_N,   PV3,    SDMMC1, SDMMC1,         CLK12,          SPI4,           UARTA,          RSVD,           INPUT,  0x33e4),\
+       PINGROUP(SDMMC1_WP_N,   PV3,    SDMMC1, SDMMC1,         CLK12,          SPI4,           UARTA,          SDMMC1,         INPUT,  0x33e4),\
        PINGROUP(SDMMC3_CD_N,   PV2,    SYS,    SDMMC3,         OWR,            RSVD2,          RSVD3,          RSVD,           INPUT,  0x33e8),\
-       PINGROUP(GPIO_W2_AUD,   PW2,    AUDIO,  SPI6,           RSVD1,          SPI2,           I2C1,           RSVD,           INPUT,  0x33ec),\
-       PINGROUP(GPIO_W3_AUD,   PW3,    AUDIO,  SPI6,           SPI1,           SPI2,           I2C1,           RSVD,           INPUT,  0x33f0),\
+       PINGROUP(GPIO_W2_AUD,   PW2,    AUDIO,  SPI6,           RSVD1,          SPI2,           I2C1,           RSVD1,          INPUT,  0x33ec),\
+       PINGROUP(GPIO_W3_AUD,   PW3,    AUDIO,  SPI6,           SPI1,           SPI2,           I2C1,           SPI1,           INPUT,  0x33f0),\
        PINGROUP(USB_VBUS_EN0,  PN4,    HV,     USB,            RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x33f4),\
        PINGROUP(USB_VBUS_EN1,  PN5,    HV,     USB,            RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x33f8),\
        PINGROUP(SDMMC3_CLK_LB_OUT, PEE4, SDMMC3, SDMMC3,       RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x33fc),\
        PINGROUP(SDMMC3_CLK_LB_IN, PEE5, SDMMC3,  SDMMC3,               RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x3400),\
        PINGROUP(GMI_CLK_LB,    INVALID, SYS,   SDMMC2,         RSVD1,          GMI,            RSVD3,          RSVD,           INPUT,  0x3404),\
        PINGROUP(RESET_OUT_N,   INVALID, SYS,   RSVD0,          RSVD1,          RSVD2,          RESET_OUT_N,    RSVD,           INPUT,  0x3408),\
-       PINGROUP(KB_ROW16,      PT0,    SYS,    KBC,            RSVD1,          RSVD2,          UARTC,          RSVD,           INPUT,  0x340c),\
-       PINGROUP(KB_ROW17,      PT1,    SYS,    KBC,            RSVD1,          RSVD2,          UARTC,          RSVD,           INPUT,  0x3410),\
+       PINGROUP(KB_ROW16,      PT0,    SYS,    KBC,            RSVD1,          RSVD2,          UARTC,          KBC,            INPUT,  0x340c),\
+       PINGROUP(KB_ROW17,      PT1,    SYS,    KBC,            RSVD1,          RSVD2,          UARTC,          KBC,            INPUT,  0x3410),\
        PINGROUP(USB_VBUS_EN2,  PFF1,   PEXCTL, USB,            RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x3414),\
-       PINGROUP(GPIO_PFF2,     PFF2,   PEXCTL, SATA,           RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x3418),\
+       PINGROUP(GPIO_PFF2,     PFF2,   PEXCTL, SATA,           RSVD1,          RSVD2,          RSVD3,          RSVD1,          INPUT,  0x3418),\
        PINGROUP(DP_HPD,        PFF0,   HV,     DP,             RSVD1,          RSVD2,          RSVD3,          RSVD,           INPUT,  0x3430),\
 
 #endif
@@ -526,6 +526,7 @@ const struct tegra_pingroup_desc tegra_soc_pingroups[TEGRA_MAX_PINGROUP] = {
        PINGROUPS
 };
 
+
 #undef PINGROUP
 
 /* HACK to workaround -1 index (for INVALID index) */