USB: gadget: Use Zero Interrupt Threshold Control for ci13xxx_msm
Subsystems (2)
PATCH v2 1/5 USB: gadget: Use Zero Interrupt Threshold Control for ci13xxx_msm
From: Anji jonnala <[email protected]>
ITC (Interrupt Threshold Control) field is to set the maximum rate at which the device controller will issue interrupts. The maximum interrupt interval is measured in micro frames. Valid values are 0, 1, 2, 4, 8, 16, 32, 64. The default value is 8 micro frames. Set ITC to zero for MSM to gain performance.
--- drivers/usb/gadget/ci13xxx_msm.c | 3 ++- drivers/usb/gadget/ci13xxx_udc.c | 11 +++++++++++ drivers/usb/gadget/ci13xxx_udc.h | 3 +++ 3 files changed, 16 insertions(+), 1 deletions(-)
drivers/usb/gadget/ci13xxx_msm.c +2 -1
@@ -64,7 +64,8 @@ static struct ci13xxx_udc_driver ci13xxx_msm_udc_driver = { .flags = CI13XXX_REGS_SHARED |CI13XXX_REQUIRE_TRANSCEIVER |CI13XXX_PULLUP_ON_VBUS | - CI13XXX_DISABLE_STREAMING, +CI13XXX_DISABLE_STREAMING | + CI13XXX_ZERO_ITC, .notify_event = ci13xxx_msm_notify_event, };
drivers/usb/gadget/ci13xxx_udc.c +11 -0
@@ -318,6 +318,17 @@ static int hw_device_reset(struct ci13xxx *udc)hw_cwrite (CAP_USBMODE ,USBMODE_CM ,USBMODE_CM_DEVICE );hw_cwrite (CAP_USBMODE ,USBMODE_SLOM ,USBMODE_SLOM );/* HW >= 2.3 */ +/* +* ITC (Interrupt Threshold Control) field is to set the maximum +* rate at which the device controller will issue interrupts. +* The maximum interrupt interval measured in micro frames. +* Valid values are 0, 1, 2, 4, 8, 16, 32, 64. The default value is +* 8 micro frames. If CPU can handle interrupts at faster rate, ITC +* can be set to lesser value to gain performance. +*/ +if (udc->udc_driver->flags &&CI13XXX_ZERO_ITC ) +hw_cwrite (CAP_USBCMD ,USBCMD_ITC_MASK ,USBCMD_ITC (0 )); +if (hw_cread (CAP_USBMODE ,USBMODE_CM ) !=USBMODE_CM_DEVICE ) {pr_err ("cannot enter in device mode" );pr_err ("lpm = %i" , hw_bank.lpm);
drivers/usb/gadget/ci13xxx_udc.h +3 -0
@@ -108,6 +108,7 @@ struct ci13xxx_udc_driver {#define CI13XXX_REQUIRE_TRANSCEIVER BIT(1)#define CI13XXX_PULLUP_ON_VBUS BIT(2)#define CI13XXX_DISABLE_STREAMING BIT(3) +#define CI13XXX_ZERO_ITC BIT(4)#define CI13XXX_CONTROLLER_RESET_EVENT 0#define CI13XXX_CONTROLLER_STOPPED_EVENT 1
@@ -189,6 +190,8 @@ struct ci13xxx {#define USBMODE_CM_HOST (0x03UL << 0)#define USBMODE_SLOM BIT(3)#define USBMODE_SDIS BIT(4) +#define USBCMD_ITC (n) (n << 16)/* n = 0, 1, 2, 4, 8, 16, 32, 64 */ +#define USBCMD_ITC_MASK (0xFF << 16)/* ENDPTCTRL */ #define ENDPTCTRL_RXS BIT(0)
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
PATCH v2 1/5 USB: gadget: Use Zero Interrupt Threshold Control for ci13xxx_msm
From: Anji jonnala <[email protected]>
ITC (Interrupt Threshold Control) field is to set the maximum rate at which the device controller will issue interrupts. The maximum interrupt interval is measured in micro frames. Valid values are 0, 1, 2, 4, 8, 16, 32, 64. The default value is 8 micro frames. Set ITC to zero for MSM to gain performance.
--- drivers/usb/gadget/ci13xxx_msm.c | 3 ++- drivers/usb/gadget/ci13xxx_udc.c | 11 +++++++++++ drivers/usb/gadget/ci13xxx_udc.h | 3 +++ 3 files changed, 16 insertions(+), 1 deletions(-)
drivers/usb/gadget/ci13xxx_msm.c +2 -1
@@ -64,7 +64,8 @@ static struct ci13xxx_udc_driver ci13xxx_msm_udc_driver = { .flags = CI13XXX_REGS_SHARED |CI13XXX_REQUIRE_TRANSCEIVER |CI13XXX_PULLUP_ON_VBUS | - CI13XXX_DISABLE_STREAMING, +CI13XXX_DISABLE_STREAMING | + CI13XXX_ZERO_ITC, .notify_event = ci13xxx_msm_notify_event, };
drivers/usb/gadget/ci13xxx_udc.c +11 -0
@@ -318,6 +318,17 @@ static int hw_device_reset(struct ci13xxx *udc)hw_cwrite (CAP_USBMODE ,USBMODE_CM ,USBMODE_CM_DEVICE );hw_cwrite (CAP_USBMODE ,USBMODE_SLOM ,USBMODE_SLOM );/* HW >= 2.3 */ +/* +* ITC (Interrupt Threshold Control) field is to set the maximum +* rate at which the device controller will issue interrupts. +* The maximum interrupt interval measured in micro frames. +* Valid values are 0, 1, 2, 4, 8, 16, 32, 64. The default value is +* 8 micro frames. If CPU can handle interrupts at faster rate, ITC +* can be set to lesser value to gain performance. +*/ +if (udc->udc_driver->flags &CI13XXX_ZERO_ITC ) +hw_cwrite (CAP_USBCMD ,USBCMD_ITC_MASK ,USBCMD_ITC (0 )); +if (hw_cread (CAP_USBMODE ,USBMODE_CM ) !=USBMODE_CM_DEVICE ) {pr_err ("cannot enter in device mode" );pr_err ("lpm = %i" , hw_bank.lpm);
drivers/usb/gadget/ci13xxx_udc.h +3 -0
@@ -108,6 +108,7 @@ struct ci13xxx_udc_driver {#define CI13XXX_REQUIRE_TRANSCEIVER BIT(1)#define CI13XXX_PULLUP_ON_VBUS BIT(2)#define CI13XXX_DISABLE_STREAMING BIT(3) +#define CI13XXX_ZERO_ITC BIT(4)#define CI13XXX_CONTROLLER_RESET_EVENT 0#define CI13XXX_CONTROLLER_STOPPED_EVENT 1
@@ -189,6 +190,8 @@ struct ci13xxx {#define USBMODE_CM_HOST (0x03UL << 0)#define USBMODE_SLOM BIT(3)#define USBMODE_SDIS BIT(4) +#define USBCMD_ITC (n) (n << 16)/* n = 0, 1, 2, 4, 8, 16, 32, 64 */ +#define USBCMD_ITC_MASK (0xFF << 16)/* ENDPTCTRL */ #define ENDPTCTRL_RXS BIT(0)
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
A message that is not in the archive (sent off-list or not yet received): 1304054532-3523-1-git-send-email-pkondeti-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
PATCH v3 3/5 USB: OTG: msm: Implement charger detection
Implement good battery algorithm defined in the battery charging V1.2 spec for detecting different charging ports. USB hardware is put into low power mode when connected to a dedicated charging port. vbus_draw and set_power methods are implemented for determining the allowed current from Host in different states (un-configured/suspend/configured).
The charger block is implemented using vendor specific registers and the PHY used in MSM8960(28nm PHY) different from older targets like MSM8x60 and MSM7x30(45nm PHY). The PHY vendor and product id registers are not implemented in the above chipsets. Hence PHY type is passed via platform data.
--- drivers/usb/gadget/ci13xxx_udc.c | 10 + drivers/usb/otg/msm_otg.c | 380 +++++++++++++++++++++++++++++++++++++- include/linux/usb/msm_hsusb.h | 72 +++++++- 3 files changed, 457 insertions(+), 5 deletions(-)
drivers/usb/gadget/ci13xxx_udc.c +10 -0
@@ -2508,6 +2508,15 @@ out:return ret; } +static int ci13xxx_vbus_draw (struct usb_gadget *_gadget,unsigned mA) +{ + struct ci13xxx *udc = container_of(_gadget, struct ci13xxx, gadget); + +if (udc->transceiver) +return otg_set_power (udc->transceiver, mA); +return -ENOTSUPP ; +} +/** * Device operations part of the API to the USB controller hardware, * which don't involve endpoints (or i/o)
@@ -2516,6 +2525,7 @@ out:static const struct usb_gadget_ops usb_gadget_ops = { .vbus_session = ci13xxx_vbus_session, .wakeup = ci13xxx_wakeup, + .vbus_draw = ci13xxx_vbus_draw, };/**
drivers/usb/otg/msm_otg.c +376 -4
426 lines not on this page · raw message
include/linux/usb/msm_hsusb.h +71 -1
102 lines not on this page · raw message
Signature · 7 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v3 5/5 USB: OTG: msm: Add PHY suspend support for MSM8960
In reply to a message not in the archive--- drivers/usb/otg/msm_otg.c | 64 ++++++++++++++++++++++++++++++++------ include/linux/usb/msm_hsusb_hw.h | 2 + 2 files changed, 56 insertions(+), 10 deletions(-)
drivers/usb/otg/msm_otg.c +54 -10
@@ -167,6 +167,32 @@ put_3p3:return rc; } +#ifdef CONFIG_PM_SLEEP +#define USB_PHY_SUSP_DIG_VOL 500000 +static int msm_hsusb_config_vddcx (int high) +{ +int max_vol =USB_PHY_VDD_DIG_VOL_MAX ; +int min_vol; +int ret; + +if (high) + min_vol =USB_PHY_VDD_DIG_VOL_MIN ; +else + min_vol =USB_PHY_SUSP_DIG_VOL ; + + ret =regulator_set_voltage (hsusb_vddcx, min_vol, max_vol); +if (ret) { +pr_err ("%s: unable to set the voltage for regulator" +"HSUSB_VDDCX\n" , __func__); +return ret; + } + +pr_debug ("%s: min_vol:%d max_vol:%d\n" , __func__, min_vol, max_vol); + +return ret; +} +#endif +static int msm_hsusb_ldo_set_mode (int on) {int ret =0 ;
@@ -438,27 +464,28 @@ static int msm_otg_suspend(struct msm_otg *motg)disable_irq (motg->irq);/* +* Chipidea 45-nm PHY suspend sequence: +* * Interrupt Latch Register auto-clear feature is not present * in all PHY versions. Latch register is clear on read type. * Clear latch register to avoid spurious wakeup from * low power mode (LPM). -*/ -ulpi_read (otg,0x14 ); - -/* +* * PHY comparators are disabled when PHY enters into low power * mode (LPM). Keep PHY comparators ON in LPM only when we expect * VBUS/Id notifications from USB PHY. Otherwise turn off USB * PHY comparators. This save significant amount of power. -*/ -if (pdata->otg_control ==OTG_PHY_CONTROL ) -ulpi_write (otg,0x01 ,0x30 ); - -/* +* * PLL is not turned off when PHY enters into low power mode (LPM). * Disable PLL for maximum power savings. */ -ulpi_write (otg,0x08 ,0x09 ); + +if (motg->pdata->phy_type ==CI_45NM_INTEGRATED_PHY ) { +ulpi_read (otg,0x14 ); +if (pdata->otg_control ==OTG_PHY_CONTROL ) +ulpi_write (otg,0x01 ,0x30 ); +ulpi_write (otg,0x08 ,0x09 ); + }/* * PHY may take some time or even fail to enter into low power
@@ -489,6 +516,10 @@ static int msm_otg_suspend(struct msm_otg *motg)*/ writel (readl (USB_USBCMD ) |ASYNC_INTR_CTRL |ULPI_STP_CTRL ,USB_USBCMD ); +if (motg->pdata->phy_type ==SNPS_28NM_INTEGRATED_PHY && + motg->pdata->otg_control ==OTG_PMIC_CONTROL ) +writel (readl (USB_PHY_CTRL ) |PHY_RETEN ,USB_PHY_CTRL ); +clk_disable (motg->pclk);clk_disable (motg->clk);if (motg->core_clk)
@@ -497,6 +528,12 @@ static int msm_otg_suspend(struct msm_otg *motg)if (!IS_ERR (motg->pclk_src))clk_disable (motg->pclk_src); +if (motg->pdata->phy_type ==SNPS_28NM_INTEGRATED_PHY && + motg->pdata->otg_control ==OTG_PMIC_CONTROL ) { +msm_hsusb_ldo_enable (0 ); +msm_hsusb_config_vddcx (0 ); + } +if (device_may_wakeup (otg->dev))enable_irq_wake (motg->irq);if (bus)
@@ -527,6 +564,13 @@ static int msm_otg_resume(struct msm_otg *motg)if (motg->core_clk)clk_enable (motg->core_clk); +if (motg->pdata->phy_type ==SNPS_28NM_INTEGRATED_PHY && + motg->pdata->otg_control ==OTG_PMIC_CONTROL ) { +msm_hsusb_ldo_enable (1 ); +msm_hsusb_config_vddcx (1 ); +writel (readl (USB_PHY_CTRL ) & ~PHY_RETEN ,USB_PHY_CTRL ); + } + temp =readl (USB_USBCMD ); temp &= ~ASYNC_INTR_CTRL ; temp &= ~ULPI_STP_CTRL ;
include/linux/usb/msm_hsusb_hw.h +2 -0
@@ -24,6 +24,7 @@#define USB_PORTSC (MSM_USB_BASE + 0x0184)#define USB_OTGSC (MSM_USB_BASE + 0x01A4)#define USB_USBMODE (MSM_USB_BASE + 0x01A8) +#define USB_PHY_CTRL (MSM_USB_BASE + 0x0240)#define USBCMD_RESET 2#define USB_USBINTR (MSM_USB_BASE + 0x0148)
@@ -42,6 +43,7 @@#define ASYNC_INTR_CTRL (1 << 29)/* Enable async interrupt */ #define ULPI_STP_CTRL (1 << 30)/* Block communication with PHY */ +#define PHY_RETEN (1 << 1)/* PHY retention enable/disable */ /* OTG definitions */ #define OTGSC_INTSTS_MASK (0x7f << 16)
Signature · 7 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 2/5 USB: OTG: vote for dayatona fabric clock
In reply to Pavankumar KondetiFrom: Anji jonnala <[email protected]>
HSUSB core clock is derived from daytona fabric clock and for HSUSB operational require minimum core clock at 55MHz. Since, HSUSB cannot tolerate daytona fabric clock change in the middle of HSUSB operational, vote for maximum Daytona fabric clock
while usb is operational
--- drivers/usb/otg/msm_otg.c | 37 +++++++++++++++++++++++++++++++++++-- include/linux/usb/msm_hsusb.h | 7 +++++-- 2 files changed, 40 insertions(+), 4 deletions(-)
drivers/usb/otg/msm_otg.c +35 -2
@@ -324,6 +324,9 @@ static int msm_otg_suspend(struct msm_otg *motg)if (motg->core_clk)clk_disable (motg->core_clk); +if (!IS_ERR (motg->pclk_src)) +clk_disable (motg->pclk_src); +if (device_may_wakeup (otg->dev))enable_irq_wake (motg->irq);if (bus)
@@ -347,6 +350,9 @@ static int msm_otg_resume(struct msm_otg *motg)if (!atomic_read (&motg->in_lpm))return 0 ; +if (!IS_ERR (motg->pclk_src)) +clk_enable (motg->pclk_src); +clk_enable (motg->pclk);clk_enable (motg->clk);if (motg->core_clk)
@@ -862,12 +868,31 @@ static int __init msm_otg_probe(struct platform_device *pdev) ret =PTR_ERR (motg->clk); goto put_phy_reset_clk; } +clk_set_rate (motg->clk,60000000 ); + +/* +* If USB Core is running its protocol engine based on CORE CLK, +* CORE CLK must be running at >55Mhz for correct HSUSB +* operation and USB core cannot tolerate frequency changes on +* CORE CLK. For such USB cores, vote for maximum clk frequency +* on pclk source +*/ +if (motg->pdata->pclk_src_name) { + motg->pclk_src =clk_get (&pdev->dev, + motg->pdata->pclk_src_name); +if (IS_ERR (motg->pclk_src)) + goto put_clk; +clk_set_rate (motg->pclk_src,INT_MAX ); +clk_enable (motg->pclk_src); + }else + motg->pclk_src =ERR_PTR (-ENOENT ); + motg->pclk =clk_get (&pdev->dev,"usb_hs_pclk" );if (IS_ERR (motg->pclk)) {dev_err (&pdev->dev,"failed to get usb_hs_pclk\n" ); ret =PTR_ERR (motg->pclk); - goto put_clk; + goto put_pclk_src; }/*
@@ -954,7 +979,11 @@ free_regs: put_core_clk:if (motg->core_clk)clk_put (motg->core_clk); -clk_put (motg->pclk); +put_pclk_src: +if (!IS_ERR (motg->pclk_src)) { +clk_disable (motg->pclk_src); +clk_put (motg->pclk_src); + } put_clk:clk_put (motg->clk); put_phy_reset_clk:
@@ -1004,6 +1033,10 @@ static int __devexit msm_otg_remove(struct platform_device *pdev)clk_disable (motg->clk);if (motg->core_clk)clk_disable (motg->core_clk); +if (!IS_ERR (motg->pclk_src)) { +clk_disable (motg->pclk_src); +clk_put (motg->pclk_src); + }iounmap (motg->regs);pm_runtime_set_suspended (&pdev->dev);
include/linux/usb/msm_hsusb.h +5 -2
@@ -64,7 +64,8 @@ enum otg_control_type {* @otg_control: OTG switch controlled by user/Id pin * @default_mode: Default operational mode. Applicable only if * OTG switch is controller by user. -* +* @pclk_src_name: pclk is derived from ebi1_usb_clk in case of 7x27 and 8k +* dfab_usb_hs_clk in case of 8660 and 8960. */ struct msm_otg_platform_data {int *phy_init_seq;
@@ -74,6 +75,7 @@ struct msm_otg_platform_data {enum otg_control_type otg_control;enum usb_mode_type default_mode;void (*setup_gpio)(enum usb_otg_state state); +char *pclk_src_name; };/**
@@ -83,6 +85,7 @@ struct msm_otg_platform_data {* @irq: IRQ number assigned for HSUSB controller. * @clk: clock struct of usb_hs_clk. * @pclk: clock struct of usb_hs_pclk. +* @pclk_src: pclk source for voting. * @phy_reset_clk: clock struct of usb_phy_clk. * @core_clk: clock struct of usb_hs_core_clk. * @regs: ioremapped register base address.
@@ -90,7 +93,6 @@ struct msm_otg_platform_data {* @sm_work: OTG state machine work. * @in_lpm: indicates low power mode (LPM) state. * @async_int: Async interrupt arrived. -* */ struct msm_otg {struct otg_transceiver otg;
@@ -98,6 +100,7 @@ struct msm_otg {int irq;struct clk *clk;struct clk *pclk; +struct clk *pclk_src;struct clk *phy_reset_clk;struct clk *core_clk;void __iomem *regs;
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
PATCH v2 4/5 USB: OTG: msm: Configure PHY Analog and Digital voltage domains
In reply to Pavankumar KondetiFrom: Anji jonnala <[email protected]>
--- drivers/usb/otg/msm_otg.c | 194 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 193 insertions(+), 1 deletions(-)
drivers/usb/otg/msm_otg.c +193 -1
@@ -38,6 +38,7 @@#include <linux/usb/hcd.h> #include <linux/usb/msm_hsusb.h> #include <linux/usb/msm_hsusb_hw.h> +#include <linux/regulator/consumer.h> #include <mach/clk.h>
@@ -45,6 +46,175 @@#define DRIVER_NAME "msm_otg"#define ULPI_IO_TIMEOUT_USEC (10 * 1000) + +#define USB_PHY_3P3_VOL_MIN 3050000/* uV */ +#define USB_PHY_3P3_VOL_MAX 3300000/* uV */ +#define USB_PHY_3P3_HPM_LOAD 50000/* uA */ +#define USB_PHY_3P3_LPM_LOAD 4000/* uA */ + +#define USB_PHY_1P8_VOL_MIN 1800000/* uV */ +#define USB_PHY_1P8_VOL_MAX 1800000/* uV */ +#define USB_PHY_1P8_HPM_LOAD 50000/* uA */ +#define USB_PHY_1P8_LPM_LOAD 4000/* uA */ + +#define USB_PHY_VDD_DIG_VOL_MIN 1000000/* uV */ +#define USB_PHY_VDD_DIG_VOL_MAX 1320000/* uV */ + +static struct regulator *hsusb_3p3; +static struct regulator *hsusb_1p8; +static struct regulator *hsusb_vddcx; + +static int msm_hsusb_init_vddcx (struct msm_otg *motg,int init) +{ +int ret =0 ; + +if (init) { + hsusb_vddcx =regulator_get (motg->otg.dev,"HSUSB_VDDCX" ); +if (IS_ERR (hsusb_vddcx)) { +dev_err (motg->otg.dev,"unable to get hsusb vddcx\n" ); +return PTR_ERR (hsusb_vddcx); + } + + ret =regulator_set_voltage (hsusb_vddcx, +USB_PHY_VDD_DIG_VOL_MIN , +USB_PHY_VDD_DIG_VOL_MAX ); +if (ret) { +dev_err (motg->otg.dev,"unable to set the voltage" +"for hsusb vddcx\n" ); +regulator_put (hsusb_vddcx); +return ret; + } + + ret =regulator_enable (hsusb_vddcx); +if (ret) { +dev_err (motg->otg.dev,"unable to enable hsusb vddcx\n" ); +regulator_put (hsusb_vddcx); + } + }else { + ret =regulator_set_voltage (hsusb_vddcx,0 , +USB_PHY_VDD_DIG_VOL_MIN ); +if (ret) { +dev_err (motg->otg.dev,"unable to set the voltage" +"for hsusb vddcx\n" ); +return ret; + } + ret =regulator_disable (hsusb_vddcx); +if (ret) { +dev_err (motg->otg.dev,"unable to disable hsusb vddcx\n" ); +return ret; + } + +regulator_put (hsusb_vddcx); + } + +return ret; +} + +static int msm_hsusb_ldo_init (struct msm_otg *motg,int init) +{ +int rc =0 ; + +if (init) { + hsusb_3p3 =regulator_get (motg->otg.dev,"HSUSB_3p3" ); +if (IS_ERR (hsusb_3p3)) { +dev_err (motg->otg.dev,"unable to get hsusb 3p3\n" ); +return PTR_ERR (hsusb_3p3); + } + + rc =regulator_set_voltage (hsusb_3p3,USB_PHY_3P3_VOL_MIN , +USB_PHY_3P3_VOL_MAX ); +if (rc) { +dev_err (motg->otg.dev,"unable to set voltage level for" +"hsusb 3p3\n" ); + goto put_3p3; + } + rc =regulator_enable (hsusb_3p3); +if (rc) { +dev_err (motg->otg.dev,"unable to enable the hsusb 3p3\n" ); + goto put_3p3_lpm; + } + hsusb_1p8 =regulator_get (motg->otg.dev,"HSUSB_1p8" ); +if (IS_ERR (hsusb_1p8)) { +dev_err (motg->otg.dev,"unable to get hsusb 1p8\n" ); + rc =PTR_ERR (hsusb_1p8); + goto put_3p3_lpm; + } + rc =regulator_set_voltage (hsusb_1p8,USB_PHY_1P8_VOL_MIN , +USB_PHY_1P8_VOL_MAX ); +if (rc) { +dev_err (motg->otg.dev,"unable to set voltage level for" +"hsusb 1p8\n" ); + goto put_1p8; + } + rc =regulator_enable (hsusb_1p8); +if (rc) { +dev_err (motg->otg.dev,"unable to enable the hsusb 1p8\n" ); + goto disable_1p8; + } + +return 0 ; + } + +disable_1p8: +regulator_set_voltage (hsusb_1p8,0 ,USB_PHY_1P8_VOL_MAX ); +regulator_disable (hsusb_1p8); +put_1p8: +regulator_put (hsusb_1p8); +put_3p3_lpm: +regulator_set_voltage (hsusb_3p3,0 ,USB_PHY_3P3_VOL_MAX ); +put_3p3: +regulator_put (hsusb_3p3); +return rc; +} + +static int msm_hsusb_ldo_set_mode (int on) +{ +int ret =0 ; + +if (!hsusb_1p8 ||IS_ERR (hsusb_1p8)) { +pr_err ("%s: HSUSB_1p8 is not initialized\n" , __func__); +return -ENODEV ; + } + +if (!hsusb_3p3 ||IS_ERR (hsusb_3p3)) { +pr_err ("%s: HSUSB_3p3 is not initialized\n" , __func__); +return -ENODEV ; + } + +if (on) { + ret =regulator_set_optimum_mode (hsusb_1p8, +USB_PHY_1P8_HPM_LOAD ); +if (ret <0 ) { +pr_err ("%s: Unable to set HPM of the regulator:" +"HSUSB_1p8\n" , __func__); +return ret; + } + ret =regulator_set_optimum_mode (hsusb_3p3, +USB_PHY_3P3_HPM_LOAD ); +if (ret <0 ) { +pr_err ("%s: Unable to set HPM of the regulator:" +"HSUSB_3p3\n" , __func__); +regulator_set_optimum_mode (hsusb_1p8, +USB_PHY_1P8_LPM_LOAD ); +return ret; + } + }else { + ret =regulator_set_optimum_mode (hsusb_1p8, +USB_PHY_1P8_LPM_LOAD ); +if (ret <0 ) +pr_err ("%s: Unable to set LPM of the regulator:" +"HSUSB_1p8\n" , __func__); + ret =regulator_set_optimum_mode (hsusb_3p3, +USB_PHY_3P3_LPM_LOAD ); +if (ret <0 ) +pr_err ("%s: Unable to set LPM of the regulator:" +"HSUSB_3p3\n" , __func__); + } + +pr_debug ("reg (%s)\n" , on ?"HPM" :"LPM" ); +return ret <0 ? ret :0 ; +} +static int ulpi_read (struct otg_transceiver *otg,u32 reg) { struct msm_otg *motg = container_of(otg, struct msm_otg, otg);
@@ -353,7 +523,6 @@ static int msm_otg_resume(struct msm_otg *motg)if (!IS_ERR (motg->pclk_src))clk_enable (motg->pclk_src); -clk_enable (motg->pclk);clk_enable (motg->clk);if (motg->core_clk)clk_enable (motg->core_clk);
@@ -1297,6 +1466,24 @@ static int __init msm_otg_probe(struct platform_device *pdev)clk_enable (motg->clk);clk_enable (motg->pclk); + + ret =msm_hsusb_init_vddcx (motg,1 ); +if (ret) { +dev_err (&pdev->dev,"hsusb vddcx configuration failed\n" ); + goto free_regs; + } + + ret =msm_hsusb_ldo_init (motg,1 ); +if (ret) { +dev_err (&pdev->dev,"hsusb vreg configuration failed\n" ); + goto free_config_vddcx; + } + ret =msm_hsusb_ldo_set_mode (1 ); +if (ret) { +dev_err (&pdev->dev,"hsusb vreg enable failed\n" ); + goto free_ldo_init; + } +if (motg->core_clk)clk_enable (motg->core_clk);
@@ -1345,6 +1532,10 @@ free_irq: disable_clks:clk_disable (motg->pclk);clk_disable (motg->clk); +free_ldo_init: +msm_hsusb_ldo_init (motg,0 ); +free_config_vddcx: +msm_hsusb_init_vddcx (motg,0 ); free_regs:iounmap (motg->regs); put_core_clk:
@@ -1409,6 +1600,7 @@ static int __devexit msm_otg_remove(struct platform_device *pdev)clk_disable (motg->pclk_src);clk_put (motg->pclk_src); } +msm_hsusb_ldo_init (motg,0 );iounmap (motg->regs);pm_runtime_set_suspended (&pdev->dev);
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
PATCH v2 2/5 USB: OTG: vote for dayatona fabric clock
In reply to Pavankumar KondetiFrom: Anji jonnala <[email protected]>
HSUSB core clock is derived from daytona fabric clock and for HSUSB operational require minimum core clock at 55MHz. Since, HSUSB cannot tolerate daytona fabric clock change in the middle of HSUSB operational, vote for maximum Daytona fabric clock
while usb is operational
--- drivers/usb/otg/msm_otg.c | 37 +++++++++++++++++++++++++++++++++++-- include/linux/usb/msm_hsusb.h | 7 +++++-- 2 files changed, 40 insertions(+), 4 deletions(-)
drivers/usb/otg/msm_otg.c +35 -2
@@ -324,6 +324,9 @@ static int msm_otg_suspend(struct msm_otg *motg)if (motg->core_clk)clk_disable (motg->core_clk); +if (!IS_ERR (motg->pclk_src)) +clk_disable (motg->pclk_src); +if (device_may_wakeup (otg->dev))enable_irq_wake (motg->irq);if (bus)
@@ -347,6 +350,9 @@ static int msm_otg_resume(struct msm_otg *motg)if (!atomic_read (&motg->in_lpm))return 0 ; +if (!IS_ERR (motg->pclk_src)) +clk_enable (motg->pclk_src); +clk_enable (motg->pclk);clk_enable (motg->clk);if (motg->core_clk)
@@ -862,12 +868,31 @@ static int __init msm_otg_probe(struct platform_device *pdev) ret =PTR_ERR (motg->clk); goto put_phy_reset_clk; } +clk_set_rate (motg->clk,60000000 ); + +/* +* If USB Core is running its protocol engine based on CORE CLK, +* CORE CLK must be running at >55Mhz for correct HSUSB +* operation and USB core cannot tolerate frequency changes on +* CORE CLK. For such USB cores, vote for maximum clk frequency +* on pclk source +*/ +if (motg->pdata->pclk_src_name) { + motg->pclk_src =clk_get (&pdev->dev, + motg->pdata->pclk_src_name); +if (IS_ERR (motg->pclk_src)) + goto put_clk; +clk_set_rate (motg->pclk_src,INT_MAX ); +clk_enable (motg->pclk_src); + }else + motg->pclk_src =ERR_PTR (-ENOENT ); + motg->pclk =clk_get (&pdev->dev,"usb_hs_pclk" );if (IS_ERR (motg->pclk)) {dev_err (&pdev->dev,"failed to get usb_hs_pclk\n" ); ret =PTR_ERR (motg->pclk); - goto put_clk; + goto put_pclk_src; }/*
@@ -954,7 +979,11 @@ free_regs: put_core_clk:if (motg->core_clk)clk_put (motg->core_clk); -clk_put (motg->pclk); +put_pclk_src: +if (!IS_ERR (motg->pclk_src)) { +clk_disable (motg->pclk_src); +clk_put (motg->pclk_src); + } put_clk:clk_put (motg->clk); put_phy_reset_clk:
@@ -1004,6 +1033,10 @@ static int __devexit msm_otg_remove(struct platform_device *pdev)clk_disable (motg->clk);if (motg->core_clk)clk_disable (motg->core_clk); +if (!IS_ERR (motg->pclk_src)) { +clk_disable (motg->pclk_src); +clk_put (motg->pclk_src); + }iounmap (motg->regs);pm_runtime_set_suspended (&pdev->dev);
include/linux/usb/msm_hsusb.h +5 -2
@@ -64,7 +64,8 @@ enum otg_control_type {* @otg_control: OTG switch controlled by user/Id pin * @default_mode: Default operational mode. Applicable only if * OTG switch is controller by user. -* +* @pclk_src_name: pclk is derived from ebi1_usb_clk in case of 7x27 and 8k +* dfab_usb_hs_clk in case of 8660 and 8960. */ struct msm_otg_platform_data {int *phy_init_seq;
@@ -74,6 +75,7 @@ struct msm_otg_platform_data {enum otg_control_type otg_control;enum usb_mode_type default_mode;void (*setup_gpio)(enum usb_otg_state state); +char *pclk_src_name; };/**
@@ -83,6 +85,7 @@ struct msm_otg_platform_data {* @irq: IRQ number assigned for HSUSB controller. * @clk: clock struct of usb_hs_clk. * @pclk: clock struct of usb_hs_pclk. +* @pclk_src: pclk source for voting. * @phy_reset_clk: clock struct of usb_phy_clk. * @core_clk: clock struct of usb_hs_core_clk. * @regs: ioremapped register base address.
@@ -90,7 +93,6 @@ struct msm_otg_platform_data {* @sm_work: OTG state machine work. * @in_lpm: indicates low power mode (LPM) state. * @async_int: Async interrupt arrived. -* */ struct msm_otg {struct otg_transceiver otg;
@@ -98,6 +100,7 @@ struct msm_otg {int irq;struct clk *clk;struct clk *pclk; +struct clk *pclk_src;struct clk *phy_reset_clk;struct clk *core_clk;void __iomem *regs;
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
PATCH v2 3/5 USB: OTG: msm: Implement charger detection
In reply to Pavankumar KondetiImplement good battery algorithm defined in the battery charging V1.2 spec for detecting different charging ports. USB hardware is put into low power mode when connected to a dedicated charging port. vbus_draw and set_power methods are implemented for determining the allowed current from Host in different states (un-configured/suspend/configured).
The charger block is implemented using vendor specific registers and the PHY used in MSM8960(28nm PHY) different from older targets like MSM8x60 and MSM7x30(45nm PHY). The PHY vendor and product id registers are not implemented in the above chipsets. Hence PHY type is passed via platform data.
--- drivers/usb/gadget/ci13xxx_udc.c | 10 + drivers/usb/otg/msm_otg.c | 380 +++++++++++++++++++++++++++++++++++++- include/linux/usb/msm_hsusb.h | 72 +++++++- 3 files changed, 457 insertions(+), 5 deletions(-)
drivers/usb/gadget/ci13xxx_udc.c +10 -0
@@ -2508,6 +2508,15 @@ out:return ret; } +static int ci13xxx_vbus_draw (struct usb_gadget *_gadget,unsigned mA) +{ + struct ci13xxx *udc = container_of(_gadget, struct ci13xxx, gadget); + +if (udc->transceiver) +return otg_set_power (udc->transceiver, mA); +return -ENOTSUPP ; +} +/** * Device operations part of the API to the USB controller hardware, * which don't involve endpoints (or i/o)
@@ -2516,6 +2525,7 @@ out:static const struct usb_gadget_ops usb_gadget_ops = { .vbus_session = ci13xxx_vbus_session, .wakeup = ci13xxx_wakeup, + .vbus_draw = ci13xxx_vbus_draw, };/**
drivers/usb/otg/msm_otg.c +376 -4
426 lines not on this page · raw message
include/linux/usb/msm_hsusb.h +71 -1
102 lines not on this page · raw message
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
PATCH v2 4/5 USB: OTG: msm: Configure PHY Analog and Digital voltage domains
In reply to Pavankumar KondetiFrom: Anji jonnala <[email protected]>
--- drivers/usb/otg/msm_otg.c | 194 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 193 insertions(+), 1 deletions(-)
drivers/usb/otg/msm_otg.c +193 -1
@@ -38,6 +38,7 @@#include <linux/usb/hcd.h> #include <linux/usb/msm_hsusb.h> #include <linux/usb/msm_hsusb_hw.h> +#include <linux/regulator/consumer.h> #include <mach/clk.h>
@@ -45,6 +46,175 @@#define DRIVER_NAME "msm_otg"#define ULPI_IO_TIMEOUT_USEC (10 * 1000) + +#define USB_PHY_3P3_VOL_MIN 3050000/* uV */ +#define USB_PHY_3P3_VOL_MAX 3300000/* uV */ +#define USB_PHY_3P3_HPM_LOAD 50000/* uA */ +#define USB_PHY_3P3_LPM_LOAD 4000/* uA */ + +#define USB_PHY_1P8_VOL_MIN 1800000/* uV */ +#define USB_PHY_1P8_VOL_MAX 1800000/* uV */ +#define USB_PHY_1P8_HPM_LOAD 50000/* uA */ +#define USB_PHY_1P8_LPM_LOAD 4000/* uA */ + +#define USB_PHY_VDD_DIG_VOL_MIN 1000000/* uV */ +#define USB_PHY_VDD_DIG_VOL_MAX 1320000/* uV */ + +static struct regulator *hsusb_3p3; +static struct regulator *hsusb_1p8; +static struct regulator *hsusb_vddcx; + +static int msm_hsusb_init_vddcx (struct msm_otg *motg,int init) +{ +int ret =0 ; + +if (init) { + hsusb_vddcx =regulator_get (motg->otg.dev,"HSUSB_VDDCX" ); +if (IS_ERR (hsusb_vddcx)) { +dev_err (motg->otg.dev,"unable to get hsusb vddcx\n" ); +return PTR_ERR (hsusb_vddcx); + } + + ret =regulator_set_voltage (hsusb_vddcx, +USB_PHY_VDD_DIG_VOL_MIN , +USB_PHY_VDD_DIG_VOL_MAX ); +if (ret) { +dev_err (motg->otg.dev,"unable to set the voltage" +"for hsusb vddcx\n" ); +regulator_put (hsusb_vddcx); +return ret; + } + + ret =regulator_enable (hsusb_vddcx); +if (ret) { +dev_err (motg->otg.dev,"unable to enable hsusb vddcx\n" ); +regulator_put (hsusb_vddcx); + } + }else { + ret =regulator_set_voltage (hsusb_vddcx,0 , +USB_PHY_VDD_DIG_VOL_MIN ); +if (ret) { +dev_err (motg->otg.dev,"unable to set the voltage" +"for hsusb vddcx\n" ); +return ret; + } + ret =regulator_disable (hsusb_vddcx); +if (ret) { +dev_err (motg->otg.dev,"unable to disable hsusb vddcx\n" ); +return ret; + } + +regulator_put (hsusb_vddcx); + } + +return ret; +} + +static int msm_hsusb_ldo_init (struct msm_otg *motg,int init) +{ +int rc =0 ; + +if (init) { + hsusb_3p3 =regulator_get (motg->otg.dev,"HSUSB_3p3" ); +if (IS_ERR (hsusb_3p3)) { +dev_err (motg->otg.dev,"unable to get hsusb 3p3\n" ); +return PTR_ERR (hsusb_3p3); + } + + rc =regulator_set_voltage (hsusb_3p3,USB_PHY_3P3_VOL_MIN , +USB_PHY_3P3_VOL_MAX ); +if (rc) { +dev_err (motg->otg.dev,"unable to set voltage level for" +"hsusb 3p3\n" ); + goto put_3p3; + } + rc =regulator_enable (hsusb_3p3); +if (rc) { +dev_err (motg->otg.dev,"unable to enable the hsusb 3p3\n" ); + goto put_3p3_lpm; + } + hsusb_1p8 =regulator_get (motg->otg.dev,"HSUSB_1p8" ); +if (IS_ERR (hsusb_1p8)) { +dev_err (motg->otg.dev,"unable to get hsusb 1p8\n" ); + rc =PTR_ERR (hsusb_1p8); + goto put_3p3_lpm; + } + rc =regulator_set_voltage (hsusb_1p8,USB_PHY_1P8_VOL_MIN , +USB_PHY_1P8_VOL_MAX ); +if (rc) { +dev_err (motg->otg.dev,"unable to set voltage level for" +"hsusb 1p8\n" ); + goto put_1p8; + } + rc =regulator_enable (hsusb_1p8); +if (rc) { +dev_err (motg->otg.dev,"unable to enable the hsusb 1p8\n" ); + goto disable_1p8; + } + +return 0 ; + } + +disable_1p8: +regulator_set_voltage (hsusb_1p8,0 ,USB_PHY_1P8_VOL_MAX ); +regulator_disable (hsusb_1p8); +put_1p8: +regulator_put (hsusb_1p8); +put_3p3_lpm: +regulator_set_voltage (hsusb_3p3,0 ,USB_PHY_3P3_VOL_MAX ); +put_3p3: +regulator_put (hsusb_3p3); +return rc; +} + +static int msm_hsusb_ldo_set_mode (int on) +{ +int ret =0 ; + +if (!hsusb_1p8 ||IS_ERR (hsusb_1p8)) { +pr_err ("%s: HSUSB_1p8 is not initialized\n" , __func__); +return -ENODEV ; + } + +if (!hsusb_3p3 ||IS_ERR (hsusb_3p3)) { +pr_err ("%s: HSUSB_3p3 is not initialized\n" , __func__); +return -ENODEV ; + } + +if (on) { + ret =regulator_set_optimum_mode (hsusb_1p8, +USB_PHY_1P8_HPM_LOAD ); +if (ret <0 ) { +pr_err ("%s: Unable to set HPM of the regulator:" +"HSUSB_1p8\n" , __func__); +return ret; + } + ret =regulator_set_optimum_mode (hsusb_3p3, +USB_PHY_3P3_HPM_LOAD ); +if (ret <0 ) { +pr_err ("%s: Unable to set HPM of the regulator:" +"HSUSB_3p3\n" , __func__); +regulator_set_optimum_mode (hsusb_1p8, +USB_PHY_1P8_LPM_LOAD ); +return ret; + } + }else { + ret =regulator_set_optimum_mode (hsusb_1p8, +USB_PHY_1P8_LPM_LOAD ); +if (ret <0 ) +pr_err ("%s: Unable to set LPM of the regulator:" +"HSUSB_1p8\n" , __func__); + ret =regulator_set_optimum_mode (hsusb_3p3, +USB_PHY_3P3_LPM_LOAD ); +if (ret <0 ) +pr_err ("%s: Unable to set LPM of the regulator:" +"HSUSB_3p3\n" , __func__); + } + +pr_debug ("reg (%s)\n" , on ?"HPM" :"LPM" ); +return ret <0 ? ret :0 ; +} +static int ulpi_read (struct otg_transceiver *otg,u32 reg) { struct msm_otg *motg = container_of(otg, struct msm_otg, otg);
@@ -353,7 +523,6 @@ static int msm_otg_resume(struct msm_otg *motg)if (!IS_ERR (motg->pclk_src))clk_enable (motg->pclk_src); -clk_enable (motg->pclk);clk_enable (motg->clk);if (motg->core_clk)clk_enable (motg->core_clk);
@@ -1297,6 +1466,24 @@ static int __init msm_otg_probe(struct platform_device *pdev)clk_enable (motg->clk);clk_enable (motg->pclk); + + ret =msm_hsusb_init_vddcx (motg,1 ); +if (ret) { +dev_err (&pdev->dev,"hsusb vddcx configuration failed\n" ); + goto free_regs; + } + + ret =msm_hsusb_ldo_init (motg,1 ); +if (ret) { +dev_err (&pdev->dev,"hsusb vreg configuration failed\n" ); + goto free_config_vddcx; + } + ret =msm_hsusb_ldo_set_mode (1 ); +if (ret) { +dev_err (&pdev->dev,"hsusb vreg enable failed\n" ); + goto free_ldo_init; + } +if (motg->core_clk)clk_enable (motg->core_clk);
@@ -1345,6 +1532,10 @@ free_irq: disable_clks:clk_disable (motg->pclk);clk_disable (motg->clk); +free_ldo_init: +msm_hsusb_ldo_init (motg,0 ); +free_config_vddcx: +msm_hsusb_init_vddcx (motg,0 ); free_regs:iounmap (motg->regs); put_core_clk:
@@ -1409,6 +1600,7 @@ static int __devexit msm_otg_remove(struct platform_device *pdev)clk_disable (motg->pclk_src);clk_put (motg->pclk_src); } +msm_hsusb_ldo_init (motg,0 );iounmap (motg->regs);pm_runtime_set_suspended (&pdev->dev);
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
Re: [PATCH 4/5] USB: OTG: msm: Configure PHY Analog and Digital voltage domains
Quoted 4 lines · Pavankumar Kondeti
From: Anji jonnala <[email protected]>
Signed-off-by Anji jonnala <[email protected]>Signed-off-by Pavankumar Kondeti <[email protected]>
[...]
Quoted 62 lines
drivers/usb/otg/msm_otg.c +47
-0@@ -38,6 +38,7 @@#include <linux/usb/hcd.h> #include <linux/usb/msm_hsusb.h> #include <linux/usb/msm_hsusb_hw.h> +#include <linux/regulator/consumer.h> #include <mach/clk.h> @@ -45,6 +46,175 @@#define DRIVER_NAME "msm_otg"#define ULPI_IO_TIMEOUT_USEC (10 * 1000) + +#define USB_PHY_3P3_VOL_MIN 3050000/* uV */ +#define USB_PHY_3P3_VOL_MAX 3300000/* uV */ +#define USB_PHY_3P3_HPM_LOAD 50000/* uA */ +#define USB_PHY_3P3_LPM_LOAD 4000/* uA */ + +#define USB_PHY_1P8_VOL_MIN 1800000/* uV */ +#define USB_PHY_1P8_VOL_MAX 1800000/* uV */ +#define USB_PHY_1P8_HPM_LOAD 50000/* uA */ +#define USB_PHY_1P8_LPM_LOAD 4000/* uA */ + +#define USB_PHY_VDD_DIG_VOL_MIN 1000000/* uV */ +#define USB_PHY_VDD_DIG_VOL_MAX 1320000/* uV */ + +static struct regulator *hsusb_3p3; +static struct regulator *hsusb_1p8; +static struct regulator *hsusb_vddcx; + +static int msm_hsusb_init_vddcx (struct msm_otg *motg,int init) +{ +int ret =0 ; + +if (init) { + hsusb_vddcx =regulator_get (motg->otg.dev,"HSUSB_VDDCX" ); +if (IS_ERR (hsusb_vddcx)) { +dev_err (motg->otg.dev,"unable to get hsusb vddcx\n" ); +return PTR_ERR (hsusb_vddcx); + } + + ret =regulator_set_voltage (hsusb_vddcx, +USB_PHY_VDD_DIG_VOL_MIN , +USB_PHY_VDD_DIG_VOL_MAX ); +if (ret) { +dev_err (motg->otg.dev,"unable to set the voltage" +"for hsusb vddcx\n" ); +regulator_put (hsusb_vddcx); +return ret; + } + + ret =regulator_enable (hsusb_vddcx); +if (ret) { +dev_err (motg->otg.dev,"unable to enable hsusb vddcx\n" ); +regulator_put (hsusb_vddcx); + } + }else { + ret = regulator_set_voltage(hsusb_vddcx, 0,
drivers/usb/otg/msm_otg.c line 104
Quoted 10 lines
drivers/usb/otg/msm_otg.c +10
-0+ USB_PHY_VDD_DIG_VOL_MIN); +if (ret) { +dev_err (motg->otg.dev,"unable to set the voltage" +"for hsusb vddcx\n" ); +return ret; + } + ret =regulator_disable (hsusb_vddcx); +if (ret) { +dev_err (motg->otg.dev,"unable to disable hsusb vddcx\n" ); +return ret;
I suspect you should call regulator_put() on error cases as well...
Quoted 46 lines
drivers/usb/otg/msm_otg.c +46
-0+ } + +regulator_put (hsusb_vddcx); + } + +return ret; +} + +static int msm_hsusb_ldo_init (struct msm_otg *motg,int init) +{ +int rc =0 ; + +if (init) { + hsusb_3p3 =regulator_get (motg->otg.dev,"HSUSB_3p3" ); +if (IS_ERR (hsusb_3p3)) { +dev_err (motg->otg.dev,"unable to get hsusb 3p3\n" ); +return PTR_ERR (hsusb_3p3); + } + + rc =regulator_set_voltage (hsusb_3p3,USB_PHY_3P3_VOL_MIN , +USB_PHY_3P3_VOL_MAX ); +if (rc) { +dev_err (motg->otg.dev,"unable to set voltage level for" +"hsusb 3p3\n" ); + goto put_3p3; + } + rc =regulator_enable (hsusb_3p3); +if (rc) { +dev_err (motg->otg.dev,"unable to enable the hsusb 3p3\n" ); + goto put_3p3_lpm; + } + hsusb_1p8 =regulator_get (motg->otg.dev,"HSUSB_1p8" ); +if (IS_ERR (hsusb_1p8)) { +dev_err (motg->otg.dev,"unable to get hsusb 1p8\n" ); + rc =PTR_ERR (hsusb_1p8); + goto put_3p3_lpm; + } + rc =regulator_set_voltage (hsusb_1p8,USB_PHY_1P8_VOL_MIN , +USB_PHY_1P8_VOL_MAX ); +if (rc) { +dev_err (motg->otg.dev,"unable to set voltage level for" +"hsusb 1p8\n" ); + goto put_1p8; + } + rc =regulator_enable (hsusb_1p8); +if (rc) {
drivers/usb/otg/msm_otg.c line 160
Quoted 10 lines
drivers/usb/otg/msm_otg.c +10
-0+dev_err (motg->otg.dev,"unable to enable the hsusb 1p8\n" ); + goto disable_1p8; + } + +return 0 ; + } + +disable_1p8: +regulator_set_voltage (hsusb_1p8,0 ,USB_PHY_1P8_VOL_MAX ); +regulator_disable (hsusb_1p8);
Why call regualator_disable() if regulator_enable() has just failed?
Quoted 8 lines
drivers/usb/otg/msm_otg.c +8
-0+put_1p8: +regulator_put (hsusb_1p8); +put_3p3_lpm: +regulator_set_voltage (hsusb_3p3,0 ,USB_PHY_3P3_VOL_MAX ); +put_3p3: +regulator_put (hsusb_3p3); +return rc; +}
[...]
drivers/usb/otg/msm_otg.c free_irq: · line 1535
Quoted 5 lines
drivers/usb/otg/msm_otg.c +1
-0@@ -1345,6 +1532,10 @@ free_irq: disable_clks:clk_disable (motg->pclk);clk_disable (motg->clk); +free_ldo_init:
'ldo_exit' perhaps?
drivers/usb/otg/msm_otg.c free_irq: · line 1537
Quoted 2 lines
drivers/usb/otg/msm_otg.c +2
-0+msm_hsusb_ldo_init (motg,0 ); +free_config_vddcx:
'vddcx_exit' perhaps?
drivers/usb/otg/msm_otg.c free_irq: · line 1541
Quoted 4 lines
drivers/usb/otg/msm_otg.c +1
-0+msm_hsusb_init_vddcx (motg,0 ); free_regs:iounmap (motg->regs); put_core_clk:
WBR, Sergei
Re: [PATCH 4/5] USB: OTG: msm: Configure PHY Analog and Digital voltage domains
Hi Sergei,
Thanks for the review.
Quoted 8 lines · Sergei Shtylyov
Quoted 4 lines · Pavankumar Kondeti
From: Anji jonnala <[email protected]>
Signed-off-by Anji jonnala <[email protected]>Signed-off-by Pavankumar Kondeti <[email protected]>[...]
<snip>
Quoted 32 lines
Quoted 32 lines
drivers/usb/otg/msm_otg.c +32
-0+static int msm_hsusb_init_vddcx (struct msm_otg *motg,int init) +{ +int ret =0 ; + +if (init) { + hsusb_vddcx =regulator_get (motg->otg.dev,"HSUSB_VDDCX" ); +if (IS_ERR (hsusb_vddcx)) { +dev_err (motg->otg.dev,"unable to get hsusb vddcx\n" ); +return PTR_ERR (hsusb_vddcx); + } + + ret =regulator_set_voltage (hsusb_vddcx, +USB_PHY_VDD_DIG_VOL_MIN , +USB_PHY_VDD_DIG_VOL_MAX ); +if (ret) { +dev_err (motg->otg.dev,"unable to set the voltage" +"for hsusb vddcx\n" ); +regulator_put (hsusb_vddcx); +return ret; + } + + ret =regulator_enable (hsusb_vddcx); +if (ret) { +dev_err (motg->otg.dev,"unable to enable hsusb vddcx\n" ); +regulator_put (hsusb_vddcx); + } + }else { + ret =regulator_set_voltage (hsusb_vddcx,0 , +USB_PHY_VDD_DIG_VOL_MIN ); +if (ret) { +dev_err (motg->otg.dev,"unable to set the voltage" +"for hsusb vddcx\n" );
Quoted 9 lines
drivers/usb/otg/msm_otg.c line 104
Quoted 6 lines
drivers/usb/otg/msm_otg.c +6
-0+return ret; + } + ret =regulator_disable (hsusb_vddcx); +if (ret) { +dev_err (motg->otg.dev,"unable to disable hsusb vddcx\n" ); +return ret;I suspect you should call
regulator_put()on error cases as well...
Yep. Will fix it next patch set.
Quoted 50 lines
Quoted 50 lines
drivers/usb/otg/msm_otg.c +50
-0+ } + +regulator_put (hsusb_vddcx); + } + +return ret; +} + +static int msm_hsusb_ldo_init (struct msm_otg *motg,int init) +{ +int rc =0 ; + +if (init) { + hsusb_3p3 =regulator_get (motg->otg.dev,"HSUSB_3p3" ); +if (IS_ERR (hsusb_3p3)) { +dev_err (motg->otg.dev,"unable to get hsusb 3p3\n" ); +return PTR_ERR (hsusb_3p3); + } + + rc =regulator_set_voltage (hsusb_3p3,USB_PHY_3P3_VOL_MIN , +USB_PHY_3P3_VOL_MAX ); +if (rc) { +dev_err (motg->otg.dev,"unable to set voltage level for" +"hsusb 3p3\n" ); + goto put_3p3; + } + rc =regulator_enable (hsusb_3p3); +if (rc) { +dev_err (motg->otg.dev,"unable to enable the hsusb 3p3\n" ); + goto put_3p3_lpm; + } + hsusb_1p8 =regulator_get (motg->otg.dev,"HSUSB_1p8" ); +if (IS_ERR (hsusb_1p8)) { +dev_err (motg->otg.dev,"unable to get hsusb 1p8\n" ); + rc =PTR_ERR (hsusb_1p8); + goto put_3p3_lpm; + } + rc =regulator_set_voltage (hsusb_1p8,USB_PHY_1P8_VOL_MIN , +USB_PHY_1P8_VOL_MAX ); +if (rc) { +dev_err (motg->otg.dev,"unable to set voltage level for" +"hsusb 1p8\n" ); + goto put_1p8; + } + rc =regulator_enable (hsusb_1p8); +if (rc) { +dev_err (motg->otg.dev,"unable to enable the hsusb 1p8\n" ); + goto disable_1p8; + } +
Quoted 8 lines
drivers/usb/otg/msm_otg.c line 160
Quoted 6 lines
drivers/usb/otg/msm_otg.c +6
-0+return 0 ; + } + +disable_1p8: +regulator_set_voltage (hsusb_1p8,0 ,USB_PHY_1P8_VOL_MAX ); +regulator_disable (hsusb_1p8);Why call
regualator_disable()ifregulator_enable()has just failed?
Correct. regulator_disable() call is not required.
The error handling here seems to be wrong. We don't need to explicitly call regulator_set_voltage() upon regulator_enable() failure. will fix this in next patch set.
Quoted 10 lines
Quoted 9 lines
drivers/usb/otg/msm_otg.c +8
-0+put_1p8: +regulator_put (hsusb_1p8); +put_3p3_lpm: +regulator_set_voltage (hsusb_3p3,0 ,USB_PHY_3P3_VOL_MAX ); +put_3p3: +regulator_put (hsusb_3p3); +return rc; +}[...]
Quoted 8 lines
drivers/usb/otg/msm_otg.c free_irq: · line 1535
Quoted 5 lines
drivers/usb/otg/msm_otg.c +1
-0@@ -1345,6 +1532,10 @@ free_irq: disable_clks:clk_disable (motg->pclk);clk_disable (motg->clk); +free_ldo_init:'
ldo_exit' perhaps?
sounds good.
Quoted 5 lines
drivers/usb/otg/msm_otg.c free_irq: · line 1537
Quoted 2 lines
drivers/usb/otg/msm_otg.c +2
-0+msm_hsusb_ldo_init (motg,0 ); +free_config_vddcx:'
vddcx_exit' perhaps?
sounds good.
Quoted 6 lines
drivers/usb/otg/msm_otg.c free_irq: · line 1541
Quoted 4 lines
drivers/usb/otg/msm_otg.c +1
-0+msm_hsusb_init_vddcx (motg,0 ); free_regs:iounmap (motg->regs); put_core_clk:WBR, Sergei
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
Hello.
Quoted 23 lines · Pavankumar Kondeti
From: Anji jonnala <[email protected]>
ITC (Interrupt Threshold Control) field is to set the maximum rate at which the device controller will issue interrupts. The maximum interrupt interval is measured in micro frames. Valid values are 0, 1, 2, 4, 8, 16, 32, 64. The default value is 8 micro frames. Set ITC to zero for MSM to gain performance.
Signed-off-by Anji jonnala<[email protected]>Signed-off-by Pavankumar Kondeti<[email protected]>--- drivers/usb/gadget/ci13xxx_msm.c | 3 ++- drivers/usb/gadget/ci13xxx_udc.c | 11 +++++++++++ drivers/usb/gadget/ci13xxx_udc.h | 3 +++ 3 files changed, 16 insertions(+), 1 deletions(-)drivers/usb/gadget/ci13xxx_udc.c +0
-0@@ -318,6 +318,17 @@ static int hw_device_reset(struct ci13xxx *udc)hw_cwrite (CAP_USBMODE ,USBMODE_CM ,USBMODE_CM_DEVICE );hw_cwrite (CAP_USBMODE ,USBMODE_SLOM ,USBMODE_SLOM );/* HW>= 2.3 */
drivers/usb/gadget/ci13xxx_udc.c static int hw_device_reset(struct ci13xxx *udc) · line 329
Quoted 10 lines
drivers/usb/gadget/ci13xxx_udc.c +9
-0+/* +* ITC (Interrupt Threshold Control) field is to set the maximum +* rate at which the device controller will issue interrupts. +* The maximum interrupt interval measured in micro frames. +* Valid values are 0, 1, 2, 4, 8, 16, 32, 64. The default value is +* 8 micro frames. If CPU can handle interrupts at faster rate, ITC +* can be set to lesser value to gain performance. +*/ +if (udc->udc_driver->flags &&CI13XXX_ZERO_ITC )
I think you meant bitwise AND (&) here.
WBR, Sergei
Hi Sergei
Thanks for review.
Quoted 6 lines · Sergei Shtylyov
Hello.
Quoted 1 line · Pavankumar Kondeti
From: Anji jonnala <[email protected]>
<snip>
Quoted 11 lines
drivers/usb/gadget/ci13xxx_udc.c static int hw_device_reset(struct ci13xxx *udc) · line 329
Quoted 9 lines
drivers/usb/gadget/ci13xxx_udc.c +9
-0+/* +* ITC (Interrupt Threshold Control) field is to set the maximum +* rate at which the device controller will issue interrupts. +* The maximum interrupt interval measured in micro frames. +* Valid values are 0, 1, 2, 4, 8, 16, 32, 64. The default value is +* 8 micro frames. If CPU can handle interrupts at faster rate, ITC +* can be set to lesser value to gain performance. +*/ +if (udc->udc_driver->flags &&CI13XXX_ZERO_ITC )I think you meant bitwise AND (&) here.
Yes. I will fix it and resend the patch.
Thanks,
Pavan
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
PATCH v2 5/5 USB: OTG: msm: Add PHY suspend support for MSM8960
In reply to Pavankumar Kondeti--- drivers/usb/otg/msm_otg.c | 64 ++++++++++++++++++++++++++++++++------ include/linux/usb/msm_hsusb_hw.h | 2 + 2 files changed, 56 insertions(+), 10 deletions(-)
drivers/usb/otg/msm_otg.c +54 -10
@@ -167,6 +167,32 @@ put_3p3:return rc; } +#ifdef CONFIG_PM_SLEEP +static int usb_phy_susp_dig_vol =500000 ; +static int msm_hsusb_config_vddcx (int high) +{ +int max_vol =USB_PHY_VDD_DIG_VOL_MAX ; +int min_vol; +int ret; + +if (high) + min_vol =USB_PHY_VDD_DIG_VOL_MIN ; +else + min_vol = usb_phy_susp_dig_vol; + + ret =regulator_set_voltage (hsusb_vddcx, min_vol, max_vol); +if (ret) { +pr_err ("%s: unable to set the voltage for regulator" +"HSUSB_VDDCX\n" , __func__); +return ret; + } + +pr_debug ("%s: min_vol:%d max_vol:%d\n" , __func__, min_vol, max_vol); + +return ret; +} +#endif +static int msm_hsusb_ldo_set_mode (int on) {int ret =0 ;
@@ -438,27 +464,28 @@ static int msm_otg_suspend(struct msm_otg *motg)disable_irq (motg->irq);/* +* Chipidea 45-nm PHY suspend sequence: +* * Interrupt Latch Register auto-clear feature is not present * in all PHY versions. Latch register is clear on read type. * Clear latch register to avoid spurious wakeup from * low power mode (LPM). -*/ -ulpi_read (otg,0x14 ); - -/* +* * PHY comparators are disabled when PHY enters into low power * mode (LPM). Keep PHY comparators ON in LPM only when we expect * VBUS/Id notifications from USB PHY. Otherwise turn off USB * PHY comparators. This save significant amount of power. -*/ -if (pdata->otg_control ==OTG_PHY_CONTROL ) -ulpi_write (otg,0x01 ,0x30 ); - -/* +* * PLL is not turned off when PHY enters into low power mode (LPM). * Disable PLL for maximum power savings. */ -ulpi_write (otg,0x08 ,0x09 ); + +if (motg->pdata->phy_type ==CI_45NM_INTEGRATED_PHY ) { +ulpi_read (otg,0x14 ); +if (pdata->otg_control ==OTG_PHY_CONTROL ) +ulpi_write (otg,0x01 ,0x30 ); +ulpi_write (otg,0x08 ,0x09 ); + }/* * PHY may take some time or even fail to enter into low power
@@ -489,6 +516,10 @@ static int msm_otg_suspend(struct msm_otg *motg)*/ writel (readl (USB_USBCMD ) |ASYNC_INTR_CTRL |ULPI_STP_CTRL ,USB_USBCMD ); +if (motg->pdata->phy_type ==SNPS_28NM_INTEGRATED_PHY && + motg->pdata->phy_type ==OTG_PMIC_CONTROL ) +writel (readl (USB_PHY_CTRL ) |PHY_RETEN ,USB_PHY_CTRL ); +clk_disable (motg->pclk);clk_disable (motg->clk);if (motg->core_clk)
@@ -497,6 +528,12 @@ static int msm_otg_suspend(struct msm_otg *motg)if (!IS_ERR (motg->pclk_src))clk_disable (motg->pclk_src); +if (motg->pdata->phy_type ==SNPS_28NM_INTEGRATED_PHY && + motg->pdata->phy_type ==OTG_PMIC_CONTROL ) { +msm_hsusb_ldo_enable (0 ); +msm_hsusb_config_vddcx (0 ); + } +if (device_may_wakeup (otg->dev))enable_irq_wake (motg->irq);if (bus)
@@ -527,6 +564,13 @@ static int msm_otg_resume(struct msm_otg *motg)if (motg->core_clk)clk_enable (motg->core_clk); +if (motg->pdata->phy_type ==SNPS_28NM_INTEGRATED_PHY && + motg->pdata->phy_type ==OTG_PMIC_CONTROL ) { +msm_hsusb_ldo_enable (1 ); +msm_hsusb_config_vddcx (1 ); +writel (readl (USB_PHY_CTRL ) & ~PHY_RETEN ,USB_PHY_CTRL ); + } + temp =readl (USB_USBCMD ); temp &= ~ASYNC_INTR_CTRL ; temp &= ~ULPI_STP_CTRL ;
include/linux/usb/msm_hsusb_hw.h +2 -0
@@ -24,6 +24,7 @@#define USB_PORTSC (MSM_USB_BASE + 0x0184)#define USB_OTGSC (MSM_USB_BASE + 0x01A4)#define USB_USBMODE (MSM_USB_BASE + 0x01A8) +#define USB_PHY_CTRL (MSM_USB_BASE + 0x0240)#define USBCMD_RESET 2#define USB_USBINTR (MSM_USB_BASE + 0x0148)
@@ -42,6 +43,7 @@#define ASYNC_INTR_CTRL (1 << 29)/* Enable async interrupt */ #define ULPI_STP_CTRL (1 << 30)/* Block communication with PHY */ +#define PHY_RETEN (1 << 1)/* PHY retention enable/disable */ /* OTG definitions */ #define OTGSC_INTSTS_MASK (0x7f << 16)
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
Re: [PATCH 5/5] USB: OTG: msm: Add PHY suspend support for MSM8960
Hello.
Quoted 1 line · Pavankumar Kondeti
Signed-off-by Pavankumar Kondeti <[email protected]>
[...]
drivers/usb/otg/msm_otg.c put_3p3: · line 171
Quoted 10 lines
drivers/usb/otg/msm_otg.c +2
-0@@ -167,6 +167,32 @@ put_3p3:return rc; } +#ifdef CONFIG_PM_SLEEP +static int usb_phy_susp_dig_vol =500000 ;
What's the point of making this variable? It doesn't seem to be changed
anywhere...
drivers/usb/otg/msm_otg.c static int msm_otg_suspend(struct msm_otg *motg) · line 520
Quoted 6 lines
drivers/usb/otg/msm_otg.c +2
-0@@ -489,6 +516,10 @@ static int msm_otg_suspend(struct msm_otg *motg)*/ writel (readl (USB_USBCMD ) |ASYNC_INTR_CTRL |ULPI_STP_CTRL ,USB_USBCMD ); +if (motg->pdata->phy_type ==SNPS_28NM_INTEGRATED_PHY && + motg->pdata->phy_type ==OTG_PMIC_CONTROL )
This is never true, I guess. Did you mean || ISO &&?
drivers/usb/otg/msm_otg.c static int msm_otg_suspend(struct msm_otg *motg) · line 532
Quoted 11 lines
drivers/usb/otg/msm_otg.c +4
-0+writel (readl (USB_PHY_CTRL ) |PHY_RETEN ,USB_PHY_CTRL ); +clk_disable (motg->pclk);clk_disable (motg->clk);if (motg->core_clk)@@ -497,6 +528,12 @@ static int msm_otg_suspend(struct msm_otg *motg)if (!IS_ERR (motg->pclk_src))clk_disable (motg->pclk_src); +if (motg->pdata->phy_type ==SNPS_28NM_INTEGRATED_PHY && + motg->pdata->phy_type ==OTG_PMIC_CONTROL ) {
This is never true either...
drivers/usb/otg/msm_otg.c static int msm_otg_resume(struct msm_otg *motg) · line 568
Quoted 13 lines
drivers/usb/otg/msm_otg.c +6
-0+msm_hsusb_ldo_enable (0 ); +msm_hsusb_config_vddcx (0 ); + } +if (device_may_wakeup (otg->dev))enable_irq_wake (motg->irq);if (bus)@@ -527,6 +564,13 @@ static int msm_otg_resume(struct msm_otg *motg)if (motg->core_clk)clk_enable (motg->core_clk); +if (motg->pdata->phy_type ==SNPS_28NM_INTEGRATED_PHY && + motg->pdata->phy_type ==OTG_PMIC_CONTROL ) {
Neither is this one...
WBR, Sergei
Re: [PATCH 5/5] USB: OTG: msm: Add PHY suspend support for MSM8960
Hi Sergei
Thanks for review.
Quoted 15 lines · Sergei Shtylyov
Hello.
Quoted 1 line · Pavankumar Kondeti
Signed-off-by Pavankumar Kondeti <[email protected]>[...]
Quoted 8 lines
drivers/usb/otg/msm_otg.c +0
-0@@ -167,6 +167,32 @@ put_3p3:return rc; }
Quoted 6 lines
drivers/usb/otg/msm_otg.c put_3p3: · line 171
Quoted 2 lines
drivers/usb/otg/msm_otg.c +2
-0+#ifdef CONFIG_PM_SLEEP +static int usb_phy_susp_dig_vol =500000 ;What's the point of making this variable? It doesn't seem to be changed
anywhere...
Correct. I will change it to a macro.
Quoted 9 lines
drivers/usb/otg/msm_otg.c static int msm_otg_suspend(struct msm_otg *motg) · line 520
Quoted 6 lines
drivers/usb/otg/msm_otg.c +2
-0@@ -489,6 +516,10 @@ static int msm_otg_suspend(struct msm_otg *motg)*/ writel (readl (USB_USBCMD ) |ASYNC_INTR_CTRL |ULPI_STP_CTRL ,USB_USBCMD ); +if (motg->pdata->phy_type ==SNPS_28NM_INTEGRATED_PHY && + motg->pdata->phy_type ==OTG_PMIC_CONTROL )This is never true, I guess. Did you mean || ISO &&?
:-(
It should be
if (motg->pdata->phy_type == SNPS_28NM_INTEGRATED_PHY &&
motg->pdata->otg_control == OTG_PMIC_CONTROL)
^^^^^^^^^^^Thanks,
Pavan
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
v2 cover USB Charging, PHY init and suspend support for MSM8960
In reply to Pavankumar KondetiThis patch series adds PHY based charging detection, PHY initialization and suspend support for MSM8960 target.
Changelog
- V2
- logical AND operator is used instead of bitwiese AND for testing flags.
- Fixed error path and label names as per Sergei's comments.
- Fixed a typo mistake (s/phy_type/otg_control) pointed out by Sergei.
- Changed a never-changed-variable into a macro.
Anji jonnala (3):
USB: gadget: Use Zero Interrupt Threshold Control for ci13xxx_msm
USB: OTG: vote for dayatona fabric clock
USB: OTG: msm: Configure PHY Analog and Digital voltage domains
Pavankumar Kondeti (2):
USB: OTG: msm: Implement charger detection
USB: OTG: msm: Add PHY suspend support for MSM8960
drivers/usb/gadget/ci13xxx_msm.c | 3 +- drivers/usb/gadget/ci13xxx_udc.c | 21 ++ drivers/usb/gadget/ci13xxx_udc.h | 3 + drivers/usb/otg/msm_otg.c | 671 +++++++++++++++++++++++++++++++++++++- include/linux/usb/msm_hsusb.h | 79 +++++- include/linux/usb/msm_hsusb_hw.h | 2 + 6 files changed, 758 insertions(+), 21 deletions(-)
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
A message that is not in the archive (sent off-list or not yet received): 1304318192-24374-1-git-send-email-pkondeti-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
PATCH v2 4/5 USB: OTG: msm: Configure PHY Analog and Digital voltage domains
From: Anji jonnala <[email protected]>
--- drivers/usb/otg/msm_otg.c | 190 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 189 insertions(+), 1 deletions(-)
drivers/usb/otg/msm_otg.c +189 -1
@@ -38,6 +38,7 @@#include <linux/usb/hcd.h> #include <linux/usb/msm_hsusb.h> #include <linux/usb/msm_hsusb_hw.h> +#include <linux/regulator/consumer.h> #include <mach/clk.h>
@@ -45,6 +46,171 @@#define DRIVER_NAME "msm_otg"#define ULPI_IO_TIMEOUT_USEC (10 * 1000) + +#define USB_PHY_3P3_VOL_MIN 3050000/* uV */ +#define USB_PHY_3P3_VOL_MAX 3300000/* uV */ +#define USB_PHY_3P3_HPM_LOAD 50000/* uA */ +#define USB_PHY_3P3_LPM_LOAD 4000/* uA */ + +#define USB_PHY_1P8_VOL_MIN 1800000/* uV */ +#define USB_PHY_1P8_VOL_MAX 1800000/* uV */ +#define USB_PHY_1P8_HPM_LOAD 50000/* uA */ +#define USB_PHY_1P8_LPM_LOAD 4000/* uA */ + +#define USB_PHY_VDD_DIG_VOL_MIN 1000000/* uV */ +#define USB_PHY_VDD_DIG_VOL_MAX 1320000/* uV */ + +static struct regulator *hsusb_3p3; +static struct regulator *hsusb_1p8; +static struct regulator *hsusb_vddcx; + +static int msm_hsusb_init_vddcx (struct msm_otg *motg,int init) +{ +int ret =0 ; + +if (init) { + hsusb_vddcx =regulator_get (motg->otg.dev,"HSUSB_VDDCX" ); +if (IS_ERR (hsusb_vddcx)) { +dev_err (motg->otg.dev,"unable to get hsusb vddcx\n" ); +return PTR_ERR (hsusb_vddcx); + } + + ret =regulator_set_voltage (hsusb_vddcx, +USB_PHY_VDD_DIG_VOL_MIN , +USB_PHY_VDD_DIG_VOL_MAX ); +if (ret) { +dev_err (motg->otg.dev,"unable to set the voltage" +"for hsusb vddcx\n" ); +regulator_put (hsusb_vddcx); +return ret; + } + + ret =regulator_enable (hsusb_vddcx); +if (ret) { +dev_err (motg->otg.dev,"unable to enable hsusb vddcx\n" ); +regulator_put (hsusb_vddcx); + } + }else { + ret =regulator_set_voltage (hsusb_vddcx,0 , +USB_PHY_VDD_DIG_VOL_MIN ); +if (ret) { +dev_err (motg->otg.dev,"unable to set the voltage" +"for hsusb vddcx\n" ); +return ret; + } + ret =regulator_disable (hsusb_vddcx); +if (ret) +dev_err (motg->otg.dev,"unable to disable hsusb vddcx\n" ); + +regulator_put (hsusb_vddcx); + } + +return ret; +} + +static int msm_hsusb_ldo_init (struct msm_otg *motg,int init) +{ +int rc =0 ; + +if (init) { + hsusb_3p3 =regulator_get (motg->otg.dev,"HSUSB_3p3" ); +if (IS_ERR (hsusb_3p3)) { +dev_err (motg->otg.dev,"unable to get hsusb 3p3\n" ); +return PTR_ERR (hsusb_3p3); + } + + rc =regulator_set_voltage (hsusb_3p3,USB_PHY_3P3_VOL_MIN , +USB_PHY_3P3_VOL_MAX ); +if (rc) { +dev_err (motg->otg.dev,"unable to set voltage level for" +"hsusb 3p3\n" ); + goto put_3p3; + } + rc =regulator_enable (hsusb_3p3); +if (rc) { +dev_err (motg->otg.dev,"unable to enable the hsusb 3p3\n" ); + goto put_3p3; + } + hsusb_1p8 =regulator_get (motg->otg.dev,"HSUSB_1p8" ); +if (IS_ERR (hsusb_1p8)) { +dev_err (motg->otg.dev,"unable to get hsusb 1p8\n" ); + rc =PTR_ERR (hsusb_1p8); + goto disable_3p3; + } + rc =regulator_set_voltage (hsusb_1p8,USB_PHY_1P8_VOL_MIN , +USB_PHY_1P8_VOL_MAX ); +if (rc) { +dev_err (motg->otg.dev,"unable to set voltage level for" +"hsusb 1p8\n" ); + goto put_1p8; + } + rc =regulator_enable (hsusb_1p8); +if (rc) { +dev_err (motg->otg.dev,"unable to enable the hsusb 1p8\n" ); + goto put_1p8; + } + +return 0 ; + } + +regulator_disable (hsusb_1p8); +put_1p8: +regulator_put (hsusb_1p8); +disable_3p3: +regulator_disable (hsusb_3p3); +put_3p3: +regulator_put (hsusb_3p3); +return rc; +} + +static int msm_hsusb_ldo_set_mode (int on) +{ +int ret =0 ; + +if (!hsusb_1p8 ||IS_ERR (hsusb_1p8)) { +pr_err ("%s: HSUSB_1p8 is not initialized\n" , __func__); +return -ENODEV ; + } + +if (!hsusb_3p3 ||IS_ERR (hsusb_3p3)) { +pr_err ("%s: HSUSB_3p3 is not initialized\n" , __func__); +return -ENODEV ; + } + +if (on) { + ret =regulator_set_optimum_mode (hsusb_1p8, +USB_PHY_1P8_HPM_LOAD ); +if (ret <0 ) { +pr_err ("%s: Unable to set HPM of the regulator:" +"HSUSB_1p8\n" , __func__); +return ret; + } + ret =regulator_set_optimum_mode (hsusb_3p3, +USB_PHY_3P3_HPM_LOAD ); +if (ret <0 ) { +pr_err ("%s: Unable to set HPM of the regulator:" +"HSUSB_3p3\n" , __func__); +regulator_set_optimum_mode (hsusb_1p8, +USB_PHY_1P8_LPM_LOAD ); +return ret; + } + }else { + ret =regulator_set_optimum_mode (hsusb_1p8, +USB_PHY_1P8_LPM_LOAD ); +if (ret <0 ) +pr_err ("%s: Unable to set LPM of the regulator:" +"HSUSB_1p8\n" , __func__); + ret =regulator_set_optimum_mode (hsusb_3p3, +USB_PHY_3P3_LPM_LOAD ); +if (ret <0 ) +pr_err ("%s: Unable to set LPM of the regulator:" +"HSUSB_3p3\n" , __func__); + } + +pr_debug ("reg (%s)\n" , on ?"HPM" :"LPM" ); +return ret <0 ? ret :0 ; +} +static int ulpi_read (struct otg_transceiver *otg,u32 reg) { struct msm_otg *motg = container_of(otg, struct msm_otg, otg);
@@ -353,7 +519,6 @@ static int msm_otg_resume(struct msm_otg *motg)if (!IS_ERR (motg->pclk_src))clk_enable (motg->pclk_src); -clk_enable (motg->pclk);clk_enable (motg->clk);if (motg->core_clk)clk_enable (motg->core_clk);
@@ -1297,6 +1462,24 @@ static int __init msm_otg_probe(struct platform_device *pdev)clk_enable (motg->clk);clk_enable (motg->pclk); + + ret =msm_hsusb_init_vddcx (motg,1 ); +if (ret) { +dev_err (&pdev->dev,"hsusb vddcx configuration failed\n" ); + goto free_regs; + } + + ret =msm_hsusb_ldo_init (motg,1 ); +if (ret) { +dev_err (&pdev->dev,"hsusb vreg configuration failed\n" ); + goto vddcx_exit; + } + ret =msm_hsusb_ldo_set_mode (1 ); +if (ret) { +dev_err (&pdev->dev,"hsusb vreg enable failed\n" ); + goto ldo_exit; + } +if (motg->core_clk)clk_enable (motg->core_clk);
@@ -1345,6 +1528,10 @@ free_irq: disable_clks:clk_disable (motg->pclk);clk_disable (motg->clk); +ldo_exit: +msm_hsusb_ldo_init (motg,0 ); +vddcx_exit: +msm_hsusb_init_vddcx (motg,0 ); free_regs:iounmap (motg->regs); put_core_clk:
@@ -1409,6 +1596,7 @@ static int __devexit msm_otg_remove(struct platform_device *pdev)clk_disable (motg->pclk_src);clk_put (motg->pclk_src); } +msm_hsusb_ldo_init (motg,0 );iounmap (motg->regs);pm_runtime_set_suspended (&pdev->dev);
Signature · 7 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 1/5 USB: gadget: Use Zero Interrupt Threshold Control for ci13xxx_msm
In reply to Pavankumar KondetiFrom: Anji jonnala <[email protected]>
ITC (Interrupt Threshold Control) field is to set the maximum rate at which the device controller will issue interrupts. The maximum interrupt interval is measured in micro frames. Valid values are 0, 1, 2, 4, 8, 16, 32, 64. The default value is 8 micro frames. Set ITC to zero for MSM to gain performance.
--- drivers/usb/gadget/ci13xxx_msm.c | 3 ++- drivers/usb/gadget/ci13xxx_udc.c | 11 +++++++++++ drivers/usb/gadget/ci13xxx_udc.h | 3 +++ 3 files changed, 16 insertions(+), 1 deletions(-)
drivers/usb/gadget/ci13xxx_msm.c +2 -1
@@ -64,7 +64,8 @@ static struct ci13xxx_udc_driver ci13xxx_msm_udc_driver = { .flags = CI13XXX_REGS_SHARED |CI13XXX_REQUIRE_TRANSCEIVER |CI13XXX_PULLUP_ON_VBUS | - CI13XXX_DISABLE_STREAMING, +CI13XXX_DISABLE_STREAMING | + CI13XXX_ZERO_ITC, .notify_event = ci13xxx_msm_notify_event, };
drivers/usb/gadget/ci13xxx_udc.c +11 -0
@@ -318,6 +318,17 @@ static int hw_device_reset(struct ci13xxx *udc)hw_cwrite (CAP_USBMODE ,USBMODE_CM ,USBMODE_CM_DEVICE );hw_cwrite (CAP_USBMODE ,USBMODE_SLOM ,USBMODE_SLOM );/* HW >= 2.3 */ +/* +* ITC (Interrupt Threshold Control) field is to set the maximum +* rate at which the device controller will issue interrupts. +* The maximum interrupt interval measured in micro frames. +* Valid values are 0, 1, 2, 4, 8, 16, 32, 64. The default value is +* 8 micro frames. If CPU can handle interrupts at faster rate, ITC +* can be set to lesser value to gain performance. +*/ +if (udc->udc_driver->flags &CI13XXX_ZERO_ITC ) +hw_cwrite (CAP_USBCMD ,USBCMD_ITC_MASK ,USBCMD_ITC (0 )); +if (hw_cread (CAP_USBMODE ,USBMODE_CM ) !=USBMODE_CM_DEVICE ) {pr_err ("cannot enter in device mode" );pr_err ("lpm = %i" , hw_bank.lpm);
drivers/usb/gadget/ci13xxx_udc.h +3 -0
@@ -108,6 +108,7 @@ struct ci13xxx_udc_driver {#define CI13XXX_REQUIRE_TRANSCEIVER BIT(1)#define CI13XXX_PULLUP_ON_VBUS BIT(2)#define CI13XXX_DISABLE_STREAMING BIT(3) +#define CI13XXX_ZERO_ITC BIT(4)#define CI13XXX_CONTROLLER_RESET_EVENT 0#define CI13XXX_CONTROLLER_STOPPED_EVENT 1
@@ -189,6 +190,8 @@ struct ci13xxx {#define USBMODE_CM_HOST (0x03UL << 0)#define USBMODE_SLOM BIT(3)#define USBMODE_SDIS BIT(4) +#define USBCMD_ITC (n) (n << 16)/* n = 0, 1, 2, 4, 8, 16, 32, 64 */ +#define USBCMD_ITC_MASK (0xFF << 16)/* ENDPTCTRL */ #define ENDPTCTRL_RXS BIT(0)
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
PATCH v2 2/5 USB: OTG: vote for dayatona fabric clock
In reply to Pavankumar KondetiFrom: Anji jonnala <[email protected]>
HSUSB core clock is derived from daytona fabric clock and for HSUSB operational require minimum core clock at 55MHz. Since, HSUSB cannot tolerate daytona fabric clock change in the middle of HSUSB operational, vote for maximum Daytona fabric clock
while usb is operational
--- drivers/usb/otg/msm_otg.c | 37 +++++++++++++++++++++++++++++++++++-- include/linux/usb/msm_hsusb.h | 7 +++++-- 2 files changed, 40 insertions(+), 4 deletions(-)
drivers/usb/otg/msm_otg.c +35 -2
@@ -324,6 +324,9 @@ static int msm_otg_suspend(struct msm_otg *motg)if (motg->core_clk)clk_disable (motg->core_clk); +if (!IS_ERR (motg->pclk_src)) +clk_disable (motg->pclk_src); +if (device_may_wakeup (otg->dev))enable_irq_wake (motg->irq);if (bus)
@@ -347,6 +350,9 @@ static int msm_otg_resume(struct msm_otg *motg)if (!atomic_read (&motg->in_lpm))return 0 ; +if (!IS_ERR (motg->pclk_src)) +clk_enable (motg->pclk_src); +clk_enable (motg->pclk);clk_enable (motg->clk);if (motg->core_clk)
@@ -862,12 +868,31 @@ static int __init msm_otg_probe(struct platform_device *pdev) ret =PTR_ERR (motg->clk); goto put_phy_reset_clk; } +clk_set_rate (motg->clk,60000000 ); + +/* +* If USB Core is running its protocol engine based on CORE CLK, +* CORE CLK must be running at >55Mhz for correct HSUSB +* operation and USB core cannot tolerate frequency changes on +* CORE CLK. For such USB cores, vote for maximum clk frequency +* on pclk source +*/ +if (motg->pdata->pclk_src_name) { + motg->pclk_src =clk_get (&pdev->dev, + motg->pdata->pclk_src_name); +if (IS_ERR (motg->pclk_src)) + goto put_clk; +clk_set_rate (motg->pclk_src,INT_MAX ); +clk_enable (motg->pclk_src); + }else + motg->pclk_src =ERR_PTR (-ENOENT ); + motg->pclk =clk_get (&pdev->dev,"usb_hs_pclk" );if (IS_ERR (motg->pclk)) {dev_err (&pdev->dev,"failed to get usb_hs_pclk\n" ); ret =PTR_ERR (motg->pclk); - goto put_clk; + goto put_pclk_src; }/*
@@ -954,7 +979,11 @@ free_regs: put_core_clk:if (motg->core_clk)clk_put (motg->core_clk); -clk_put (motg->pclk); +put_pclk_src: +if (!IS_ERR (motg->pclk_src)) { +clk_disable (motg->pclk_src); +clk_put (motg->pclk_src); + } put_clk:clk_put (motg->clk); put_phy_reset_clk:
@@ -1004,6 +1033,10 @@ static int __devexit msm_otg_remove(struct platform_device *pdev)clk_disable (motg->clk);if (motg->core_clk)clk_disable (motg->core_clk); +if (!IS_ERR (motg->pclk_src)) { +clk_disable (motg->pclk_src); +clk_put (motg->pclk_src); + }iounmap (motg->regs);pm_runtime_set_suspended (&pdev->dev);
include/linux/usb/msm_hsusb.h +5 -2
@@ -64,7 +64,8 @@ enum otg_control_type {* @otg_control: OTG switch controlled by user/Id pin * @default_mode: Default operational mode. Applicable only if * OTG switch is controller by user. -* +* @pclk_src_name: pclk is derived from ebi1_usb_clk in case of 7x27 and 8k +* dfab_usb_hs_clk in case of 8660 and 8960. */ struct msm_otg_platform_data {int *phy_init_seq;
@@ -74,6 +75,7 @@ struct msm_otg_platform_data {enum otg_control_type otg_control;enum usb_mode_type default_mode;void (*setup_gpio)(enum usb_otg_state state); +char *pclk_src_name; };/**
@@ -83,6 +85,7 @@ struct msm_otg_platform_data {* @irq: IRQ number assigned for HSUSB controller. * @clk: clock struct of usb_hs_clk. * @pclk: clock struct of usb_hs_pclk. +* @pclk_src: pclk source for voting. * @phy_reset_clk: clock struct of usb_phy_clk. * @core_clk: clock struct of usb_hs_core_clk. * @regs: ioremapped register base address.
@@ -90,7 +93,6 @@ struct msm_otg_platform_data {* @sm_work: OTG state machine work. * @in_lpm: indicates low power mode (LPM) state. * @async_int: Async interrupt arrived. -* */ struct msm_otg {struct otg_transceiver otg;
@@ -98,6 +100,7 @@ struct msm_otg {int irq;struct clk *clk;struct clk *pclk; +struct clk *pclk_src;struct clk *phy_reset_clk;struct clk *core_clk;void __iomem *regs;
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
PATCH v2 3/5 USB: OTG: msm: Implement charger detection
In reply to Pavankumar KondetiImplement good battery algorithm defined in the battery charging V1.2 spec for detecting different charging ports. USB hardware is put into low power mode when connected to a dedicated charging port. vbus_draw and set_power methods are implemented for determining the allowed current from Host in different states (un-configured/suspend/configured).
The charger block is implemented using vendor specific registers and the PHY used in MSM8960(28nm PHY) different from older targets like MSM8x60 and MSM7x30(45nm PHY). The PHY vendor and product id registers are not implemented in the above chipsets. Hence PHY type is passed via platform data.
--- drivers/usb/gadget/ci13xxx_udc.c | 10 + drivers/usb/otg/msm_otg.c | 380 +++++++++++++++++++++++++++++++++++++- include/linux/usb/msm_hsusb.h | 72 +++++++- 3 files changed, 457 insertions(+), 5 deletions(-)
drivers/usb/gadget/ci13xxx_udc.c +10 -0
@@ -2508,6 +2508,15 @@ out:return ret; } +static int ci13xxx_vbus_draw (struct usb_gadget *_gadget,unsigned mA) +{ + struct ci13xxx *udc = container_of(_gadget, struct ci13xxx, gadget); + +if (udc->transceiver) +return otg_set_power (udc->transceiver, mA); +return -ENOTSUPP ; +} +/** * Device operations part of the API to the USB controller hardware, * which don't involve endpoints (or i/o)
@@ -2516,6 +2525,7 @@ out:static const struct usb_gadget_ops usb_gadget_ops = { .vbus_session = ci13xxx_vbus_session, .wakeup = ci13xxx_wakeup, + .vbus_draw = ci13xxx_vbus_draw, };/**
drivers/usb/otg/msm_otg.c +376 -4
426 lines not on this page · raw message
include/linux/usb/msm_hsusb.h +71 -1
102 lines not on this page · raw message
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
PATCH v2 5/5 USB: OTG: msm: Add PHY suspend support for MSM8960
In reply to Pavankumar Kondeti--- drivers/usb/otg/msm_otg.c | 64 ++++++++++++++++++++++++++++++++------ include/linux/usb/msm_hsusb_hw.h | 2 + 2 files changed, 56 insertions(+), 10 deletions(-)
drivers/usb/otg/msm_otg.c +54 -10
@@ -163,6 +163,32 @@ put_3p3:return rc; } +#ifdef CONFIG_PM_SLEEP +#define USB_PHY_SUSP_DIG_VOL 500000 +static int msm_hsusb_config_vddcx (int high) +{ +int max_vol =USB_PHY_VDD_DIG_VOL_MAX ; +int min_vol; +int ret; + +if (high) + min_vol =USB_PHY_VDD_DIG_VOL_MIN ; +else + min_vol =USB_PHY_SUSP_DIG_VOL ; + + ret =regulator_set_voltage (hsusb_vddcx, min_vol, max_vol); +if (ret) { +pr_err ("%s: unable to set the voltage for regulator" +"HSUSB_VDDCX\n" , __func__); +return ret; + } + +pr_debug ("%s: min_vol:%d max_vol:%d\n" , __func__, min_vol, max_vol); + +return ret; +} +#endif +static int msm_hsusb_ldo_set_mode (int on) {int ret =0 ;
@@ -434,27 +460,28 @@ static int msm_otg_suspend(struct msm_otg *motg)disable_irq (motg->irq);/* +* Chipidea 45-nm PHY suspend sequence: +* * Interrupt Latch Register auto-clear feature is not present * in all PHY versions. Latch register is clear on read type. * Clear latch register to avoid spurious wakeup from * low power mode (LPM). -*/ -ulpi_read (otg,0x14 ); - -/* +* * PHY comparators are disabled when PHY enters into low power * mode (LPM). Keep PHY comparators ON in LPM only when we expect * VBUS/Id notifications from USB PHY. Otherwise turn off USB * PHY comparators. This save significant amount of power. -*/ -if (pdata->otg_control ==OTG_PHY_CONTROL ) -ulpi_write (otg,0x01 ,0x30 ); - -/* +* * PLL is not turned off when PHY enters into low power mode (LPM). * Disable PLL for maximum power savings. */ -ulpi_write (otg,0x08 ,0x09 ); + +if (motg->pdata->phy_type ==CI_45NM_INTEGRATED_PHY ) { +ulpi_read (otg,0x14 ); +if (pdata->otg_control ==OTG_PHY_CONTROL ) +ulpi_write (otg,0x01 ,0x30 ); +ulpi_write (otg,0x08 ,0x09 ); + }/* * PHY may take some time or even fail to enter into low power
@@ -485,6 +512,10 @@ static int msm_otg_suspend(struct msm_otg *motg)*/ writel (readl (USB_USBCMD ) |ASYNC_INTR_CTRL |ULPI_STP_CTRL ,USB_USBCMD ); +if (motg->pdata->phy_type ==SNPS_28NM_INTEGRATED_PHY && + motg->pdata->otg_control ==OTG_PMIC_CONTROL ) +writel (readl (USB_PHY_CTRL ) |PHY_RETEN ,USB_PHY_CTRL ); +clk_disable (motg->pclk);clk_disable (motg->clk);if (motg->core_clk)
@@ -493,6 +524,12 @@ static int msm_otg_suspend(struct msm_otg *motg)if (!IS_ERR (motg->pclk_src))clk_disable (motg->pclk_src); +if (motg->pdata->phy_type ==SNPS_28NM_INTEGRATED_PHY && + motg->pdata->otg_control ==OTG_PMIC_CONTROL ) { +msm_hsusb_ldo_set_mode (0 ); +msm_hsusb_config_vddcx (0 ); + } +if (device_may_wakeup (otg->dev))enable_irq_wake (motg->irq);if (bus)
@@ -523,6 +560,13 @@ static int msm_otg_resume(struct msm_otg *motg)if (motg->core_clk)clk_enable (motg->core_clk); +if (motg->pdata->phy_type ==SNPS_28NM_INTEGRATED_PHY && + motg->pdata->otg_control ==OTG_PMIC_CONTROL ) { +msm_hsusb_ldo_set_mode (1 ); +msm_hsusb_config_vddcx (1 ); +writel (readl (USB_PHY_CTRL ) & ~PHY_RETEN ,USB_PHY_CTRL ); + } + temp =readl (USB_USBCMD ); temp &= ~ASYNC_INTR_CTRL ; temp &= ~ULPI_STP_CTRL ;
include/linux/usb/msm_hsusb_hw.h +2 -0
@@ -24,6 +24,7 @@#define USB_PORTSC (MSM_USB_BASE + 0x0184)#define USB_OTGSC (MSM_USB_BASE + 0x01A4)#define USB_USBMODE (MSM_USB_BASE + 0x01A8) +#define USB_PHY_CTRL (MSM_USB_BASE + 0x0240)#define USBCMD_RESET 2#define USB_USBINTR (MSM_USB_BASE + 0x0148)
@@ -42,6 +43,7 @@#define ASYNC_INTR_CTRL (1 << 29)/* Enable async interrupt */ #define ULPI_STP_CTRL (1 << 30)/* Block communication with PHY */ +#define PHY_RETEN (1 << 1)/* PHY retention enable/disable */ /* OTG definitions */ #define OTGSC_INTSTS_MASK (0x7f << 16)
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
Re: [PATCH V2 5/5] USB: OTG: msm: Add PHY suspend support for MSM8960
Hello.
Quoted 1 line · Pavankumar Kondeti
Signed-off-by Pavankumar Kondeti<[email protected]>
[...]
Quoted 14 lines
drivers/usb/otg/msm_otg.c +6
-0@@ -163,6 +163,32 @@ put_3p3:return rc; } +#ifdef CONFIG_PM_SLEEP +#define USB_PHY_SUSP_DIG_VOL 500000 +static int msm_hsusb_config_vddcx (int high) +{ +int max_vol =USB_PHY_VDD_DIG_VOL_MAX ; +int min_vol;
drivers/usb/otg/msm_otg.c put_3p3: · line 181
Quoted 10 lines
drivers/usb/otg/msm_otg.c +10
-0+int ret; + +if (high) + min_vol =USB_PHY_VDD_DIG_VOL_MIN ; +else + min_vol =USB_PHY_SUSP_DIG_VOL ; + + ret =regulator_set_voltage (hsusb_vddcx, min_vol, max_vol); +if (ret) { + pr_err("%s: unable to set the voltage for regulator"
You missed space after "regulator"...
drivers/usb/otg/msm_otg.c put_3p3: · line 185
Quoted 4 lines
drivers/usb/otg/msm_otg.c +4
-0+ "HSUSB_VDDCX\n", __func__); +return ret; + } +
[...]
WBR, Sergei
Re: [PATCH V2 5/5] USB: OTG: msm: Add PHY suspend support for MSM8960
Quoted 25 lines · Sergei Shtylyov
Hello.
Quoted 1 line · Pavankumar Kondeti
Signed-off-by Pavankumar Kondeti<[email protected]>[...]
Quoted 18 lines
drivers/usb/otg/msm_otg.c +10
-0@@ -163,6 +163,32 @@ put_3p3:return rc; } +#ifdef CONFIG_PM_SLEEP +#define USB_PHY_SUSP_DIG_VOL 500000 +static int msm_hsusb_config_vddcx (int high) +{ +int max_vol =USB_PHY_VDD_DIG_VOL_MAX ; +int min_vol; +int ret; + +if (high) + min_vol =USB_PHY_VDD_DIG_VOL_MIN ;
Quoted 8 lines
drivers/usb/otg/msm_otg.c put_3p3: · line 181
Quoted 6 lines
drivers/usb/otg/msm_otg.c +6
-0+else + min_vol =USB_PHY_SUSP_DIG_VOL ; + + ret =regulator_set_voltage (hsusb_vddcx, min_vol, max_vol); +if (ret) { + pr_err("%s: unable to set the voltage for regulator"You missed space after "regulator"...
Thanks for pointing this out. The other patch (USB: OTG: msm: Configure PHY Analog and Digital voltage domains) also has missed spaces. I will fix it in next patch set.
Quoted 8 lines
drivers/usb/otg/msm_otg.c put_3p3: · line 185
Quoted 5 lines
drivers/usb/otg/msm_otg.c +4
-0+ "HSUSB_VDDCX\n", __func__); +return ret; + } +[...]
WBR, Sergei
Thanks,
Pavan
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
A message that is not in the archive (sent off-list or not yet received): 1303977693-18389-1-git-send-email-pkondeti-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
v3 cover USB Charging, PHY init and suspend support for MSM8960
This patch series adds PHY based charging detection, PHY initialization and suspend support for MSM8960 target.
Changelog
- V3
- The third patch in this series unknowingly turning off pclk in resume. Fix
it.
- add "msm" in commit prefix for 2nd patch.
- V2
- logical AND operator is used instead of bitwiese AND for testing flags.
- Fixed error path and label names as per Sergei's comments.
- Fixed a typo mistake (s/phy_type/otg_control) pointed out by Sergei.
- Changed a never-changed-variable into a macro.
Anji jonnala (3):
USB: gadget: Use Zero Interrupt Threshold Control for ci13xxx_msm
USB: OTG: msm: vote for dayatona fabric clock
USB: OTG: msm: Configure PHY Analog and Digital voltage domains
Pavankumar Kondeti (2):
USB: OTG: msm: Implement charger detection
USB: OTG: msm: Add PHY suspend support for MSM8960
drivers/usb/gadget/ci13xxx_msm.c | 3 +- drivers/usb/gadget/ci13xxx_udc.c | 21 ++ drivers/usb/gadget/ci13xxx_udc.h | 3 + drivers/usb/otg/msm_otg.c | 670 +++++++++++++++++++++++++++++++++++++- include/linux/usb/msm_hsusb.h | 79 +++++- include/linux/usb/msm_hsusb_hw.h | 2 + 6 files changed, 758 insertions(+), 20 deletions(-)
Signature · 7 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 1304330325-21982-1-git-send-email-pkondeti-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
PATCH v3 1/5 USB: gadget: Use Zero Interrupt Threshold Control for ci13xxx_msm
From: Anji jonnala <[email protected]>
ITC (Interrupt Threshold Control) field is to set the maximum rate at which the device controller will issue interrupts. The maximum interrupt interval is measured in micro frames. Valid values are 0, 1, 2, 4, 8, 16, 32, 64. The default value is 8 micro frames. Set ITC to zero for MSM to gain performance.
--- drivers/usb/gadget/ci13xxx_msm.c | 3 ++- drivers/usb/gadget/ci13xxx_udc.c | 11 +++++++++++ drivers/usb/gadget/ci13xxx_udc.h | 3 +++ 3 files changed, 16 insertions(+), 1 deletions(-)
drivers/usb/gadget/ci13xxx_msm.c +2 -1
@@ -64,7 +64,8 @@ static struct ci13xxx_udc_driver ci13xxx_msm_udc_driver = { .flags = CI13XXX_REGS_SHARED |CI13XXX_REQUIRE_TRANSCEIVER |CI13XXX_PULLUP_ON_VBUS | - CI13XXX_DISABLE_STREAMING, +CI13XXX_DISABLE_STREAMING | + CI13XXX_ZERO_ITC, .notify_event = ci13xxx_msm_notify_event, };
drivers/usb/gadget/ci13xxx_udc.c +11 -0
@@ -318,6 +318,17 @@ static int hw_device_reset(struct ci13xxx *udc)hw_cwrite (CAP_USBMODE ,USBMODE_CM ,USBMODE_CM_DEVICE );hw_cwrite (CAP_USBMODE ,USBMODE_SLOM ,USBMODE_SLOM );/* HW >= 2.3 */ +/* +* ITC (Interrupt Threshold Control) field is to set the maximum +* rate at which the device controller will issue interrupts. +* The maximum interrupt interval measured in micro frames. +* Valid values are 0, 1, 2, 4, 8, 16, 32, 64. The default value is +* 8 micro frames. If CPU can handle interrupts at faster rate, ITC +* can be set to lesser value to gain performance. +*/ +if (udc->udc_driver->flags &CI13XXX_ZERO_ITC ) +hw_cwrite (CAP_USBCMD ,USBCMD_ITC_MASK ,USBCMD_ITC (0 )); +if (hw_cread (CAP_USBMODE ,USBMODE_CM ) !=USBMODE_CM_DEVICE ) {pr_err ("cannot enter in device mode" );pr_err ("lpm = %i" , hw_bank.lpm);
drivers/usb/gadget/ci13xxx_udc.h +3 -0
@@ -108,6 +108,7 @@ struct ci13xxx_udc_driver {#define CI13XXX_REQUIRE_TRANSCEIVER BIT(1)#define CI13XXX_PULLUP_ON_VBUS BIT(2)#define CI13XXX_DISABLE_STREAMING BIT(3) +#define CI13XXX_ZERO_ITC BIT(4)#define CI13XXX_CONTROLLER_RESET_EVENT 0#define CI13XXX_CONTROLLER_STOPPED_EVENT 1
@@ -189,6 +190,8 @@ struct ci13xxx {#define USBMODE_CM_HOST (0x03UL << 0)#define USBMODE_SLOM BIT(3)#define USBMODE_SDIS BIT(4) +#define USBCMD_ITC (n) (n << 16)/* n = 0, 1, 2, 4, 8, 16, 32, 64 */ +#define USBCMD_ITC_MASK (0xFF << 16)/* ENDPTCTRL */ #define ENDPTCTRL_RXS BIT(0)
Signature · 7 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v3 2/5 USB: OTG: msm: vote for dayatona fabric clock
In reply to a message not in the archiveFrom: Anji jonnala <[email protected]>
HSUSB core clock is derived from daytona fabric clock and for HSUSB operational require minimum core clock at 55MHz. Since, HSUSB cannot tolerate daytona fabric clock change in the middle of HSUSB operational, vote for maximum Daytona fabric clock
while usb is operational
--- drivers/usb/otg/msm_otg.c | 37 +++++++++++++++++++++++++++++++++++-- include/linux/usb/msm_hsusb.h | 7 +++++-- 2 files changed, 40 insertions(+), 4 deletions(-)
drivers/usb/otg/msm_otg.c +35 -2
@@ -324,6 +324,9 @@ static int msm_otg_suspend(struct msm_otg *motg)if (motg->core_clk)clk_disable (motg->core_clk); +if (!IS_ERR (motg->pclk_src)) +clk_disable (motg->pclk_src); +if (device_may_wakeup (otg->dev))enable_irq_wake (motg->irq);if (bus)
@@ -347,6 +350,9 @@ static int msm_otg_resume(struct msm_otg *motg)if (!atomic_read (&motg->in_lpm))return 0 ; +if (!IS_ERR (motg->pclk_src)) +clk_enable (motg->pclk_src); +clk_enable (motg->pclk);clk_enable (motg->clk);if (motg->core_clk)
@@ -862,12 +868,31 @@ static int __init msm_otg_probe(struct platform_device *pdev) ret =PTR_ERR (motg->clk); goto put_phy_reset_clk; } +clk_set_rate (motg->clk,60000000 ); + +/* +* If USB Core is running its protocol engine based on CORE CLK, +* CORE CLK must be running at >55Mhz for correct HSUSB +* operation and USB core cannot tolerate frequency changes on +* CORE CLK. For such USB cores, vote for maximum clk frequency +* on pclk source +*/ +if (motg->pdata->pclk_src_name) { + motg->pclk_src =clk_get (&pdev->dev, + motg->pdata->pclk_src_name); +if (IS_ERR (motg->pclk_src)) + goto put_clk; +clk_set_rate (motg->pclk_src,INT_MAX ); +clk_enable (motg->pclk_src); + }else + motg->pclk_src =ERR_PTR (-ENOENT ); + motg->pclk =clk_get (&pdev->dev,"usb_hs_pclk" );if (IS_ERR (motg->pclk)) {dev_err (&pdev->dev,"failed to get usb_hs_pclk\n" ); ret =PTR_ERR (motg->pclk); - goto put_clk; + goto put_pclk_src; }/*
@@ -954,7 +979,11 @@ free_regs: put_core_clk:if (motg->core_clk)clk_put (motg->core_clk); -clk_put (motg->pclk); +put_pclk_src: +if (!IS_ERR (motg->pclk_src)) { +clk_disable (motg->pclk_src); +clk_put (motg->pclk_src); + } put_clk:clk_put (motg->clk); put_phy_reset_clk:
@@ -1004,6 +1033,10 @@ static int __devexit msm_otg_remove(struct platform_device *pdev)clk_disable (motg->clk);if (motg->core_clk)clk_disable (motg->core_clk); +if (!IS_ERR (motg->pclk_src)) { +clk_disable (motg->pclk_src); +clk_put (motg->pclk_src); + }iounmap (motg->regs);pm_runtime_set_suspended (&pdev->dev);
include/linux/usb/msm_hsusb.h +5 -2
@@ -64,7 +64,8 @@ enum otg_control_type {* @otg_control: OTG switch controlled by user/Id pin * @default_mode: Default operational mode. Applicable only if * OTG switch is controller by user. -* +* @pclk_src_name: pclk is derived from ebi1_usb_clk in case of 7x27 and 8k +* dfab_usb_hs_clk in case of 8660 and 8960. */ struct msm_otg_platform_data {int *phy_init_seq;
@@ -74,6 +75,7 @@ struct msm_otg_platform_data {enum otg_control_type otg_control;enum usb_mode_type default_mode;void (*setup_gpio)(enum usb_otg_state state); +char *pclk_src_name; };/**
@@ -83,6 +85,7 @@ struct msm_otg_platform_data {* @irq: IRQ number assigned for HSUSB controller. * @clk: clock struct of usb_hs_clk. * @pclk: clock struct of usb_hs_pclk. +* @pclk_src: pclk source for voting. * @phy_reset_clk: clock struct of usb_phy_clk. * @core_clk: clock struct of usb_hs_core_clk. * @regs: ioremapped register base address.
@@ -90,7 +93,6 @@ struct msm_otg_platform_data {* @sm_work: OTG state machine work. * @in_lpm: indicates low power mode (LPM) state. * @async_int: Async interrupt arrived. -* */ struct msm_otg {struct otg_transceiver otg;
@@ -98,6 +100,7 @@ struct msm_otg {int irq;struct clk *clk;struct clk *pclk; +struct clk *pclk_src;struct clk *phy_reset_clk;struct clk *core_clk;void __iomem *regs;
Signature · 7 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v3 3/5 USB: OTG: msm: Implement charger detection
In reply to a message not in the archiveImplement good battery algorithm defined in the battery charging V1.2 spec for detecting different charging ports. USB hardware is put into low power mode when connected to a dedicated charging port. vbus_draw and set_power methods are implemented for determining the allowed current from Host in different states (un-configured/suspend/configured).
The charger block is implemented using vendor specific registers and the PHY used in MSM8960(28nm PHY) different from older targets like MSM8x60 and MSM7x30(45nm PHY). The PHY vendor and product id registers are not implemented in the above chipsets. Hence PHY type is passed via platform data.
--- drivers/usb/gadget/ci13xxx_udc.c | 10 + drivers/usb/otg/msm_otg.c | 380 +++++++++++++++++++++++++++++++++++++- include/linux/usb/msm_hsusb.h | 72 +++++++- 3 files changed, 457 insertions(+), 5 deletions(-)
drivers/usb/gadget/ci13xxx_udc.c +10 -0
@@ -2508,6 +2508,15 @@ out:return ret; } +static int ci13xxx_vbus_draw (struct usb_gadget *_gadget,unsigned mA) +{ + struct ci13xxx *udc = container_of(_gadget, struct ci13xxx, gadget); + +if (udc->transceiver) +return otg_set_power (udc->transceiver, mA); +return -ENOTSUPP ; +} +/** * Device operations part of the API to the USB controller hardware, * which don't involve endpoints (or i/o)
@@ -2516,6 +2525,7 @@ out:static const struct usb_gadget_ops usb_gadget_ops = { .vbus_session = ci13xxx_vbus_session, .wakeup = ci13xxx_wakeup, + .vbus_draw = ci13xxx_vbus_draw, };/**
drivers/usb/otg/msm_otg.c +376 -4
426 lines not on this page · raw message
include/linux/usb/msm_hsusb.h +71 -1
102 lines not on this page · raw message
Signature · 7 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v3 4/5 USB: OTG: msm: Configure PHY Analog and Digital voltage domains
In reply to Pavankumar KondetiFrom: Anji jonnala <[email protected]>
--- drivers/usb/otg/msm_otg.c | 189 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 189 insertions(+), 0 deletions(-)
drivers/usb/otg/msm_otg.c +189 -0
@@ -38,6 +38,7 @@#include <linux/usb/hcd.h> #include <linux/usb/msm_hsusb.h> #include <linux/usb/msm_hsusb_hw.h> +#include <linux/regulator/consumer.h> #include <mach/clk.h>
@@ -45,6 +46,171 @@#define DRIVER_NAME "msm_otg"#define ULPI_IO_TIMEOUT_USEC (10 * 1000) + +#define USB_PHY_3P3_VOL_MIN 3050000/* uV */ +#define USB_PHY_3P3_VOL_MAX 3300000/* uV */ +#define USB_PHY_3P3_HPM_LOAD 50000/* uA */ +#define USB_PHY_3P3_LPM_LOAD 4000/* uA */ + +#define USB_PHY_1P8_VOL_MIN 1800000/* uV */ +#define USB_PHY_1P8_VOL_MAX 1800000/* uV */ +#define USB_PHY_1P8_HPM_LOAD 50000/* uA */ +#define USB_PHY_1P8_LPM_LOAD 4000/* uA */ + +#define USB_PHY_VDD_DIG_VOL_MIN 1000000/* uV */ +#define USB_PHY_VDD_DIG_VOL_MAX 1320000/* uV */ + +static struct regulator *hsusb_3p3; +static struct regulator *hsusb_1p8; +static struct regulator *hsusb_vddcx; + +static int msm_hsusb_init_vddcx (struct msm_otg *motg,int init) +{ +int ret =0 ; + +if (init) { + hsusb_vddcx =regulator_get (motg->otg.dev,"HSUSB_VDDCX" ); +if (IS_ERR (hsusb_vddcx)) { +dev_err (motg->otg.dev,"unable to get hsusb vddcx\n" ); +return PTR_ERR (hsusb_vddcx); + } + + ret =regulator_set_voltage (hsusb_vddcx, +USB_PHY_VDD_DIG_VOL_MIN , +USB_PHY_VDD_DIG_VOL_MAX ); +if (ret) { +dev_err (motg->otg.dev,"unable to set the voltage" +"for hsusb vddcx\n" ); +regulator_put (hsusb_vddcx); +return ret; + } + + ret =regulator_enable (hsusb_vddcx); +if (ret) { +dev_err (motg->otg.dev,"unable to enable hsusb vddcx\n" ); +regulator_put (hsusb_vddcx); + } + }else { + ret =regulator_set_voltage (hsusb_vddcx,0 , +USB_PHY_VDD_DIG_VOL_MIN ); +if (ret) { +dev_err (motg->otg.dev,"unable to set the voltage" +"for hsusb vddcx\n" ); +return ret; + } + ret =regulator_disable (hsusb_vddcx); +if (ret) +dev_err (motg->otg.dev,"unable to disable hsusb vddcx\n" ); + +regulator_put (hsusb_vddcx); + } + +return ret; +} + +static int msm_hsusb_ldo_init (struct msm_otg *motg,int init) +{ +int rc =0 ; + +if (init) { + hsusb_3p3 =regulator_get (motg->otg.dev,"HSUSB_3p3" ); +if (IS_ERR (hsusb_3p3)) { +dev_err (motg->otg.dev,"unable to get hsusb 3p3\n" ); +return PTR_ERR (hsusb_3p3); + } + + rc =regulator_set_voltage (hsusb_3p3,USB_PHY_3P3_VOL_MIN , +USB_PHY_3P3_VOL_MAX ); +if (rc) { +dev_err (motg->otg.dev,"unable to set voltage level for" +"hsusb 3p3\n" ); + goto put_3p3; + } + rc =regulator_enable (hsusb_3p3); +if (rc) { +dev_err (motg->otg.dev,"unable to enable the hsusb 3p3\n" ); + goto put_3p3; + } + hsusb_1p8 =regulator_get (motg->otg.dev,"HSUSB_1p8" ); +if (IS_ERR (hsusb_1p8)) { +dev_err (motg->otg.dev,"unable to get hsusb 1p8\n" ); + rc =PTR_ERR (hsusb_1p8); + goto disable_3p3; + } + rc =regulator_set_voltage (hsusb_1p8,USB_PHY_1P8_VOL_MIN , +USB_PHY_1P8_VOL_MAX ); +if (rc) { +dev_err (motg->otg.dev,"unable to set voltage level for" +"hsusb 1p8\n" ); + goto put_1p8; + } + rc =regulator_enable (hsusb_1p8); +if (rc) { +dev_err (motg->otg.dev,"unable to enable the hsusb 1p8\n" ); + goto put_1p8; + } + +return 0 ; + } + +regulator_disable (hsusb_1p8); +put_1p8: +regulator_put (hsusb_1p8); +disable_3p3: +regulator_disable (hsusb_3p3); +put_3p3: +regulator_put (hsusb_3p3); +return rc; +} + +static int msm_hsusb_ldo_set_mode (int on) +{ +int ret =0 ; + +if (!hsusb_1p8 ||IS_ERR (hsusb_1p8)) { +pr_err ("%s: HSUSB_1p8 is not initialized\n" , __func__); +return -ENODEV ; + } + +if (!hsusb_3p3 ||IS_ERR (hsusb_3p3)) { +pr_err ("%s: HSUSB_3p3 is not initialized\n" , __func__); +return -ENODEV ; + } + +if (on) { + ret =regulator_set_optimum_mode (hsusb_1p8, +USB_PHY_1P8_HPM_LOAD ); +if (ret <0 ) { +pr_err ("%s: Unable to set HPM of the regulator:" +"HSUSB_1p8\n" , __func__); +return ret; + } + ret =regulator_set_optimum_mode (hsusb_3p3, +USB_PHY_3P3_HPM_LOAD ); +if (ret <0 ) { +pr_err ("%s: Unable to set HPM of the regulator:" +"HSUSB_3p3\n" , __func__); +regulator_set_optimum_mode (hsusb_1p8, +USB_PHY_1P8_LPM_LOAD ); +return ret; + } + }else { + ret =regulator_set_optimum_mode (hsusb_1p8, +USB_PHY_1P8_LPM_LOAD ); +if (ret <0 ) +pr_err ("%s: Unable to set LPM of the regulator:" +"HSUSB_1p8\n" , __func__); + ret =regulator_set_optimum_mode (hsusb_3p3, +USB_PHY_3P3_LPM_LOAD ); +if (ret <0 ) +pr_err ("%s: Unable to set LPM of the regulator:" +"HSUSB_3p3\n" , __func__); + } + +pr_debug ("reg (%s)\n" , on ?"HPM" :"LPM" ); +return ret <0 ? ret :0 ; +} +static int ulpi_read (struct otg_transceiver *otg,u32 reg) { struct msm_otg *motg = container_of(otg, struct msm_otg, otg);
@@ -1297,6 +1463,24 @@ static int __init msm_otg_probe(struct platform_device *pdev)clk_enable (motg->clk);clk_enable (motg->pclk); + + ret =msm_hsusb_init_vddcx (motg,1 ); +if (ret) { +dev_err (&pdev->dev,"hsusb vddcx configuration failed\n" ); + goto free_regs; + } + + ret =msm_hsusb_ldo_init (motg,1 ); +if (ret) { +dev_err (&pdev->dev,"hsusb vreg configuration failed\n" ); + goto vddcx_exit; + } + ret =msm_hsusb_ldo_set_mode (1 ); +if (ret) { +dev_err (&pdev->dev,"hsusb vreg enable failed\n" ); + goto ldo_exit; + } +if (motg->core_clk)clk_enable (motg->core_clk);
@@ -1345,6 +1529,10 @@ free_irq: disable_clks:clk_disable (motg->pclk);clk_disable (motg->clk); +ldo_exit: +msm_hsusb_ldo_init (motg,0 ); +vddcx_exit: +msm_hsusb_init_vddcx (motg,0 ); free_regs:iounmap (motg->regs); put_core_clk:
@@ -1409,6 +1597,7 @@ static int __devexit msm_otg_remove(struct platform_device *pdev)clk_disable (motg->pclk_src);clk_put (motg->pclk_src); } +msm_hsusb_ldo_init (motg,0 );iounmap (motg->regs);pm_runtime_set_suspended (&pdev->dev);
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
PATCH v3 5/5 USB: OTG: msm: Add PHY suspend support for MSM8960
In reply to Pavankumar Kondeti--- drivers/usb/otg/msm_otg.c | 64 ++++++++++++++++++++++++++++++++------ include/linux/usb/msm_hsusb_hw.h | 2 + 2 files changed, 56 insertions(+), 10 deletions(-)
drivers/usb/otg/msm_otg.c +54 -10
@@ -163,6 +163,32 @@ put_3p3:return rc; } +#ifdef CONFIG_PM_SLEEP +#define USB_PHY_SUSP_DIG_VOL 500000 +static int msm_hsusb_config_vddcx (int high) +{ +int max_vol =USB_PHY_VDD_DIG_VOL_MAX ; +int min_vol; +int ret; + +if (high) + min_vol =USB_PHY_VDD_DIG_VOL_MIN ; +else + min_vol =USB_PHY_SUSP_DIG_VOL ; + + ret =regulator_set_voltage (hsusb_vddcx, min_vol, max_vol); +if (ret) { +pr_err ("%s: unable to set the voltage for regulator" +"HSUSB_VDDCX\n" , __func__); +return ret; + } + +pr_debug ("%s: min_vol:%d max_vol:%d\n" , __func__, min_vol, max_vol); + +return ret; +} +#endif +static int msm_hsusb_ldo_set_mode (int on) {int ret =0 ;
@@ -434,27 +460,28 @@ static int msm_otg_suspend(struct msm_otg *motg)disable_irq (motg->irq);/* +* Chipidea 45-nm PHY suspend sequence: +* * Interrupt Latch Register auto-clear feature is not present * in all PHY versions. Latch register is clear on read type. * Clear latch register to avoid spurious wakeup from * low power mode (LPM). -*/ -ulpi_read (otg,0x14 ); - -/* +* * PHY comparators are disabled when PHY enters into low power * mode (LPM). Keep PHY comparators ON in LPM only when we expect * VBUS/Id notifications from USB PHY. Otherwise turn off USB * PHY comparators. This save significant amount of power. -*/ -if (pdata->otg_control ==OTG_PHY_CONTROL ) -ulpi_write (otg,0x01 ,0x30 ); - -/* +* * PLL is not turned off when PHY enters into low power mode (LPM). * Disable PLL for maximum power savings. */ -ulpi_write (otg,0x08 ,0x09 ); + +if (motg->pdata->phy_type ==CI_45NM_INTEGRATED_PHY ) { +ulpi_read (otg,0x14 ); +if (pdata->otg_control ==OTG_PHY_CONTROL ) +ulpi_write (otg,0x01 ,0x30 ); +ulpi_write (otg,0x08 ,0x09 ); + }/* * PHY may take some time or even fail to enter into low power
@@ -485,6 +512,10 @@ static int msm_otg_suspend(struct msm_otg *motg)*/ writel (readl (USB_USBCMD ) |ASYNC_INTR_CTRL |ULPI_STP_CTRL ,USB_USBCMD ); +if (motg->pdata->phy_type ==SNPS_28NM_INTEGRATED_PHY && + motg->pdata->otg_control ==OTG_PMIC_CONTROL ) +writel (readl (USB_PHY_CTRL ) |PHY_RETEN ,USB_PHY_CTRL ); +clk_disable (motg->pclk);clk_disable (motg->clk);if (motg->core_clk)
@@ -493,6 +524,12 @@ static int msm_otg_suspend(struct msm_otg *motg)if (!IS_ERR (motg->pclk_src))clk_disable (motg->pclk_src); +if (motg->pdata->phy_type ==SNPS_28NM_INTEGRATED_PHY && + motg->pdata->otg_control ==OTG_PMIC_CONTROL ) { +msm_hsusb_ldo_set_mode (0 ); +msm_hsusb_config_vddcx (0 ); + } +if (device_may_wakeup (otg->dev))enable_irq_wake (motg->irq);if (bus)
@@ -524,6 +561,13 @@ static int msm_otg_resume(struct msm_otg *motg)if (motg->core_clk)clk_enable (motg->core_clk); +if (motg->pdata->phy_type ==SNPS_28NM_INTEGRATED_PHY && + motg->pdata->otg_control ==OTG_PMIC_CONTROL ) { +msm_hsusb_ldo_set_mode (1 ); +msm_hsusb_config_vddcx (1 ); +writel (readl (USB_PHY_CTRL ) & ~PHY_RETEN ,USB_PHY_CTRL ); + } + temp =readl (USB_USBCMD ); temp &= ~ASYNC_INTR_CTRL ; temp &= ~ULPI_STP_CTRL ;
include/linux/usb/msm_hsusb_hw.h +2 -0
@@ -24,6 +24,7 @@#define USB_PORTSC (MSM_USB_BASE + 0x0184)#define USB_OTGSC (MSM_USB_BASE + 0x01A4)#define USB_USBMODE (MSM_USB_BASE + 0x01A8) +#define USB_PHY_CTRL (MSM_USB_BASE + 0x0240)#define USBCMD_RESET 2#define USB_USBINTR (MSM_USB_BASE + 0x0148)
@@ -42,6 +43,7 @@#define ASYNC_INTR_CTRL (1 << 29)/* Enable async interrupt */ #define ULPI_STP_CTRL (1 << 30)/* Block communication with PHY */ +#define PHY_RETEN (1 << 1)/* PHY retention enable/disable */ /* OTG definitions */ #define OTGSC_INTSTS_MASK (0x7f << 16)
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
v4 cover USB Charging, PHY init and suspend support for MSM8960
In reply to Pavankumar KondetiThis patch series adds PHY based charging detection, PHY initialization and suspend support for MSM8960 target.
Changelog
- V4
- Added missing spaces at the end of line for multi line printk messages.
- V3
- The third patch in this series unknowingly turning off pclk in resume. Fix
it.
- add "msm" in commit prefix for 2nd patch.
- V2
- logical AND operator is used instead of bitwiese AND for testing flags.
- Fixed error path and label names as per Sergei's comments.
- Fixed a typo mistake (s/phy_type/otg_control) pointed out by Sergei.
- Changed a never-changed-variable into a macro.
Anji jonnala (3):
USB: gadget: Use Zero Interrupt Threshold Control for ci13xxx_msm
USB: OTG: msm: vote for dayatona fabric clock
USB: OTG: msm: Configure PHY Analog and Digital voltage domains
Pavankumar Kondeti (2):
USB: OTG: msm: Implement charger detection
USB: OTG: msm: Add PHY suspend support for MSM8960
drivers/usb/gadget/ci13xxx_msm.c | 3 +- drivers/usb/gadget/ci13xxx_udc.c | 21 ++ drivers/usb/gadget/ci13xxx_udc.h | 3 + drivers/usb/otg/msm_otg.c | 670 +++++++++++++++++++++++++++++++++++++- include/linux/usb/msm_hsusb.h | 79 +++++- include/linux/usb/msm_hsusb_hw.h | 2 + 6 files changed, 758 insertions(+), 20 deletions(-)
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
A message that is not in the archive (sent off-list or not yet received): 1304399633-16120-1-git-send-email-pkondeti-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
PATCH v4 1/5 USB: gadget: Use Zero Interrupt Threshold Control for ci13xxx_msm
From: Anji jonnala <[email protected]>
ITC (Interrupt Threshold Control) field is to set the maximum rate at which the device controller will issue interrupts. The maximum interrupt interval is measured in micro frames. Valid values are 0, 1, 2, 4, 8, 16, 32, 64. The default value is 8 micro frames. Set ITC to zero for MSM to gain performance.
--- drivers/usb/gadget/ci13xxx_msm.c | 3 ++- drivers/usb/gadget/ci13xxx_udc.c | 11 +++++++++++ drivers/usb/gadget/ci13xxx_udc.h | 3 +++ 3 files changed, 16 insertions(+), 1 deletions(-)
drivers/usb/gadget/ci13xxx_msm.c +2 -1
@@ -64,7 +64,8 @@ static struct ci13xxx_udc_driver ci13xxx_msm_udc_driver = { .flags = CI13XXX_REGS_SHARED |CI13XXX_REQUIRE_TRANSCEIVER |CI13XXX_PULLUP_ON_VBUS | - CI13XXX_DISABLE_STREAMING, +CI13XXX_DISABLE_STREAMING | + CI13XXX_ZERO_ITC, .notify_event = ci13xxx_msm_notify_event, };
drivers/usb/gadget/ci13xxx_udc.c +11 -0
@@ -318,6 +318,17 @@ static int hw_device_reset(struct ci13xxx *udc)hw_cwrite (CAP_USBMODE ,USBMODE_CM ,USBMODE_CM_DEVICE );hw_cwrite (CAP_USBMODE ,USBMODE_SLOM ,USBMODE_SLOM );/* HW >= 2.3 */ +/* +* ITC (Interrupt Threshold Control) field is to set the maximum +* rate at which the device controller will issue interrupts. +* The maximum interrupt interval measured in micro frames. +* Valid values are 0, 1, 2, 4, 8, 16, 32, 64. The default value is +* 8 micro frames. If CPU can handle interrupts at faster rate, ITC +* can be set to lesser value to gain performance. +*/ +if (udc->udc_driver->flags &CI13XXX_ZERO_ITC ) +hw_cwrite (CAP_USBCMD ,USBCMD_ITC_MASK ,USBCMD_ITC (0 )); +if (hw_cread (CAP_USBMODE ,USBMODE_CM ) !=USBMODE_CM_DEVICE ) {pr_err ("cannot enter in device mode" );pr_err ("lpm = %i" , hw_bank.lpm);
drivers/usb/gadget/ci13xxx_udc.h +3 -0
@@ -108,6 +108,7 @@ struct ci13xxx_udc_driver {#define CI13XXX_REQUIRE_TRANSCEIVER BIT(1)#define CI13XXX_PULLUP_ON_VBUS BIT(2)#define CI13XXX_DISABLE_STREAMING BIT(3) +#define CI13XXX_ZERO_ITC BIT(4)#define CI13XXX_CONTROLLER_RESET_EVENT 0#define CI13XXX_CONTROLLER_STOPPED_EVENT 1
@@ -189,6 +190,8 @@ struct ci13xxx {#define USBMODE_CM_HOST (0x03UL << 0)#define USBMODE_SLOM BIT(3)#define USBMODE_SDIS BIT(4) +#define USBCMD_ITC (n) (n << 16)/* n = 0, 1, 2, 4, 8, 16, 32, 64 */ +#define USBCMD_ITC_MASK (0xFF << 16)/* ENDPTCTRL */ #define ENDPTCTRL_RXS BIT(0)
Signature · 7 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v4 2/5 USB: OTG: msm: vote for dayatona fabric clock
In reply to Pavankumar KondetiFrom: Anji jonnala <[email protected]>
HSUSB core clock is derived from daytona fabric clock and for HSUSB operational require minimum core clock at 55MHz. Since, HSUSB cannot tolerate daytona fabric clock change in the middle of HSUSB operational, vote for maximum Daytona fabric clock
while usb is operational
--- drivers/usb/otg/msm_otg.c | 37 +++++++++++++++++++++++++++++++++++-- include/linux/usb/msm_hsusb.h | 7 +++++-- 2 files changed, 40 insertions(+), 4 deletions(-)
drivers/usb/otg/msm_otg.c +35 -2
@@ -324,6 +324,9 @@ static int msm_otg_suspend(struct msm_otg *motg)if (motg->core_clk)clk_disable (motg->core_clk); +if (!IS_ERR (motg->pclk_src)) +clk_disable (motg->pclk_src); +if (device_may_wakeup (otg->dev))enable_irq_wake (motg->irq);if (bus)
@@ -347,6 +350,9 @@ static int msm_otg_resume(struct msm_otg *motg)if (!atomic_read (&motg->in_lpm))return 0 ; +if (!IS_ERR (motg->pclk_src)) +clk_enable (motg->pclk_src); +clk_enable (motg->pclk);clk_enable (motg->clk);if (motg->core_clk)
@@ -862,12 +868,31 @@ static int __init msm_otg_probe(struct platform_device *pdev) ret =PTR_ERR (motg->clk); goto put_phy_reset_clk; } +clk_set_rate (motg->clk,60000000 ); + +/* +* If USB Core is running its protocol engine based on CORE CLK, +* CORE CLK must be running at >55Mhz for correct HSUSB +* operation and USB core cannot tolerate frequency changes on +* CORE CLK. For such USB cores, vote for maximum clk frequency +* on pclk source +*/ +if (motg->pdata->pclk_src_name) { + motg->pclk_src =clk_get (&pdev->dev, + motg->pdata->pclk_src_name); +if (IS_ERR (motg->pclk_src)) + goto put_clk; +clk_set_rate (motg->pclk_src,INT_MAX ); +clk_enable (motg->pclk_src); + }else + motg->pclk_src =ERR_PTR (-ENOENT ); + motg->pclk =clk_get (&pdev->dev,"usb_hs_pclk" );if (IS_ERR (motg->pclk)) {dev_err (&pdev->dev,"failed to get usb_hs_pclk\n" ); ret =PTR_ERR (motg->pclk); - goto put_clk; + goto put_pclk_src; }/*
@@ -954,7 +979,11 @@ free_regs: put_core_clk:if (motg->core_clk)clk_put (motg->core_clk); -clk_put (motg->pclk); +put_pclk_src: +if (!IS_ERR (motg->pclk_src)) { +clk_disable (motg->pclk_src); +clk_put (motg->pclk_src); + } put_clk:clk_put (motg->clk); put_phy_reset_clk:
@@ -1004,6 +1033,10 @@ static int __devexit msm_otg_remove(struct platform_device *pdev)clk_disable (motg->clk);if (motg->core_clk)clk_disable (motg->core_clk); +if (!IS_ERR (motg->pclk_src)) { +clk_disable (motg->pclk_src); +clk_put (motg->pclk_src); + }iounmap (motg->regs);pm_runtime_set_suspended (&pdev->dev);
include/linux/usb/msm_hsusb.h +5 -2
@@ -64,7 +64,8 @@ enum otg_control_type {* @otg_control: OTG switch controlled by user/Id pin * @default_mode: Default operational mode. Applicable only if * OTG switch is controller by user. -* +* @pclk_src_name: pclk is derived from ebi1_usb_clk in case of 7x27 and 8k +* dfab_usb_hs_clk in case of 8660 and 8960. */ struct msm_otg_platform_data {int *phy_init_seq;
@@ -74,6 +75,7 @@ struct msm_otg_platform_data {enum otg_control_type otg_control;enum usb_mode_type default_mode;void (*setup_gpio)(enum usb_otg_state state); +char *pclk_src_name; };/**
@@ -83,6 +85,7 @@ struct msm_otg_platform_data {* @irq: IRQ number assigned for HSUSB controller. * @clk: clock struct of usb_hs_clk. * @pclk: clock struct of usb_hs_pclk. +* @pclk_src: pclk source for voting. * @phy_reset_clk: clock struct of usb_phy_clk. * @core_clk: clock struct of usb_hs_core_clk. * @regs: ioremapped register base address.
@@ -90,7 +93,6 @@ struct msm_otg_platform_data {* @sm_work: OTG state machine work. * @in_lpm: indicates low power mode (LPM) state. * @async_int: Async interrupt arrived. -* */ struct msm_otg {struct otg_transceiver otg;
@@ -98,6 +100,7 @@ struct msm_otg {int irq;struct clk *clk;struct clk *pclk; +struct clk *pclk_src;struct clk *phy_reset_clk;struct clk *core_clk;void __iomem *regs;
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
A message that is not in the archive (sent off-list or not yet received): 1304399633-16120-3-git-send-email-pkondeti-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
Re: [PATCH V4 2/5] USB: OTG: msm: vote for dayatona fabric clock
Hello.
Quoted 10 lines · Pavankumar Kondeti
From: Anji jonnala <[email protected]>
HSUSB core clock is derived from daytona fabric clock and for HSUSB operational require minimum core clock at 55MHz. Since, HSUSB cannot tolerate daytona fabric clock change in the middle of HSUSB operational, vote for maximum Daytona fabric clock
while usb is operationalSigned-off-by Anji jonnala<[email protected]>Signed-off-by Pavankumar Kondeti<[email protected]>
[...]
Quoted 4 lines
drivers/usb/otg/msm_otg.c +0
-0
[...]
drivers/usb/otg/msm_otg.c free_regs: · line 957
Quoted 5 lines
drivers/usb/otg/msm_otg.c +0
-1@@ -954,7 +979,11 @@ free_regs: put_core_clk:if (motg->core_clk)clk_put (motg->core_clk); -clk_put (motg->pclk);
Is it really correct to remove this line?
drivers/usb/otg/msm_otg.c free_regs: · line 989
Quoted 8 lines
drivers/usb/otg/msm_otg.c +5
-0+put_pclk_src: +if (!IS_ERR (motg->pclk_src)) { +clk_disable (motg->pclk_src); +clk_put (motg->pclk_src); + } put_clk:clk_put (motg->clk); put_phy_reset_clk:
WBR, Sergei
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH V4 2/5] USB: OTG: msm: vote for dayatona fabric clock
Hi Sergei,
Quoted 21 lines · Sergei Shtylyov
Hello.
Quoted 10 lines · Pavankumar Kondeti
From: Anji jonnala <[email protected]>
HSUSB core clock is derived from daytona fabric clock and for HSUSB operational require minimum core clock at 55MHz. Since, HSUSB cannot tolerate daytona fabric clock change in the middle of HSUSB operational, vote for maximum Daytona fabric clock
while usb is operationalSigned-off-by Anji jonnala<[email protected]>Signed-off-by Pavankumar Kondeti<[email protected]>[...]
Quoted 4 lines
drivers/usb/otg/msm_otg.c +0
-0[...]
Quoted 8 lines
drivers/usb/otg/msm_otg.c free_regs: · line 957
Quoted 5 lines
drivers/usb/otg/msm_otg.c +0
-1@@ -954,7 +979,11 @@ free_regs: put_core_clk:if (motg->core_clk)clk_put (motg->core_clk); -clk_put (motg->pclk);Is it really correct to remove this line?
No. It is not correct. I will fix it in next version.
Quoted 10 lines
drivers/usb/otg/msm_otg.c free_regs: · line 989
Quoted 8 lines
drivers/usb/otg/msm_otg.c +5
-0+put_pclk_src: +if (!IS_ERR (motg->pclk_src)) { +clk_disable (motg->pclk_src); +clk_put (motg->pclk_src); + } put_clk:clk_put (motg->clk); put_phy_reset_clk:WBR, Sergei
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
Re: [PATCH V4 2/5] USB: OTG: msm: vote for dayatona fabric clock
Quoted 32 lines · Pavan Kondeti
Hi Sergei,
Quoted 21 lines · Sergei Shtylyov
Hello.
Quoted 10 lines · Pavankumar Kondeti
From: Anji jonnala <[email protected]>
HSUSB core clock is derived from daytona fabric clock and for HSUSB operational require minimum core clock at 55MHz. Since, HSUSB cannot tolerate daytona fabric clock change in the middle of HSUSB operational, vote for maximum Daytona fabric clock
while usb is operationalSigned-off-by Anji jonnala<[email protected]>Signed-off-by Pavankumar Kondeti<[email protected]>[...]
Quoted 4 lines
drivers/usb/otg/msm_otg.c +0
-0[...]
Quoted 8 lines
drivers/usb/otg/msm_otg.c free_regs: · line 957
Quoted 5 lines
drivers/usb/otg/msm_otg.c +0
-1@@ -954,7 +979,11 @@ free_regs: put_core_clk:if (motg->core_clk)clk_put (motg->core_clk); -clk_put (motg->pclk);Is it really correct to remove this line?
Quoted 1 line
No. It is not correct. I will fix it in next version.
Next version?
Ok, I'll drop all of these then from my queue. Please resend when you have something working properly.
thanks,
greg k-h
Re: [PATCH V4 2/5] USB: OTG: msm: vote for dayatona fabric clock
Hi Greg,
Quoted 33 lines · Greg KH
Quoted 32 lines · Pavan Kondeti
Hi Sergei,
Quoted 29 lines · Sergei Shtylyov
Hello.
Quoted 10 lines · Pavankumar Kondeti
From: Anji jonnala <[email protected]>
HSUSB core clock is derived from daytona fabric clock and for HSUSB operational require minimum core clock at 55MHz. Since, HSUSB cannot tolerate daytona fabric clock change in the middle of HSUSB operational, vote for maximum Daytona fabric clock
while usb is operationalSigned-off-by Anji jonnala<[email protected]>Signed-off-by Pavankumar Kondeti<[email protected]>[...]
Quoted 4 lines
drivers/usb/otg/msm_otg.c +0
-0[...]
drivers/usb/otg/msm_otg.c free_regs: · line 957
Quoted 5 lines
drivers/usb/otg/msm_otg.c +0
-1@@ -954,7 +979,11 @@ free_regs: put_core_clk:if (motg->core_clk)clk_put (motg->core_clk); -clk_put (motg->pclk);Is it really correct to remove this line?
Quoted 4 lines
Quoted 1 line
No. It is not correct. I will fix it in next version.
Next version?
I meant next patch set version. Again sorry for the confusion.
Quoted 3 lines
Ok, I'll drop all of these then from my queue. Please resend when you have something working properly.
I have tested the patches well. The driver probe() never failed in my testing. So could not found this BUG(). I am resending the patch series now.
Thanks,
Pavan
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
PATCH v4 3/5 USB: OTG: msm: Implement charger detection
In reply to Pavankumar KondetiImplement good battery algorithm defined in the battery charging V1.2 spec for detecting different charging ports. USB hardware is put into low power mode when connected to a dedicated charging port. vbus_draw and set_power methods are implemented for determining the allowed current from Host in different states (un-configured/suspend/configured).
The charger block is implemented using vendor specific registers and the PHY used in MSM8960(28nm PHY) different from older targets like MSM8x60 and MSM7x30(45nm PHY). The PHY vendor and product id registers are not implemented in the above chipsets. Hence PHY type is passed via platform data.
--- drivers/usb/gadget/ci13xxx_udc.c | 10 + drivers/usb/otg/msm_otg.c | 380 +++++++++++++++++++++++++++++++++++++- include/linux/usb/msm_hsusb.h | 72 +++++++- 3 files changed, 457 insertions(+), 5 deletions(-)
drivers/usb/gadget/ci13xxx_udc.c +10 -0
@@ -2508,6 +2508,15 @@ out:return ret; } +static int ci13xxx_vbus_draw (struct usb_gadget *_gadget,unsigned mA) +{ + struct ci13xxx *udc = container_of(_gadget, struct ci13xxx, gadget); + +if (udc->transceiver) +return otg_set_power (udc->transceiver, mA); +return -ENOTSUPP ; +} +/** * Device operations part of the API to the USB controller hardware, * which don't involve endpoints (or i/o)
@@ -2516,6 +2525,7 @@ out:static const struct usb_gadget_ops usb_gadget_ops = { .vbus_session = ci13xxx_vbus_session, .wakeup = ci13xxx_wakeup, + .vbus_draw = ci13xxx_vbus_draw, };/**
drivers/usb/otg/msm_otg.c +376 -4
426 lines not on this page · raw message
include/linux/usb/msm_hsusb.h +71 -1
102 lines not on this page · raw message
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
PATCH v4 4/5 USB: OTG: msm: Configure PHY Analog and Digital voltage domains
In reply to Pavankumar KondetiFrom: Anji jonnala <[email protected]>
--- drivers/usb/otg/msm_otg.c | 189 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 189 insertions(+), 0 deletions(-)
drivers/usb/otg/msm_otg.c +189 -0
@@ -38,6 +38,7 @@#include <linux/usb/hcd.h> #include <linux/usb/msm_hsusb.h> #include <linux/usb/msm_hsusb_hw.h> +#include <linux/regulator/consumer.h> #include <mach/clk.h>
@@ -45,6 +46,171 @@#define DRIVER_NAME "msm_otg"#define ULPI_IO_TIMEOUT_USEC (10 * 1000) + +#define USB_PHY_3P3_VOL_MIN 3050000/* uV */ +#define USB_PHY_3P3_VOL_MAX 3300000/* uV */ +#define USB_PHY_3P3_HPM_LOAD 50000/* uA */ +#define USB_PHY_3P3_LPM_LOAD 4000/* uA */ + +#define USB_PHY_1P8_VOL_MIN 1800000/* uV */ +#define USB_PHY_1P8_VOL_MAX 1800000/* uV */ +#define USB_PHY_1P8_HPM_LOAD 50000/* uA */ +#define USB_PHY_1P8_LPM_LOAD 4000/* uA */ + +#define USB_PHY_VDD_DIG_VOL_MIN 1000000/* uV */ +#define USB_PHY_VDD_DIG_VOL_MAX 1320000/* uV */ + +static struct regulator *hsusb_3p3; +static struct regulator *hsusb_1p8; +static struct regulator *hsusb_vddcx; + +static int msm_hsusb_init_vddcx (struct msm_otg *motg,int init) +{ +int ret =0 ; + +if (init) { + hsusb_vddcx =regulator_get (motg->otg.dev,"HSUSB_VDDCX" ); +if (IS_ERR (hsusb_vddcx)) { +dev_err (motg->otg.dev,"unable to get hsusb vddcx\n" ); +return PTR_ERR (hsusb_vddcx); + } + + ret =regulator_set_voltage (hsusb_vddcx, +USB_PHY_VDD_DIG_VOL_MIN , +USB_PHY_VDD_DIG_VOL_MAX ); +if (ret) { +dev_err (motg->otg.dev,"unable to set the voltage " +"for hsusb vddcx\n" ); +regulator_put (hsusb_vddcx); +return ret; + } + + ret =regulator_enable (hsusb_vddcx); +if (ret) { +dev_err (motg->otg.dev,"unable to enable hsusb vddcx\n" ); +regulator_put (hsusb_vddcx); + } + }else { + ret =regulator_set_voltage (hsusb_vddcx,0 , +USB_PHY_VDD_DIG_VOL_MIN ); +if (ret) { +dev_err (motg->otg.dev,"unable to set the voltage " +"for hsusb vddcx\n" ); +return ret; + } + ret =regulator_disable (hsusb_vddcx); +if (ret) +dev_err (motg->otg.dev,"unable to disable hsusb vddcx\n" ); + +regulator_put (hsusb_vddcx); + } + +return ret; +} + +static int msm_hsusb_ldo_init (struct msm_otg *motg,int init) +{ +int rc =0 ; + +if (init) { + hsusb_3p3 =regulator_get (motg->otg.dev,"HSUSB_3p3" ); +if (IS_ERR (hsusb_3p3)) { +dev_err (motg->otg.dev,"unable to get hsusb 3p3\n" ); +return PTR_ERR (hsusb_3p3); + } + + rc =regulator_set_voltage (hsusb_3p3,USB_PHY_3P3_VOL_MIN , +USB_PHY_3P3_VOL_MAX ); +if (rc) { +dev_err (motg->otg.dev,"unable to set voltage level " +"for hsusb 3p3\n" ); + goto put_3p3; + } + rc =regulator_enable (hsusb_3p3); +if (rc) { +dev_err (motg->otg.dev,"unable to enable the hsusb 3p3\n" ); + goto put_3p3; + } + hsusb_1p8 =regulator_get (motg->otg.dev,"HSUSB_1p8" ); +if (IS_ERR (hsusb_1p8)) { +dev_err (motg->otg.dev,"unable to get hsusb 1p8\n" ); + rc =PTR_ERR (hsusb_1p8); + goto disable_3p3; + } + rc =regulator_set_voltage (hsusb_1p8,USB_PHY_1P8_VOL_MIN , +USB_PHY_1P8_VOL_MAX ); +if (rc) { +dev_err (motg->otg.dev,"unable to set voltage level " +"for hsusb 1p8\n" ); + goto put_1p8; + } + rc =regulator_enable (hsusb_1p8); +if (rc) { +dev_err (motg->otg.dev,"unable to enable the hsusb 1p8\n" ); + goto put_1p8; + } + +return 0 ; + } + +regulator_disable (hsusb_1p8); +put_1p8: +regulator_put (hsusb_1p8); +disable_3p3: +regulator_disable (hsusb_3p3); +put_3p3: +regulator_put (hsusb_3p3); +return rc; +} + +static int msm_hsusb_ldo_set_mode (int on) +{ +int ret =0 ; + +if (!hsusb_1p8 ||IS_ERR (hsusb_1p8)) { +pr_err ("%s: HSUSB_1p8 is not initialized\n" , __func__); +return -ENODEV ; + } + +if (!hsusb_3p3 ||IS_ERR (hsusb_3p3)) { +pr_err ("%s: HSUSB_3p3 is not initialized\n" , __func__); +return -ENODEV ; + } + +if (on) { + ret =regulator_set_optimum_mode (hsusb_1p8, +USB_PHY_1P8_HPM_LOAD ); +if (ret <0 ) { +pr_err ("%s: Unable to set HPM of the regulator " +"HSUSB_1p8\n" , __func__); +return ret; + } + ret =regulator_set_optimum_mode (hsusb_3p3, +USB_PHY_3P3_HPM_LOAD ); +if (ret <0 ) { +pr_err ("%s: Unable to set HPM of the regulator " +"HSUSB_3p3\n" , __func__); +regulator_set_optimum_mode (hsusb_1p8, +USB_PHY_1P8_LPM_LOAD ); +return ret; + } + }else { + ret =regulator_set_optimum_mode (hsusb_1p8, +USB_PHY_1P8_LPM_LOAD ); +if (ret <0 ) +pr_err ("%s: Unable to set LPM of the regulator " +"HSUSB_1p8\n" , __func__); + ret =regulator_set_optimum_mode (hsusb_3p3, +USB_PHY_3P3_LPM_LOAD ); +if (ret <0 ) +pr_err ("%s: Unable to set LPM of the regulator " +"HSUSB_3p3\n" , __func__); + } + +pr_debug ("reg (%s)\n" , on ?"HPM" :"LPM" ); +return ret <0 ? ret :0 ; +} +static int ulpi_read (struct otg_transceiver *otg,u32 reg) { struct msm_otg *motg = container_of(otg, struct msm_otg, otg);
@@ -1297,6 +1463,24 @@ static int __init msm_otg_probe(struct platform_device *pdev)clk_enable (motg->clk);clk_enable (motg->pclk); + + ret =msm_hsusb_init_vddcx (motg,1 ); +if (ret) { +dev_err (&pdev->dev,"hsusb vddcx configuration failed\n" ); + goto free_regs; + } + + ret =msm_hsusb_ldo_init (motg,1 ); +if (ret) { +dev_err (&pdev->dev,"hsusb vreg configuration failed\n" ); + goto vddcx_exit; + } + ret =msm_hsusb_ldo_set_mode (1 ); +if (ret) { +dev_err (&pdev->dev,"hsusb vreg enable failed\n" ); + goto ldo_exit; + } +if (motg->core_clk)clk_enable (motg->core_clk);
@@ -1345,6 +1529,10 @@ free_irq: disable_clks:clk_disable (motg->pclk);clk_disable (motg->clk); +ldo_exit: +msm_hsusb_ldo_init (motg,0 ); +vddcx_exit: +msm_hsusb_init_vddcx (motg,0 ); free_regs:iounmap (motg->regs); put_core_clk:
@@ -1409,6 +1597,7 @@ static int __devexit msm_otg_remove(struct platform_device *pdev)clk_disable (motg->pclk_src);clk_put (motg->pclk_src); } +msm_hsusb_ldo_init (motg,0 );iounmap (motg->regs);pm_runtime_set_suspended (&pdev->dev);
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
PATCH v4 5/5 USB: OTG: msm: Add PHY suspend support for MSM8960
In reply to Pavankumar Kondeti--- drivers/usb/otg/msm_otg.c | 64 ++++++++++++++++++++++++++++++++------ include/linux/usb/msm_hsusb_hw.h | 2 + 2 files changed, 56 insertions(+), 10 deletions(-)
drivers/usb/otg/msm_otg.c +54 -10
@@ -163,6 +163,32 @@ put_3p3:return rc; } +#ifdef CONFIG_PM_SLEEP +#define USB_PHY_SUSP_DIG_VOL 500000 +static int msm_hsusb_config_vddcx (int high) +{ +int max_vol =USB_PHY_VDD_DIG_VOL_MAX ; +int min_vol; +int ret; + +if (high) + min_vol =USB_PHY_VDD_DIG_VOL_MIN ; +else + min_vol =USB_PHY_SUSP_DIG_VOL ; + + ret =regulator_set_voltage (hsusb_vddcx, min_vol, max_vol); +if (ret) { +pr_err ("%s: unable to set the voltage for regulator " +"HSUSB_VDDCX\n" , __func__); +return ret; + } + +pr_debug ("%s: min_vol:%d max_vol:%d\n" , __func__, min_vol, max_vol); + +return ret; +} +#endif +static int msm_hsusb_ldo_set_mode (int on) {int ret =0 ;
@@ -434,27 +460,28 @@ static int msm_otg_suspend(struct msm_otg *motg)disable_irq (motg->irq);/* +* Chipidea 45-nm PHY suspend sequence: +* * Interrupt Latch Register auto-clear feature is not present * in all PHY versions. Latch register is clear on read type. * Clear latch register to avoid spurious wakeup from * low power mode (LPM). -*/ -ulpi_read (otg,0x14 ); - -/* +* * PHY comparators are disabled when PHY enters into low power * mode (LPM). Keep PHY comparators ON in LPM only when we expect * VBUS/Id notifications from USB PHY. Otherwise turn off USB * PHY comparators. This save significant amount of power. -*/ -if (pdata->otg_control ==OTG_PHY_CONTROL ) -ulpi_write (otg,0x01 ,0x30 ); - -/* +* * PLL is not turned off when PHY enters into low power mode (LPM). * Disable PLL for maximum power savings. */ -ulpi_write (otg,0x08 ,0x09 ); + +if (motg->pdata->phy_type ==CI_45NM_INTEGRATED_PHY ) { +ulpi_read (otg,0x14 ); +if (pdata->otg_control ==OTG_PHY_CONTROL ) +ulpi_write (otg,0x01 ,0x30 ); +ulpi_write (otg,0x08 ,0x09 ); + }/* * PHY may take some time or even fail to enter into low power
@@ -485,6 +512,10 @@ static int msm_otg_suspend(struct msm_otg *motg)*/ writel (readl (USB_USBCMD ) |ASYNC_INTR_CTRL |ULPI_STP_CTRL ,USB_USBCMD ); +if (motg->pdata->phy_type ==SNPS_28NM_INTEGRATED_PHY && + motg->pdata->otg_control ==OTG_PMIC_CONTROL ) +writel (readl (USB_PHY_CTRL ) |PHY_RETEN ,USB_PHY_CTRL ); +clk_disable (motg->pclk);clk_disable (motg->clk);if (motg->core_clk)
@@ -493,6 +524,12 @@ static int msm_otg_suspend(struct msm_otg *motg)if (!IS_ERR (motg->pclk_src))clk_disable (motg->pclk_src); +if (motg->pdata->phy_type ==SNPS_28NM_INTEGRATED_PHY && + motg->pdata->otg_control ==OTG_PMIC_CONTROL ) { +msm_hsusb_ldo_set_mode (0 ); +msm_hsusb_config_vddcx (0 ); + } +if (device_may_wakeup (otg->dev))enable_irq_wake (motg->irq);if (bus)
@@ -524,6 +561,13 @@ static int msm_otg_resume(struct msm_otg *motg)if (motg->core_clk)clk_enable (motg->core_clk); +if (motg->pdata->phy_type ==SNPS_28NM_INTEGRATED_PHY && + motg->pdata->otg_control ==OTG_PMIC_CONTROL ) { +msm_hsusb_ldo_set_mode (1 ); +msm_hsusb_config_vddcx (1 ); +writel (readl (USB_PHY_CTRL ) & ~PHY_RETEN ,USB_PHY_CTRL ); + } + temp =readl (USB_USBCMD ); temp &= ~ASYNC_INTR_CTRL ; temp &= ~ULPI_STP_CTRL ;
include/linux/usb/msm_hsusb_hw.h +2 -0
@@ -24,6 +24,7 @@#define USB_PORTSC (MSM_USB_BASE + 0x0184)#define USB_OTGSC (MSM_USB_BASE + 0x01A4)#define USB_USBMODE (MSM_USB_BASE + 0x01A8) +#define USB_PHY_CTRL (MSM_USB_BASE + 0x0240)#define USBCMD_RESET 2#define USB_USBINTR (MSM_USB_BASE + 0x0148)
@@ -42,6 +43,7 @@#define ASYNC_INTR_CTRL (1 << 29)/* Enable async interrupt */ #define ULPI_STP_CTRL (1 << 30)/* Block communication with PHY */ +#define PHY_RETEN (1 << 1)/* PHY retention enable/disable */ /* OTG definitions */ #define OTGSC_INTSTS_MASK (0x7f << 16)
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
v5 cover USB Charging, PHY init and suspend support for MSM8960
In reply to Pavankumar KondetiThis patch series adds PHY based charging detection, PHY initialization and suspend support for MSM8960 target.
Changelog
- V5
- Fixed error path in msm_otg probe
- V4
- Added missing spaces at the end of line for multi line printk messages.
- V3
- The third patch in this series unknowingly turning off pclk in resume. Fix
it.
- add "msm" in commit prefix for 2nd patch.
- V2
- logical AND operator is used instead of bitwiese AND for testing flags.
- Fixed error path and label names as per Sergei's comments.
- Fixed a typo mistake (s/phy_type/otg_control) pointed out by Sergei.
- Changed a never-changed-variable into a macro.
Anji jonnala (2):
USB: OTG: msm: vote for dayatona fabric clock
USB: OTG: msm: Configure PHY Analog and Digital voltage domains
Pavankumar Kondeti (2):
USB: OTG: msm: Implement charger detection
USB: OTG: msm: Add PHY suspend support for MSM8960
drivers/usb/gadget/ci13xxx_udc.c | 10 + drivers/usb/otg/msm_otg.c | 669 +++++++++++++++++++++++++++++++++++++- include/linux/usb/msm_hsusb.h | 79 +++++- include/linux/usb/msm_hsusb_hw.h | 2 + 4 files changed, 742 insertions(+), 18 deletions(-)
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
A message that is not in the archive (sent off-list or not yet received): 1304484589-17186-1-git-send-email-pkondeti-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
PATCH v5 3/4 USB: OTG: msm: Configure PHY Analog and Digital voltage domains
From: Anji jonnala <[email protected]>
--- drivers/usb/otg/msm_otg.c | 189 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 189 insertions(+), 0 deletions(-)
drivers/usb/otg/msm_otg.c +189 -0
@@ -38,6 +38,7 @@#include <linux/usb/hcd.h> #include <linux/usb/msm_hsusb.h> #include <linux/usb/msm_hsusb_hw.h> +#include <linux/regulator/consumer.h> #include <mach/clk.h>
@@ -45,6 +46,171 @@#define DRIVER_NAME "msm_otg"#define ULPI_IO_TIMEOUT_USEC (10 * 1000) + +#define USB_PHY_3P3_VOL_MIN 3050000/* uV */ +#define USB_PHY_3P3_VOL_MAX 3300000/* uV */ +#define USB_PHY_3P3_HPM_LOAD 50000/* uA */ +#define USB_PHY_3P3_LPM_LOAD 4000/* uA */ + +#define USB_PHY_1P8_VOL_MIN 1800000/* uV */ +#define USB_PHY_1P8_VOL_MAX 1800000/* uV */ +#define USB_PHY_1P8_HPM_LOAD 50000/* uA */ +#define USB_PHY_1P8_LPM_LOAD 4000/* uA */ + +#define USB_PHY_VDD_DIG_VOL_MIN 1000000/* uV */ +#define USB_PHY_VDD_DIG_VOL_MAX 1320000/* uV */ + +static struct regulator *hsusb_3p3; +static struct regulator *hsusb_1p8; +static struct regulator *hsusb_vddcx; + +static int msm_hsusb_init_vddcx (struct msm_otg *motg,int init) +{ +int ret =0 ; + +if (init) { + hsusb_vddcx =regulator_get (motg->otg.dev,"HSUSB_VDDCX" ); +if (IS_ERR (hsusb_vddcx)) { +dev_err (motg->otg.dev,"unable to get hsusb vddcx\n" ); +return PTR_ERR (hsusb_vddcx); + } + + ret =regulator_set_voltage (hsusb_vddcx, +USB_PHY_VDD_DIG_VOL_MIN , +USB_PHY_VDD_DIG_VOL_MAX ); +if (ret) { +dev_err (motg->otg.dev,"unable to set the voltage " +"for hsusb vddcx\n" ); +regulator_put (hsusb_vddcx); +return ret; + } + + ret =regulator_enable (hsusb_vddcx); +if (ret) { +dev_err (motg->otg.dev,"unable to enable hsusb vddcx\n" ); +regulator_put (hsusb_vddcx); + } + }else { + ret =regulator_set_voltage (hsusb_vddcx,0 , +USB_PHY_VDD_DIG_VOL_MIN ); +if (ret) { +dev_err (motg->otg.dev,"unable to set the voltage " +"for hsusb vddcx\n" ); +return ret; + } + ret =regulator_disable (hsusb_vddcx); +if (ret) +dev_err (motg->otg.dev,"unable to disable hsusb vddcx\n" ); + +regulator_put (hsusb_vddcx); + } + +return ret; +} + +static int msm_hsusb_ldo_init (struct msm_otg *motg,int init) +{ +int rc =0 ; + +if (init) { + hsusb_3p3 =regulator_get (motg->otg.dev,"HSUSB_3p3" ); +if (IS_ERR (hsusb_3p3)) { +dev_err (motg->otg.dev,"unable to get hsusb 3p3\n" ); +return PTR_ERR (hsusb_3p3); + } + + rc =regulator_set_voltage (hsusb_3p3,USB_PHY_3P3_VOL_MIN , +USB_PHY_3P3_VOL_MAX ); +if (rc) { +dev_err (motg->otg.dev,"unable to set voltage level " +"for hsusb 3p3\n" ); + goto put_3p3; + } + rc =regulator_enable (hsusb_3p3); +if (rc) { +dev_err (motg->otg.dev,"unable to enable the hsusb 3p3\n" ); + goto put_3p3; + } + hsusb_1p8 =regulator_get (motg->otg.dev,"HSUSB_1p8" ); +if (IS_ERR (hsusb_1p8)) { +dev_err (motg->otg.dev,"unable to get hsusb 1p8\n" ); + rc =PTR_ERR (hsusb_1p8); + goto disable_3p3; + } + rc =regulator_set_voltage (hsusb_1p8,USB_PHY_1P8_VOL_MIN , +USB_PHY_1P8_VOL_MAX ); +if (rc) { +dev_err (motg->otg.dev,"unable to set voltage level " +"for hsusb 1p8\n" ); + goto put_1p8; + } + rc =regulator_enable (hsusb_1p8); +if (rc) { +dev_err (motg->otg.dev,"unable to enable the hsusb 1p8\n" ); + goto put_1p8; + } + +return 0 ; + } + +regulator_disable (hsusb_1p8); +put_1p8: +regulator_put (hsusb_1p8); +disable_3p3: +regulator_disable (hsusb_3p3); +put_3p3: +regulator_put (hsusb_3p3); +return rc; +} + +static int msm_hsusb_ldo_set_mode (int on) +{ +int ret =0 ; + +if (!hsusb_1p8 ||IS_ERR (hsusb_1p8)) { +pr_err ("%s: HSUSB_1p8 is not initialized\n" , __func__); +return -ENODEV ; + } + +if (!hsusb_3p3 ||IS_ERR (hsusb_3p3)) { +pr_err ("%s: HSUSB_3p3 is not initialized\n" , __func__); +return -ENODEV ; + } + +if (on) { + ret =regulator_set_optimum_mode (hsusb_1p8, +USB_PHY_1P8_HPM_LOAD ); +if (ret <0 ) { +pr_err ("%s: Unable to set HPM of the regulator " +"HSUSB_1p8\n" , __func__); +return ret; + } + ret =regulator_set_optimum_mode (hsusb_3p3, +USB_PHY_3P3_HPM_LOAD ); +if (ret <0 ) { +pr_err ("%s: Unable to set HPM of the regulator " +"HSUSB_3p3\n" , __func__); +regulator_set_optimum_mode (hsusb_1p8, +USB_PHY_1P8_LPM_LOAD ); +return ret; + } + }else { + ret =regulator_set_optimum_mode (hsusb_1p8, +USB_PHY_1P8_LPM_LOAD ); +if (ret <0 ) +pr_err ("%s: Unable to set LPM of the regulator " +"HSUSB_1p8\n" , __func__); + ret =regulator_set_optimum_mode (hsusb_3p3, +USB_PHY_3P3_LPM_LOAD ); +if (ret <0 ) +pr_err ("%s: Unable to set LPM of the regulator " +"HSUSB_3p3\n" , __func__); + } + +pr_debug ("reg (%s)\n" , on ?"HPM" :"LPM" ); +return ret <0 ? ret :0 ; +} +static int ulpi_read (struct otg_transceiver *otg,u32 reg) { struct msm_otg *motg = container_of(otg, struct msm_otg, otg);
@@ -1297,6 +1463,24 @@ static int __init msm_otg_probe(struct platform_device *pdev)clk_enable (motg->clk);clk_enable (motg->pclk); + + ret =msm_hsusb_init_vddcx (motg,1 ); +if (ret) { +dev_err (&pdev->dev,"hsusb vddcx configuration failed\n" ); + goto free_regs; + } + + ret =msm_hsusb_ldo_init (motg,1 ); +if (ret) { +dev_err (&pdev->dev,"hsusb vreg configuration failed\n" ); + goto vddcx_exit; + } + ret =msm_hsusb_ldo_set_mode (1 ); +if (ret) { +dev_err (&pdev->dev,"hsusb vreg enable failed\n" ); + goto ldo_exit; + } +if (motg->core_clk)clk_enable (motg->core_clk);
@@ -1345,6 +1529,10 @@ free_irq: disable_clks:clk_disable (motg->pclk);clk_disable (motg->clk); +ldo_exit: +msm_hsusb_ldo_init (motg,0 ); +vddcx_exit: +msm_hsusb_init_vddcx (motg,0 ); free_regs:iounmap (motg->regs); put_core_clk:
@@ -1410,6 +1598,7 @@ static int __devexit msm_otg_remove(struct platform_device *pdev)clk_disable (motg->pclk_src);clk_put (motg->pclk_src); } +msm_hsusb_ldo_init (motg,0 );iounmap (motg->regs);pm_runtime_set_suspended (&pdev->dev);
Signature · 7 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v5 4/4 USB: OTG: msm: Add PHY suspend support for MSM8960
In reply to a message not in the archive--- drivers/usb/otg/msm_otg.c | 64 ++++++++++++++++++++++++++++++++------ include/linux/usb/msm_hsusb_hw.h | 2 + 2 files changed, 56 insertions(+), 10 deletions(-)
drivers/usb/otg/msm_otg.c +54 -10
@@ -163,6 +163,32 @@ put_3p3:return rc; } +#ifdef CONFIG_PM_SLEEP +#define USB_PHY_SUSP_DIG_VOL 500000 +static int msm_hsusb_config_vddcx (int high) +{ +int max_vol =USB_PHY_VDD_DIG_VOL_MAX ; +int min_vol; +int ret; + +if (high) + min_vol =USB_PHY_VDD_DIG_VOL_MIN ; +else + min_vol =USB_PHY_SUSP_DIG_VOL ; + + ret =regulator_set_voltage (hsusb_vddcx, min_vol, max_vol); +if (ret) { +pr_err ("%s: unable to set the voltage for regulator " +"HSUSB_VDDCX\n" , __func__); +return ret; + } + +pr_debug ("%s: min_vol:%d max_vol:%d\n" , __func__, min_vol, max_vol); + +return ret; +} +#endif +static int msm_hsusb_ldo_set_mode (int on) {int ret =0 ;
@@ -434,27 +460,28 @@ static int msm_otg_suspend(struct msm_otg *motg)disable_irq (motg->irq);/* +* Chipidea 45-nm PHY suspend sequence: +* * Interrupt Latch Register auto-clear feature is not present * in all PHY versions. Latch register is clear on read type. * Clear latch register to avoid spurious wakeup from * low power mode (LPM). -*/ -ulpi_read (otg,0x14 ); - -/* +* * PHY comparators are disabled when PHY enters into low power * mode (LPM). Keep PHY comparators ON in LPM only when we expect * VBUS/Id notifications from USB PHY. Otherwise turn off USB * PHY comparators. This save significant amount of power. -*/ -if (pdata->otg_control ==OTG_PHY_CONTROL ) -ulpi_write (otg,0x01 ,0x30 ); - -/* +* * PLL is not turned off when PHY enters into low power mode (LPM). * Disable PLL for maximum power savings. */ -ulpi_write (otg,0x08 ,0x09 ); + +if (motg->pdata->phy_type ==CI_45NM_INTEGRATED_PHY ) { +ulpi_read (otg,0x14 ); +if (pdata->otg_control ==OTG_PHY_CONTROL ) +ulpi_write (otg,0x01 ,0x30 ); +ulpi_write (otg,0x08 ,0x09 ); + }/* * PHY may take some time or even fail to enter into low power
@@ -485,6 +512,10 @@ static int msm_otg_suspend(struct msm_otg *motg)*/ writel (readl (USB_USBCMD ) |ASYNC_INTR_CTRL |ULPI_STP_CTRL ,USB_USBCMD ); +if (motg->pdata->phy_type ==SNPS_28NM_INTEGRATED_PHY && + motg->pdata->otg_control ==OTG_PMIC_CONTROL ) +writel (readl (USB_PHY_CTRL ) |PHY_RETEN ,USB_PHY_CTRL ); +clk_disable (motg->pclk);clk_disable (motg->clk);if (motg->core_clk)
@@ -493,6 +524,12 @@ static int msm_otg_suspend(struct msm_otg *motg)if (!IS_ERR (motg->pclk_src))clk_disable (motg->pclk_src); +if (motg->pdata->phy_type ==SNPS_28NM_INTEGRATED_PHY && + motg->pdata->otg_control ==OTG_PMIC_CONTROL ) { +msm_hsusb_ldo_set_mode (0 ); +msm_hsusb_config_vddcx (0 ); + } +if (device_may_wakeup (otg->dev))enable_irq_wake (motg->irq);if (bus)
@@ -524,6 +561,13 @@ static int msm_otg_resume(struct msm_otg *motg)if (motg->core_clk)clk_enable (motg->core_clk); +if (motg->pdata->phy_type ==SNPS_28NM_INTEGRATED_PHY && + motg->pdata->otg_control ==OTG_PMIC_CONTROL ) { +msm_hsusb_ldo_set_mode (1 ); +msm_hsusb_config_vddcx (1 ); +writel (readl (USB_PHY_CTRL ) & ~PHY_RETEN ,USB_PHY_CTRL ); + } + temp =readl (USB_USBCMD ); temp &= ~ASYNC_INTR_CTRL ; temp &= ~ULPI_STP_CTRL ;
include/linux/usb/msm_hsusb_hw.h +2 -0
@@ -24,6 +24,7 @@#define USB_PORTSC (MSM_USB_BASE + 0x0184)#define USB_OTGSC (MSM_USB_BASE + 0x01A4)#define USB_USBMODE (MSM_USB_BASE + 0x01A8) +#define USB_PHY_CTRL (MSM_USB_BASE + 0x0240)#define USBCMD_RESET 2#define USB_USBINTR (MSM_USB_BASE + 0x0148)
@@ -42,6 +43,7 @@#define ASYNC_INTR_CTRL (1 << 29)/* Enable async interrupt */ #define ULPI_STP_CTRL (1 << 30)/* Block communication with PHY */ +#define PHY_RETEN (1 << 1)/* PHY retention enable/disable */ /* OTG definitions */ #define OTGSC_INTSTS_MASK (0x7f << 16)
Signature · 7 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v5 1/4 USB: OTG: msm: vote for dayatona fabric clock
In reply to Pavankumar KondetiFrom: Anji jonnala <[email protected]>
HSUSB core clock is derived from daytona fabric clock and for HSUSB operational require minimum core clock at 55MHz. Since, HSUSB cannot tolerate daytona fabric clock change in the middle of HSUSB operational, vote for maximum Daytona fabric clock
while usb is operational
--- drivers/usb/otg/msm_otg.c | 36 +++++++++++++++++++++++++++++++++++- include/linux/usb/msm_hsusb.h | 7 +++++-- 2 files changed, 40 insertions(+), 3 deletions(-)
drivers/usb/otg/msm_otg.c +35 -1
@@ -324,6 +324,9 @@ static int msm_otg_suspend(struct msm_otg *motg)if (motg->core_clk)clk_disable (motg->core_clk); +if (!IS_ERR (motg->pclk_src)) +clk_disable (motg->pclk_src); +if (device_may_wakeup (otg->dev))enable_irq_wake (motg->irq);if (bus)
@@ -347,6 +350,9 @@ static int msm_otg_resume(struct msm_otg *motg)if (!atomic_read (&motg->in_lpm))return 0 ; +if (!IS_ERR (motg->pclk_src)) +clk_enable (motg->pclk_src); +clk_enable (motg->pclk);clk_enable (motg->clk);if (motg->core_clk)
@@ -862,12 +868,31 @@ static int __init msm_otg_probe(struct platform_device *pdev) ret =PTR_ERR (motg->clk); goto put_phy_reset_clk; } +clk_set_rate (motg->clk,60000000 ); + +/* +* If USB Core is running its protocol engine based on CORE CLK, +* CORE CLK must be running at >55Mhz for correct HSUSB +* operation and USB core cannot tolerate frequency changes on +* CORE CLK. For such USB cores, vote for maximum clk frequency +* on pclk source +*/ +if (motg->pdata->pclk_src_name) { + motg->pclk_src =clk_get (&pdev->dev, + motg->pdata->pclk_src_name); +if (IS_ERR (motg->pclk_src)) + goto put_clk; +clk_set_rate (motg->pclk_src,INT_MAX ); +clk_enable (motg->pclk_src); + }else + motg->pclk_src =ERR_PTR (-ENOENT ); + motg->pclk =clk_get (&pdev->dev,"usb_hs_pclk" );if (IS_ERR (motg->pclk)) {dev_err (&pdev->dev,"failed to get usb_hs_pclk\n" ); ret =PTR_ERR (motg->pclk); - goto put_clk; + goto put_pclk_src; }/*
@@ -955,6 +980,11 @@ put_core_clk:if (motg->core_clk)clk_put (motg->core_clk);clk_put (motg->pclk); +put_pclk_src: +if (!IS_ERR (motg->pclk_src)) { +clk_disable (motg->pclk_src); +clk_put (motg->pclk_src); + } put_clk:clk_put (motg->clk); put_phy_reset_clk:
@@ -1004,6 +1034,10 @@ static int __devexit msm_otg_remove(struct platform_device *pdev)clk_disable (motg->clk);if (motg->core_clk)clk_disable (motg->core_clk); +if (!IS_ERR (motg->pclk_src)) { +clk_disable (motg->pclk_src); +clk_put (motg->pclk_src); + }iounmap (motg->regs);pm_runtime_set_suspended (&pdev->dev);
include/linux/usb/msm_hsusb.h +5 -2
@@ -64,7 +64,8 @@ enum otg_control_type {* @otg_control: OTG switch controlled by user/Id pin * @default_mode: Default operational mode. Applicable only if * OTG switch is controller by user. -* +* @pclk_src_name: pclk is derived from ebi1_usb_clk in case of 7x27 and 8k +* dfab_usb_hs_clk in case of 8660 and 8960. */ struct msm_otg_platform_data {int *phy_init_seq;
@@ -74,6 +75,7 @@ struct msm_otg_platform_data {enum otg_control_type otg_control;enum usb_mode_type default_mode;void (*setup_gpio)(enum usb_otg_state state); +char *pclk_src_name; };/**
@@ -83,6 +85,7 @@ struct msm_otg_platform_data {* @irq: IRQ number assigned for HSUSB controller. * @clk: clock struct of usb_hs_clk. * @pclk: clock struct of usb_hs_pclk. +* @pclk_src: pclk source for voting. * @phy_reset_clk: clock struct of usb_phy_clk. * @core_clk: clock struct of usb_hs_core_clk. * @regs: ioremapped register base address.
@@ -90,7 +93,6 @@ struct msm_otg_platform_data {* @sm_work: OTG state machine work. * @in_lpm: indicates low power mode (LPM) state. * @async_int: Async interrupt arrived. -* */ struct msm_otg {struct otg_transceiver otg;
@@ -98,6 +100,7 @@ struct msm_otg {int irq;struct clk *clk;struct clk *pclk; +struct clk *pclk_src;struct clk *phy_reset_clk;struct clk *core_clk;void __iomem *regs;
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
PATCH v5 2/4 USB: OTG: msm: Implement charger detection
In reply to Pavankumar KondetiImplement good battery algorithm defined in the battery charging V1.2 spec for detecting different charging ports. USB hardware is put into low power mode when connected to a dedicated charging port. vbus_draw and set_power methods are implemented for determining the allowed current from Host in different states (un-configured/suspend/configured).
The charger block is implemented using vendor specific registers and the PHY used in MSM8960(28nm PHY) different from older targets like MSM8x60 and MSM7x30(45nm PHY). The PHY vendor and product id registers are not implemented in the above chipsets. Hence PHY type is passed via platform data.
--- drivers/usb/gadget/ci13xxx_udc.c | 10 + drivers/usb/otg/msm_otg.c | 380 +++++++++++++++++++++++++++++++++++++- include/linux/usb/msm_hsusb.h | 72 +++++++- 3 files changed, 457 insertions(+), 5 deletions(-)
drivers/usb/gadget/ci13xxx_udc.c +10 -0
@@ -2517,6 +2517,15 @@ out:return ret; } +static int ci13xxx_vbus_draw (struct usb_gadget *_gadget,unsigned mA) +{ + struct ci13xxx *udc = container_of(_gadget, struct ci13xxx, gadget); + +if (udc->transceiver) +return otg_set_power (udc->transceiver, mA); +return -ENOTSUPP ; +} +/** * Device operations part of the API to the USB controller hardware, * which don't involve endpoints (or i/o)
@@ -2525,6 +2534,7 @@ out:static const struct usb_gadget_ops usb_gadget_ops = { .vbus_session = ci13xxx_vbus_session, .wakeup = ci13xxx_wakeup, + .vbus_draw = ci13xxx_vbus_draw, };/**
drivers/usb/otg/msm_otg.c +376 -4
426 lines not on this page · raw message
include/linux/usb/msm_hsusb.h +71 -1
102 lines not on this page · raw message
Signature · 2 lines
Sent by a consultant of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.