From 379e25ee186e830fc615950c346cdcfa803d37cd Mon Sep 17 00:00:00 2001 From: Peter Chen Date: Tue, 5 Nov 2013 13:33:18 +0800 Subject: [PATCH] ENGR00286149-5: Revert "ENGR00277805-6" This reverts commit 4e9bcf000f717cd17faef109eb6874f3d6323cea. Signed-off-by: Peter Chen --- drivers/usb/chipidea/bits.h | 1 - drivers/usb/chipidea/core.c | 14 -------------- include/linux/usb/chipidea.h | 1 - 3 files changed, 16 deletions(-) diff --git a/drivers/usb/chipidea/bits.h b/drivers/usb/chipidea/bits.h index ca57e3dcd3d5..6e8e33dbe60d 100644 --- a/drivers/usb/chipidea/bits.h +++ b/drivers/usb/chipidea/bits.h @@ -53,7 +53,6 @@ #define PORTSC_HSP BIT(9) #define PORTSC_PP BIT(12) #define PORTSC_PTC (0x0FUL << 16) -#define PORTSC_PHCD(d) ((d) ? BIT(22) : BIT(23)) /* PTS and PTW for non lpm version only */ #define PORTSC_PFSC BIT(24) #define PORTSC_PTS(d) \ diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c index 20aa600e0bfe..619d13e29995 100644 --- a/drivers/usb/chipidea/core.c +++ b/drivers/usb/chipidea/core.c @@ -539,20 +539,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 1eaa2c3a8101..bbe779f640be 100644 --- a/include/linux/usb/chipidea.h +++ b/include/linux/usb/chipidea.h @@ -43,5 +43,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 -- 2.39.2