ARM: tegra: ardbeg: Add missing regulator entries for xusb
Ajay Gupta [Thu, 27 Jun 2013 17:32:58 +0000 (10:32 -0700)]
Bug 1301052

Change-Id: I3fd9589c9a84c9d3dd92e9d63cdeef6349537559
Signed-off-by: Ajay Gupta <ajayg@nvidia.com>
Reviewed-on: http://git-master/r/243215
Reviewed-by: Ashutosh Jha <ajha@nvidia.com>

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

index e8fd81e..dc56963 100644 (file)
@@ -188,7 +188,7 @@ static __initdata struct tegra_pingroup_config ardbeg_pinmux_common[] = {
        DDC_PINMUX(DDC_SDA, I2C4, NORMAL, NORMAL, INPUT, DISABLE, HIGH),
 
        /* USB pinmux */
-       USB_PINMUX(SPDIF_IN, USB, NORMAL, NORMAL, INPUT, DEFAULT, DISABLE),
+       USB_PINMUX(SPDIF_IN, USB, PULL_UP, NORMAL, INPUT, DEFAULT, DISABLE),
        USB_PINMUX(USB_VBUS_EN0, USB, PULL_UP, NORMAL, INPUT, DISABLE, DISABLE),
 
        /* GPIO pinmux */
index 1fec1b5..a3ad118 100644 (file)
@@ -581,6 +581,7 @@ static struct regulator_consumer_supply palmas_smps8_supply[] = {
        REGULATOR_SUPPLY("avdd_pll_m", NULL),
        REGULATOR_SUPPLY("avdd_pll_cud2dpd", NULL),
        REGULATOR_SUPPLY("avdd_pll_utmip", NULL),
+       REGULATOR_SUPPLY("avdd_pll_utmip", "tegra-xhci"),
        REGULATOR_SUPPLY("avdd_pll_x", NULL),
        REGULATOR_SUPPLY("avdd_csi_dsi_pll", "tegradc.0"),
        REGULATOR_SUPPLY("avdd_csi_dsi_pll", "tegradc.1"),
@@ -598,6 +599,7 @@ static struct regulator_consumer_supply palmas_ldo2_supply[] = {
        REGULATOR_SUPPLY("avdd_pex_pll", NULL),
        REGULATOR_SUPPLY("avddio_pex_pll", NULL),
        REGULATOR_SUPPLY("dvddio_pex", NULL),
+       REGULATOR_SUPPLY("avddio_usb", "tegra-xhci"),
 };
 
 static struct regulator_consumer_supply palmas_ldo3_supply[] = {
@@ -1174,9 +1176,15 @@ FIXED_REG(1,     usb0_vbus,      usb0_vbus,
        NULL,   0,      0,      TEGRA_GPIO_PN4,
        true,   true,   0,      5000,   0);
 
+#ifdef CONFIG_ARCH_TEGRA_11x_SOC
+FIXED_REG(2,   usb1_vbus,      usb1_vbus,
+       NULL,   0,      0,      TEGRA_GPIO_PK6,
+       true,   true,   0,      5000,   0);
+#else
 FIXED_REG(2,   usb1_vbus,      usb1_vbus,
        NULL,   0,      0,      TEGRA_GPIO_PN5,
        true,   true,   0,      5000,   0);
+#endif
 
 #ifdef CONFIG_ARCH_TEGRA_12x_SOC
 FIXED_REG(3,   usb2_vbus,      usb2_vbus,