ENGR00286149-5: Revert "ENGR00277805-6"

This reverts commit 4e9bcf000f717cd17faef109eb6874f3d6323cea.

Signed-off-by: Peter Chen <peter.chen@freescale.com>

diff --git a/drivers/usb/chipidea/bits.h b/drivers/usb/chipidea/bits.h
index 9f936a361f9543d91f0b09997e84ac8eaf7eaa31..dd0cf9e202737cb598bf1ef308a629daba207fe7 100644 (file)
--- a/drivers/usb/chipidea/bits.h
+++ b/drivers/usb/chipidea/bits.h
@@ -48,7 +48,6 @@
 #define PORTSC_SUSP           BIT(7)
 #define PORTSC_HSP            BIT(9)
 #define PORTSC_PTC            (0x0FUL << 16)
-#define PORTSC_PHCD(d)       ((d) ? BIT(22) : BIT(23))
 /* PTS and PTW for non lpm version only */
 #define PORTSC_PTS(d)                                          \
        ((((d) & 0x3) << 30) | (((d) & 0x4) ? BIT(25) : 0))

diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index 45ee15c199ae9ea5cc76197eba036de2093c39de..94626409559a96a79c0d027023dbade8a645ce58 100644 (file)
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -442,20 +442,6 @@ void ci_hdrc_remove_device(struct platform_device *pdev)
 }
 EXPORT_SYMBOL_GPL(ci_hdrc_remove_device);
 
-void ci_hdrc_enter_lpm(struct platform_device *pdev, bool enable)
-{
-       struct ci_hdrc *ci = platform_get_drvdata(pdev);
-       enum ci_hw_regs reg = ci->hw_bank.lpm ? OP_DEVLC : OP_PORTSC;
-
-       if (enable)
-               hw_write(ci, reg, PORTSC_PHCD(ci->hw_bank.lpm),
-                               PORTSC_PHCD(ci->hw_bank.lpm));
-       else
-               hw_write(ci, reg, PORTSC_PHCD(ci->hw_bank.lpm),
-                               0);
-}
-EXPORT_SYMBOL_GPL(ci_hdrc_enter_lpm);
-
 static inline void ci_role_destroy(struct ci_hdrc *ci)
 {
        ci_hdrc_gadget_destroy(ci);

diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h
index 02637306a9593423f08a376ae3fb029a38e3d366..7d399671a566ac58afbb3fd17991eb40b069f76d 100644 (file)
--- a/include/linux/usb/chipidea.h
+++ b/include/linux/usb/chipidea.h
@@ -41,5 +41,4 @@ struct platform_device *ci_hdrc_add_device(struct device *dev,
 /* Remove ci hdrc device */
 void ci_hdrc_remove_device(struct platform_device *pdev);
 
-void ci_hdrc_enter_lpm(struct platform_device *pdev, bool enable);
 #endif