usb: otg: tegra: detect device cable through pmu

Device cable and OTG cable should be detected through pmu
as extcon framework notifies when change is detected
in either vbus or id, registering for notifications to only
one of them will lead to handling notifications for
unwanted events.

Bug 1345401

Change-Id: I0da42fbf715bbcf32bf3741ab045997c43cebf77
Signed-off-by: Rohith Seelaboyina <rseelaboyina@nvidia.com>
Reviewed-on: http://git-master/r/263872
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>

diff --git a/arch/arm/mach-tegra/board-ardbeg.c b/arch/arm/mach-tegra/board-ardbeg.c
index 365432bfe548e904c3ee1a72aa5ab631b197fadc..9663a4309bf99ab7828406802159380a0e8151d5 100644 (file)
--- a/arch/arm/mach-tegra/board-ardbeg.c
+++ b/arch/arm/mach-tegra/board-ardbeg.c
@@ -696,10 +696,11 @@ static void ardbeg_usb_init(void)
                        tegra_otg_pdata.id_extcon_dev_name = "as3722-extcon";
                        break;
                case BOARD_E1736:
+               case BOARD_E1735:
+                       /* Device cable is detected through PMU Interrupt */
                        tegra_udc_pdata.support_pmu_vbus = true;
                        tegra_ehci1_utmi_pdata.support_pmu_vbus = true;
                        tegra_otg_pdata.vbus_extcon_dev_name = "palmas-extcon";
-               case BOARD_E1735:
                        /* Host cable is detected through PMU Interrupt */
                        tegra_udc_pdata.id_det_type = TEGRA_USB_PMU_ID;
                        tegra_ehci1_utmi_pdata.id_det_type = TEGRA_USB_PMU_ID;

diff --git a/drivers/usb/phy/tegra-otg.c b/drivers/usb/phy/tegra-otg.c
index d8bb4f7c544c4d338e5cb7c06011408deed4b7d8..77517da2001fb70d6dc93299c93bcef684e472bc 100644 (file)
--- a/drivers/usb/phy/tegra-otg.c
+++ b/drivers/usb/phy/tegra-otg.c
@@ -842,7 +842,7 @@ static int tegra_otg_suspend(struct device *dev)
 
        mutex_lock(&tegra->irq_work_mutex);
        DBG("%s(%d) BEGIN state : %s\n", __func__, __LINE__,
-                               tegra_state_name(tegra->phy->state));
+                               tegra_state_name(tegra->phy.state));
 
        pm_runtime_get_sync(dev);
        clk_prepare_enable(tegra->clk);