arm: tegra: pinmux: dalmore pinmux usb vbus
Suresh Mangipudi [Wed, 12 Sep 2012 11:21:27 +0000 (16:21 +0530)]
Changes for enabling the usb vbus for dalmore.

Bug 981704

Change-Id: I20a97d15fa6f5686d0580bbfc1b0d9833a95f8ac
Signed-off-by: Suresh Mangipudi <smangipudi@nvidia.com>
Reviewed-on: http://git-master/r/131777
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Ashwini Ghuge <aghuge@nvidia.com>
Tested-by: Ashwini Ghuge <aghuge@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>

Rebase-Id: R123a483ebb12579447a6240af26a30f10296f91f

arch/arm/mach-tegra/board-dalmore-pinmux-t11x.h
arch/arm/mach-tegra/board-dalmore-pinmux.c

index 31f6c4e..c9e1f5f 100644 (file)
@@ -197,8 +197,8 @@ static __initdata struct tegra_pingroup_config dalmore_pinmux_common[] = {
        I2C_PINMUX(DDC_SDA, I2C4, NORMAL, NORMAL, INPUT, DEFAULT, DEFAULT),
 
        /* USB pinmux */
-       DEFAULT_PINMUX(SPDIF_IN,      USB,         NORMAL,    NORMAL,   INPUT),
-       DEFAULT_PINMUX(USB_VBUS_EN0,  USB,         NORMAL,    NORMAL,   INPUT),
+       USB_PINMUX(SPDIF_IN, USB, PULL_UP, NORMAL, INPUT, DISABLE, ENABLE),
+       USB_PINMUX(USB_VBUS_EN0, USB, PULL_UP, NORMAL, INPUT, DISABLE, ENABLE),
 };
 
 static __initdata struct tegra_pingroup_config unused_pins_lowpower[] = {
index c178f9e..59a1a05 100644 (file)
                .ioreset    = TEGRA_PIN_IO_RESET_DEFAULT,                   \
        }
 
+#define USB_PINMUX CEC_PINMUX
+
 #define GPIO_INIT_PIN_MODE(_gpio, _is_input, _value)   \
        {                                       \
                .gpio_nr        = _gpio,        \