ARM: tegra: update t114 pinmux table
aghuge [Tue, 21 Aug 2012 13:00:14 +0000 (18:00 +0530)]
Bug 959971

Change-Id: Id1c6a1cc475f4c44b9b9652a766d711b7ee6ad15
Signed-off-by: aghuge <aghuge@nvidia.com>
Reviewed-on: http://git-master/r/123934
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>

arch/arm/mach-tegra/board-curacao-pinmux.c
arch/arm/mach-tegra/include/mach/pinmux-t11.h
arch/arm/mach-tegra/pinmux-t11-tables.c

index 05ac8c9..e85013c 100644 (file)
@@ -201,14 +201,14 @@ static __initdata struct tegra_pingroup_config curacao_pinmux[] = {
        DEFAULT_PINMUX(DAP2_DIN,        I2S1,            NORMAL,    NORMAL,     INPUT),
        DEFAULT_PINMUX(DAP2_DOUT,       I2S1,            NORMAL,    NORMAL,     INPUT),
        DEFAULT_PINMUX(DAP2_SCLK,       I2S1,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(SPI2_MOSI,       SPI6,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(SPI2_MISO,       SPI6,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(SPI2_CS0_N,      SPI6,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(SPI2_SCK,        SPI6,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(SPI1_MOSI,       RSVD0,           NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(SPI1_SCK,        SPI1,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(SPI1_CS0_N,      SPI1,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(SPI1_MISO,       SPI1,            NORMAL,    NORMAL,     INPUT),
+       DEFAULT_PINMUX(DVFS_PWM,        SPI6,            NORMAL,    NORMAL,     INPUT),
+       DEFAULT_PINMUX(GPIO_X1_AUD,     SPI6,            NORMAL,    NORMAL,     INPUT),
+       DEFAULT_PINMUX(GPIO_X3_AUD,     SPI6,            NORMAL,    NORMAL,     INPUT),
+       DEFAULT_PINMUX(DVFS_CLK,        SPI6,            NORMAL,    NORMAL,     INPUT),
+       DEFAULT_PINMUX(GPIO_X4_AUD,     RSVD0,           NORMAL,    NORMAL,     INPUT),
+       DEFAULT_PINMUX(GPIO_X5_AUD,     SPI1,            NORMAL,    NORMAL,     INPUT),
+       DEFAULT_PINMUX(GPIO_X6_AUD,     SPI1,            NORMAL,    NORMAL,     INPUT),
+       DEFAULT_PINMUX(GPIO_X7_AUD,     SPI1,            NORMAL,    NORMAL,     INPUT),
        DEFAULT_PINMUX(SDMMC3_CLK,      SDMMC3,          NORMAL,    NORMAL,     INPUT),
        DEFAULT_PINMUX(SDMMC3_CMD,      SDMMC3,          PULL_UP,   NORMAL,     INPUT),
        DEFAULT_PINMUX(SDMMC3_DAT0,     SDMMC3,          PULL_UP,   NORMAL,     INPUT),
@@ -218,8 +218,8 @@ static __initdata struct tegra_pingroup_config curacao_pinmux[] = {
        DEFAULT_PINMUX(HDMI_CEC,        CEC,             NORMAL,    NORMAL,     INPUT),
        DEFAULT_PINMUX(SDMMC1_WP_N,     SDMMC1,          NORMAL,    NORMAL,     INPUT),
        DEFAULT_PINMUX(SDMMC3_CD_N,     RSVD2,           NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(SPI1_CS1_N,      RSVD1,           NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(SPI1_CS2_N,      SPI1,            NORMAL,    NORMAL,     INPUT),
+       DEFAULT_PINMUX(GPIO_W2_AUD,     RSVD1,           NORMAL,    NORMAL,     INPUT),
+       DEFAULT_PINMUX(GPIO_W3_AUD,     SPI1,            NORMAL,    NORMAL,     INPUT),
 };
 
 void __init curacao_pinmux_init(void)
index 0873927..6a66f10 100644 (file)
@@ -175,14 +175,14 @@ enum tegra_pingroup {
        TEGRA_PINGROUP_DAP2_DIN,
        TEGRA_PINGROUP_DAP2_DOUT,
        TEGRA_PINGROUP_DAP2_SCLK,
-       TEGRA_PINGROUP_SPI2_MOSI,
-       TEGRA_PINGROUP_SPI2_MISO,
-       TEGRA_PINGROUP_SPI2_CS0_N,
-       TEGRA_PINGROUP_SPI2_SCK,
-       TEGRA_PINGROUP_SPI1_MOSI,
-       TEGRA_PINGROUP_SPI1_SCK,
-       TEGRA_PINGROUP_SPI1_CS0_N,
-       TEGRA_PINGROUP_SPI1_MISO,
+       TEGRA_PINGROUP_DVFS_PWM,
+       TEGRA_PINGROUP_GPIO_X1_AUD,
+       TEGRA_PINGROUP_GPIO_X3_AUD,
+       TEGRA_PINGROUP_DVFS_CLK,
+       TEGRA_PINGROUP_GPIO_X4_AUD,
+       TEGRA_PINGROUP_GPIO_X5_AUD,
+       TEGRA_PINGROUP_GPIO_X6_AUD,
+       TEGRA_PINGROUP_GPIO_X7_AUD,
        TEGRA_PINGROUP_SDMMC3_CLK,
        TEGRA_PINGROUP_SDMMC3_CMD,
        TEGRA_PINGROUP_SDMMC3_DAT0,
@@ -192,8 +192,8 @@ enum tegra_pingroup {
        TEGRA_PINGROUP_HDMI_CEC,
        TEGRA_PINGROUP_SDMMC1_WP_N,
        TEGRA_PINGROUP_SDMMC3_CD_N,
-       TEGRA_PINGROUP_SPI1_CS1_N,
-       TEGRA_PINGROUP_SPI1_CS2_N,
+       TEGRA_PINGROUP_GPIO_W2_AUD,
+       TEGRA_PINGROUP_GPIO_W3_AUD,
        TEGRA_PINGROUP_USB_VBUS_EN0,
        TEGRA_PINGROUP_USB_VBUS_EN1,
        TEGRA_PINGROUP_SDMMC3_CLK_LB_IN,
index b78a6e5..13a26ad 100644 (file)
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+/* FIX ME */
+/* Revisit pins: SDMMC3_CLK_LB_OUT/IN, NAND_GMI_CLK_LB, JTAG_# */
+
+
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/spinlock.h>
@@ -152,10 +156,10 @@ const struct tegra_drive_pingroup_desc tegra_soc_drive_pingroups[TEGRA_MAX_DRIVE
        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,   DISPLAYB,    RSVD,      INPUT,  0x3038),\
-       PINGROUP(DAP3_SCLK,       PP3,          BB,         I2S2,       SPI5,       DISPLAYA,   DISPLAYB,    RSVD,      INPUT,  0x303c),\
+       PINGROUP(DAP3_FS,         PP0,          BB,         I2S2,       SPI5,       RSVD2,      RSVD3,       RSVD,      INPUT,  0x3030),\
+       PINGROUP(DAP3_DIN,        PP1,          BB,         I2S2,       SPI5,       RSVD2,      RSVD3,       RSVD,      INPUT,  0x3034),\
+       PINGROUP(DAP3_DOUT,       PP2,          BB,         I2S2,       SPI5,       RSVD2,      RSVD3,       RSVD,      INPUT,  0x3038),\
+       PINGROUP(DAP3_SCLK,       PP3,          BB,         I2S2,       SPI5,       RSVD2,      RSVD3,       RSVD,      INPUT,  0x303c),\
        PINGROUP(GPIO_PV0,        PV0,          BB,         USB,        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),\
@@ -177,13 +181,13 @@ const struct tegra_drive_pingroup_desc tegra_soc_drive_pingroups[TEGRA_MAX_DRIVE
        PINGROUP(UART3_RXD,       PW7,          UART,       UARTC,      RSVD1,      RSVD2,      SPI4,        RSVD,      INPUT,  0x3178),\
        PINGROUP(UART3_CTS_N,     PA1,          UART,       UARTC,      SDMMC1,     DTV,        SPI4,        RSVD,      INPUT,  0x317c),\
        PINGROUP(UART3_RTS_N,     PC0,          UART,       UARTC,      PWM0,       DTV,        DISPLAYA,    RSVD,      INPUT,  0x3180),\
-       PINGROUP(GPIO_PU0,        PU0,          UART,       OWR,        UARTA,      RSVD2,      RSVD3,       RSVD,      INPUT,  0x3184),\
+       PINGROUP(GPIO_PU0,        PU0,          UART,       RSVD0,      UARTA,      RSVD2,      RSVD3,       RSVD,      INPUT,  0x3184),\
        PINGROUP(GPIO_PU1,        PU1,          UART,       RSVD0,      UARTA,      RSVD2,      RSVD3,       RSVD,      INPUT,  0x3188),\
        PINGROUP(GPIO_PU2,        PU2,          UART,       RSVD0,      UARTA,      RSVD2,      RSVD3,       RSVD,      INPUT,  0x318c),\
-       PINGROUP(GPIO_PU3,        PU3,          UART,       PWM0,       UARTA,      DISPLAYA,   DISPLAYB,    RSVD,      INPUT,  0x3190),\
-       PINGROUP(GPIO_PU4,        PU4,          UART,       PWM1,       UARTA,      DISPLAYA,   DISPLAYB,    RSVD,      INPUT,  0x3194),\
-       PINGROUP(GPIO_PU5,        PU5,          UART,       PWM2,       UARTA,      DISPLAYA,   DISPLAYB,    RSVD,      INPUT,  0x3198),\
-       PINGROUP(GPIO_PU6,        PU6,          UART,       PWM3,       UARTA,      USB,        DISPLAYB,    RSVD,      INPUT,  0x319c),\
+       PINGROUP(GPIO_PU3,        PU3,          UART,       PWM0,       UARTA,      RSVD2,      RSVD3,       RSVD,      INPUT,  0x3190),\
+       PINGROUP(GPIO_PU4,        PU4,          UART,       PWM1,       UARTA,      RSVD2,      RSVD3,       RSVD,      INPUT,  0x3194),\
+       PINGROUP(GPIO_PU5,        PU5,          UART,       PWM2,       UARTA,      RSVD2,      RSVD3,       RSVD,      INPUT,  0x3198),\
+       PINGROUP(GPIO_PU6,        PU6,          UART,       PWM3,       UARTA,      USB,        RSVD3,       RSVD,      INPUT,  0x319c),\
        PINGROUP(GEN1_I2C_SDA,    PC5,          UART,       I2C1,       RSVD1,      RSVD2,      RSVD3,       RSVD,      INPUT,  0x31a0),\
        PINGROUP(GEN1_I2C_SCL,    PC4,          UART,       I2C1,       RSVD1,      RSVD2,      RSVD3,       RSVD,      INPUT,  0x31a4),\
        PINGROUP(DAP4_FS,         PP4,          UART,       I2S3,       RSVD1,      DTV,        RSVD3,       RSVD,      INPUT,  0x31a8),\
@@ -193,15 +197,15 @@ const struct tegra_drive_pingroup_desc tegra_soc_drive_pingroups[TEGRA_MAX_DRIVE
        PINGROUP(CLK3_OUT,        PEE0,         UART,       EXTPERIPH3, RSVD1,      RSVD2,      RSVD3,       RSVD,      INPUT,  0x31b8),\
        PINGROUP(CLK3_REQ,        PEE1,         UART,       DEV3,       RSVD1,      RSVD2,      RSVD3,       RSVD,      INPUT,  0x31bc),\
        PINGROUP(GMI_WP_N,        PC7,          GMI,        RSVD0,      NAND,       GMI,        GMI_ALT,     RSVD,      INPUT,  0x31c0),\
-       PINGROUP(GMI_IORDY,       PI5,          GMI,        SDMMC2,     RSVD1,      GMI,        TRACE,       RSVD,      INPUT,  0x31c4),\
+       PINGROUP(GMI_IORDY,       PI5,          GMI,        SDMMC2,     RSVD1,      GMI,        RSVD,        RSVD,      INPUT,  0x31c4),\
        PINGROUP(GMI_WAIT,        PI7,          GMI,        SPI4,       NAND,       GMI,        DTV,         RSVD,      INPUT,  0x31c8),\
-       PINGROUP(GMI_ADV_N,       PK0,          GMI,        RSVD0,      NAND,       GMI,        TRACE,       RSVD,      INPUT,  0x31cc),\
-       PINGROUP(GMI_CLK,         PK1,          GMI,        SDMMC2,     NAND,       GMI,        TRACE,       RSVD,      INPUT,  0x31d0),\
+       PINGROUP(GMI_ADV_N,       PK0,          GMI,        RSVD0,      NAND,       GMI,        RSVD,        RSVD,      INPUT,  0x31cc),\
+       PINGROUP(GMI_CLK,         PK1,          GMI,        SDMMC2,     NAND,       GMI,        RSVD,        RSVD,      INPUT,  0x31d0),\
        PINGROUP(GMI_CS0_N,       PJ0,          GMI,        RSVD0,      NAND,       GMI,        USB,         RSVD,      INPUT,  0x31d4),\
        PINGROUP(GMI_CS1_N,       PJ2,          GMI,        RSVD0,      NAND,       GMI,        SOC,         RSVD,      INPUT,  0x31d8),\
-       PINGROUP(GMI_CS2_N,       PK3,          GMI,        SDMMC2,     NAND,       GMI,        TRACE,       RSVD,      INPUT,  0x31dc),\
+       PINGROUP(GMI_CS2_N,       PK3,          GMI,        SDMMC2,     NAND,       GMI,        RSVD,        RSVD,      INPUT,  0x31dc),\
        PINGROUP(GMI_CS3_N,       PK4,          GMI,        SDMMC2,     NAND,       GMI,        GMI_ALT,     RSVD,      INPUT,  0x31e0),\
-       PINGROUP(GMI_CS4_N,       PK2,          GMI,        USB,        NAND,       GMI,        TRACE,       RSVD,      INPUT,  0x31e4),\
+       PINGROUP(GMI_CS4_N,       PK2,          GMI,        USB,        NAND,       GMI,        RSVD,        RSVD,      INPUT,  0x31e4),\
        PINGROUP(GMI_CS6_N,       PI3,          GMI,        NAND,       NAND_ALT,   GMI,        SPI4,        RSVD,      INPUT,  0x31e8),\
        PINGROUP(GMI_CS7_N,       PI6,          GMI,        NAND,       NAND_ALT,   GMI,        SDMMC2,      RSVD,      INPUT,  0x31ec),\
        PINGROUP(GMI_AD0,         PG0,          GMI,        RSVD0,      NAND,       GMI,        RSVD3,       RSVD,      INPUT,  0x31f0),\
@@ -220,13 +224,13 @@ const struct tegra_drive_pingroup_desc tegra_soc_drive_pingroups[TEGRA_MAX_DRIVE
        PINGROUP(GMI_AD13,        PH5,          GMI,        SDMMC2,     NAND,       GMI,        RSVD3,       RSVD,      INPUT,  0x3224),\
        PINGROUP(GMI_AD14,        PH6,          GMI,        SDMMC2,     NAND,       GMI,        DTV,         RSVD,      INPUT,  0x3228),\
        PINGROUP(GMI_AD15,        PH7,          GMI,        SDMMC2,     NAND,       GMI,        DTV,         RSVD,      INPUT,  0x322c),\
-       PINGROUP(GMI_A16,         PJ7,          GMI,        UARTD,      TRACE,      GMI,        GMI_ALT,     RSVD,      INPUT,  0x3230),\
-       PINGROUP(GMI_A17,         PB0,          GMI,        UARTD,      RSVD1,      GMI,        TRACE,       RSVD,      INPUT,  0x3234),\
-       PINGROUP(GMI_A18,         PB1,          GMI,        UARTD,      RSVD1,      GMI,        TRACE,       RSVD,      INPUT,  0x3238),\
-       PINGROUP(GMI_A19,         PK7,          GMI,        UARTD,      SPI4,       GMI,        TRACE,       RSVD,      INPUT,  0x323c),\
+       PINGROUP(GMI_A16,         PJ7,          GMI,        UARTD,      RSVD,       GMI,        GMI_ALT,     RSVD,      INPUT,  0x3230),\
+       PINGROUP(GMI_A17,         PB0,          GMI,        UARTD,      RSVD1,      GMI,        RSVD,        RSVD,      INPUT,  0x3234),\
+       PINGROUP(GMI_A18,         PB1,          GMI,        UARTD,      RSVD1,      GMI,        RSVD,        RSVD,      INPUT,  0x3238),\
+       PINGROUP(GMI_A19,         PK7,          GMI,        UARTD,      SPI4,       GMI,        RSVD,        RSVD,      INPUT,  0x323c),\
        PINGROUP(GMI_WR_N,        PI0,          GMI,        RSVD0,      NAND,       GMI,        SPI4,        RSVD,      INPUT,  0x3240),\
        PINGROUP(GMI_OE_N,        PI1,          GMI,        RSVD0,      NAND,       GMI,        SOC,         RSVD,      INPUT,  0x3244),\
-       PINGROUP(GMI_DQS_P,       PJ3,          GMI,        SDMMC2,     NAND,       GMI,        TRACE,       RSVD,      INPUT,  0x3248),\
+       PINGROUP(GMI_DQS_P,       PJ3,          GMI,        SDMMC2,     NAND,       GMI,        RSVD,        RSVD,      INPUT,  0x3248),\
        PINGROUP(GMI_RST_N,       PI4,          GMI,        NAND,       NAND_ALT,   GMI,        RSVD3,       RSVD,      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),\
@@ -240,37 +244,36 @@ const struct tegra_drive_pingroup_desc tegra_soc_drive_pingroups[TEGRA_MAX_DRIVE
        PINGROUP(SDMMC4_DAT5,     PAA5,         SDMMC4,     SDMMC4,     SPI3,       GMI,        RSVD3,       RSVD,      INPUT,  0x3274),\
        PINGROUP(SDMMC4_DAT6,     PAA6,         SDMMC4,     SDMMC4,     SPI3,       GMI,        RSVD3,       RSVD,      INPUT,  0x3278),\
        PINGROUP(SDMMC4_DAT7,     PAA7,         SDMMC4,     SDMMC4,     RSVD1,      GMI,        RSVD3,       RSVD,      INPUT,  0x327c),\
-       PINGROUP(SDMMC4_RST_N,    INVALID,      SDMMC4,     RSVD0,      RSVD1,      RSVD2,      SDMMC4,      RSVD,      INPUT,  0x3280),\
        PINGROUP(CAM_MCLK,        PCC0,         CAM,        VI,         VI_ALT1,    VI_ALT2,    RSVD3,       RSVD,      INPUT,  0x3284),\
        PINGROUP(GPIO_PCC1,       PCC1,         CAM,        I2S4,       RSVD1,      RSVD2,      RSVD3,       RSVD,      INPUT,  0x3288),\
        PINGROUP(GPIO_PBB0,       PBB0,         CAM,        I2S4,       VI,         VI_ALT1,    VI_ALT3,     RSVD,      INPUT,  0x328c),\
        PINGROUP(CAM_I2C_SCL,     PBB1,         CAM,        VGP1,       I2C3,       RSVD2,      RSVD3,       RSVD,      INPUT,  0x3290),\
        PINGROUP(CAM_I2C_SDA,     PBB2,         CAM,        VGP2,       I2C3,       RSVD2,      RSVD3,       RSVD,      INPUT,  0x3294),\
-       PINGROUP(GPIO_PBB3,       PBB3,         CAM,        VGP3,       DISPLAYA,   DISPLAYB,   RSVD3,       RSVD,      INPUT,  0x3298),\
-       PINGROUP(GPIO_PBB4,       PBB4,         CAM,        VGP4,       DISPLAYA,   DISPLAYB,   RSVD3,       RSVD,      INPUT,  0x329c),\
-       PINGROUP(GPIO_PBB5,       PBB5,         CAM,        VGP5,       DISPLAYA,   DISPLAYB,   RSVD3,       RSVD,      INPUT,  0x32a0),\
-       PINGROUP(GPIO_PBB6,       PBB6,         CAM,        VGP6,       DISPLAYA,   DISPLAYB,   RSVD3,       RSVD,      INPUT,  0x32a4),\
+       PINGROUP(GPIO_PBB3,       PBB3,         CAM,        VGP3,       RSVD1,      RSVD2,      RSVD3,       RSVD,      INPUT,  0x3298),\
+       PINGROUP(GPIO_PBB4,       PBB4,         CAM,        VGP4,       RSVD1,      RSVD2,      RSVD3,       RSVD,      INPUT,  0x329c),\
+       PINGROUP(GPIO_PBB5,       PBB5,         CAM,        VGP5,       RSVD1,      RSVD2,      RSVD3,       RSVD,      INPUT,  0x32a0),\
+       PINGROUP(GPIO_PBB6,       PBB6,         CAM,        VGP6,       RSVD1,      RSVD2,      RSVD3,       RSVD,      INPUT,  0x32a4),\
        PINGROUP(GPIO_PBB7,       PBB7,         CAM,        I2S4,       RSVD1,      RSVD2,      RSVD3,       RSVD,      INPUT,  0x32a8),\
        PINGROUP(GPIO_PCC2,       PCC2,         CAM,        I2S4,       RSVD1,      RSVD2,      RSVD3,       RSVD,      INPUT,  0x32ac),\
-       PINGROUP(JTAG_RTCK,       PU7,          SYS,        RTCK,       RSVD1,      RSVD2,      RSVD3,       RSVD,      INPUT,  0x32b0),\
+       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,      DTV,        RSVD3,       RSVD,      INPUT,  0x32bc),\
-       PINGROUP(KB_ROW1,         PR1,          SYS,        KBC,        RSVD1,      DTV,        RSVD3,       RSVD,      INPUT,  0x32c0),\
-       PINGROUP(KB_ROW2,         PR2,          SYS,        KBC,        RSVD1,      DTV,        SOC,         RSVD,      INPUT,  0x32c4),\
-       PINGROUP(KB_ROW3,         PR3,          SYS,        KBC,        DISPLAYA,   RSVD2,      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,   INVALID,    DISPLAYB,    RSVD,      INPUT,  0x32d4),\
+       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_ROW3,         PR3,          SYS,        KBC,        RSVD1,      RSVD2,      RSVD3,       RSVD,      INPUT,  0x32c8),\
+       PINGROUP(KB_ROW4,         PR4,          SYS,        KBC,        RSVD1,      SPI2,       RSVD3,       RSVD,      INPUT,  0x32cc),\
+       PINGROUP(KB_ROW5,         PR5,          SYS,        KBC,        RSVD1,      SPI2,       RSVD3,       RSVD,      INPUT,  0x32d0),\
+       PINGROUP(KB_ROW6,         PR6,          SYS,        KBC,        RSVD1,      RSVD2,      RSVD3,       RSVD,      INPUT,  0x32d4),\
        PINGROUP(KB_ROW7,         PR7,          SYS,        KBC,        RSVD1,      CLDVFS,     UARTA,       RSVD,      INPUT,  0x32d8),\
-       PINGROUP(KB_ROW8,         PS0,          SYS,        KBC,        RSVD1,      RSVD2,      UARTA,       RSVD,      INPUT,  0x32dc),\
+       PINGROUP(KB_ROW8,         PS0,          SYS,        KBC,        RSVD1,      CLDVFS,     UARTA,       RSVD,      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_COL0,         PQ0,          SYS,        KBC,        USB,        SPI2,       EMC_DLL,     RSVD,      INPUT,  0x32fc),\
-       PINGROUP(KB_COL1,         PQ1,          SYS,        KBC,        RSVD1,      SPI2,       EMC_DLL,     RSVD,      INPUT,  0x3300),\
-       PINGROUP(KB_COL2,         PQ2,          SYS,        KBC,        RSVD1,      SPI2,       RSVD,        RSVD,      INPUT,  0x3304),\
-       PINGROUP(KB_COL3,         PQ3,          SYS,        KBC,        DISPLAYA,   PWM2,       UARTA,       RSVD,      INPUT,  0x3308),\
-       PINGROUP(KB_COL4,         PQ4,          SYS,        KBC,        OWR,        SDMMC3,     UARTA,       RSVD,      INPUT,  0x330c),\
+       PINGROUP(KB_COL0,         PQ0,          SYS,        KBC,        USB,        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,        RSVD1,      PWM2,       UARTA,       RSVD,      INPUT,  0x3308),\
+       PINGROUP(KB_COL4,         PQ4,          SYS,        KBC,        RSVD1,      SDMMC3,     UARTA,       RSVD,      INPUT,  0x330c),\
        PINGROUP(KB_COL5,         PQ5,          SYS,        KBC,        RSVD1,      SDMMC1,     RSVD3,       RSVD,      INPUT,  0x3310),\
        PINGROUP(KB_COL6,         PQ6,          SYS,        KBC,        RSVD1,      SPI2,       RSVD3,       RSVD,      INPUT,  0x3314),\
        PINGROUP(KB_COL7,         PQ7,          SYS,        KBC,        RSVD1,      SPI2,       RSVD3,       RSVD,      INPUT,  0x3318),\
@@ -293,14 +296,14 @@ const struct tegra_drive_pingroup_desc tegra_soc_drive_pingroups[TEGRA_MAX_DRIVE
        PINGROUP(DAP2_DIN,        PA4,          AUDIO,      I2S1,       HDA,        RSVD2,      RSVD3,       RSVD,      INPUT,  0x335c),\
        PINGROUP(DAP2_DOUT,       PA5,          AUDIO,      I2S1,       HDA,        RSVD2,      RSVD3,       RSVD,      INPUT,  0x3360),\
        PINGROUP(DAP2_SCLK,       PA3,          AUDIO,      I2S1,       HDA,        RSVD2,      RSVD3,       RSVD,      INPUT,  0x3364),\
-       PINGROUP(SPI2_MOSI,       PX0,          AUDIO,      SPI6,       CLDVFS,     RSVD2,      RSVD3,       RSVD,      INPUT,  0x3368),\
-       PINGROUP(SPI2_MISO,       PX1,          AUDIO,      SPI6,       RSVD1,      RSVD2,      RSVD3,       RSVD,      INPUT,  0x336c),\
-       PINGROUP(SPI2_CS0_N,      PX3,          AUDIO,      SPI6,       SPI1,       RSVD2,      RSVD3,       RSVD,      INPUT,  0x3370),\
-       PINGROUP(SPI2_SCK,        PX2,          AUDIO,      SPI6,       CLDVFS,     RSVD2,      RSVD3,       RSVD,      INPUT,  0x3374),\
-       PINGROUP(SPI1_MOSI,       PX4,          AUDIO,      RSVD0,      SPI1,       SPI2,       DAP2,        RSVD,      INPUT,  0x3378),\
-       PINGROUP(SPI1_SCK,        PX5,          AUDIO,      RSVD0,      SPI1,       SPI2,       RSVD3,       RSVD,      INPUT,  0x337c),\
-       PINGROUP(SPI1_CS0_N,      PX6,          AUDIO,      SPI6,       SPI1,       SPI2,       RSVD3,       RSVD,      INPUT,  0x3380),\
-       PINGROUP(SPI1_MISO,       PX7,          AUDIO,      RSVD0,      SPI1,       SPI2,       RSVD3,       RSVD,      INPUT,  0x3384),\
+       PINGROUP(DVFS_PWM,        PX0,          AUDIO,      SPI6,       CLDVFS,     RSVD2,      RSVD3,       RSVD,      INPUT,  0x3368),\
+       PINGROUP(GPIO_X1_AUD,     PX1,          AUDIO,      SPI6,       RSVD1,      RSVD2,      RSVD3,       RSVD,      INPUT,  0x336c),\
+       PINGROUP(GPIO_X3_AUD,     PX3,          AUDIO,      SPI6,       SPI1,       RSVD2,      RSVD3,       RSVD,      INPUT,  0x3370),\
+       PINGROUP(DVFS_CLK,        PX2,          AUDIO,      SPI6,       CLDVFS,     RSVD2,      RSVD3,       RSVD,      INPUT,  0x3374),\
+       PINGROUP(GPIO_X4_AUD,     PX4,          AUDIO,      RSVD0,      SPI1,       SPI2,       DAP2,        RSVD,      INPUT,  0x3378),\
+       PINGROUP(GPIO_X5_AUD,     PX5,          AUDIO,      RSVD0,      SPI1,       SPI2,       RSVD3,       RSVD,      INPUT,  0x337c),\
+       PINGROUP(GPIO_X6_AUD,     PX6,          AUDIO,      SPI6,       SPI1,       SPI2,       RSVD3,       RSVD,      INPUT,  0x3380),\
+       PINGROUP(GPIO_X7_AUD,     PX7,          AUDIO,      RSVD0,      SPI1,       SPI2,       RSVD3,       RSVD,      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),\
@@ -309,14 +312,11 @@ const struct tegra_drive_pingroup_desc tegra_soc_drive_pingroups[TEGRA_MAX_DRIVE
        PINGROUP(SDMMC3_DAT3,     PB4,          SDMMC3,     SDMMC3,     PWM0,       DISPLAYB,   SPI3,        RSVD,      INPUT,  0x33a4),\
        PINGROUP(HDMI_CEC,        PEE3,         SYS,        CEC,        SDMMC3,     RSVD2,      SOC,         RSVD,      INPUT,  0x33e0),\
        PINGROUP(SDMMC1_WP_N,     PV3,          SDMMC1,     SDMMC1,     CLK12,      SPI4,       UARTA,       RSVD,      INPUT,  0x33e4),\
-       PINGROUP(SDMMC3_CD_N,     PV2,          SDMMC3,     SDMMC3,     OWR,        RSVD2,      RSVD3,       RSVD,      INPUT,  0x33e8),\
-       PINGROUP(SPI1_CS1_N,      PW2,          AUDIO,      SPI6,       RSVD1,      SPI2,       I2C1,        RSVD,      INPUT,  0x33ec),\
-       PINGROUP(SPI1_CS2_N,      PW3,          AUDIO,      SPI6,       SPI1,       SPI2,       I2C1,        RSVD,      INPUT,  0x33f0),\
-       PINGROUP(USB_VBUS_EN0,    PN4,          SYS,        USB,        RSVD1,      RSVD2,      RSVD3,       RSVD,      INPUT,  0x33f4),\
-       PINGROUP(USB_VBUS_EN1,    PM5,          SYS,        USB,        RSVD1,      RSVD2,      RSVD3,       RSVD,      INPUT,  0x33f8),\
-       PINGROUP(SDMMC3_CLK_LB_IN, PEE5,        SDMMC3,     SDMMC3,     RSVD1,      RSVD2,      RSVD3,       RSVD,      INPUT,  0x33fc),\
-       PINGROUP(SDMMC3_CLK_LB_OUT, PEE4,       SDMMC3,     SDMMC3,     RSVD1,      RSVD2,      RSVD3,       RSVD,      OUTPUT, 0x3400),\
-       PINGROUP(NAND_GMI_CLK_LB, INVALID,      GMI,        SDMMC2,     NAND,       GMI,        RSVD3,       RSVD,      OUTPUT, 0x3404),\
+       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(USB_VBUS_EN0,    PN4,          LCD,        USB,        RSVD1,      RSVD2,      RSVD3,       RSVD,      INPUT,  0x33f4),\
+       PINGROUP(USB_VBUS_EN1,    PN5,          LCD,        USB,        RSVD1,      RSVD2,      RSVD3,       RSVD,      INPUT,  0x33f8),\
        PINGROUP(RESET_OUT_N,     INVALID,      SYS,        RSVD0,      RSVD1,      RSVD2,      RESET_OUT_N, RSVD,      OUTPUT, 0x3408),
 
 const struct tegra_pingroup_desc tegra_soc_pingroups[TEGRA_MAX_PINGROUP] = {