From: Peter Chen Date: Tue, 5 Nov 2013 05:33:18 +0000 (+0800) Subject: ENGR00286149-5: Revert "ENGR00277805-6" X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=796de3a2c8b8c83d3a7e9be1e4e0d009da29ef87;p=karo-tx-linux.git ENGR00286149-5: Revert "ENGR00277805-6" This reverts commit 4e9bcf000f717cd17faef109eb6874f3d6323cea. Signed-off-by: Peter Chen --- diff --git a/drivers/usb/chipidea/bits.h b/drivers/usb/chipidea/bits.h index 9f936a361f95..dd0cf9e20273 100644 --- 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 45ee15c199ae..94626409559a 100644 --- 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 02637306a959..7d399671a566 100644 --- 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