Add power management support for mxs phy
Subsystems (3)
v8 cover Add power management support for mxs phy
Hi Felipe & Shawn,
The serial adds power management support for MXS PHY, it includes:
- Add one PHY API .set_wakeup, and related API implementation at mxs phy driver
- misc changes and bug fixes for mxs phy to support low power mode and wakeup.
It is based on Greg's usb-next, 3.13-rc1.
Changes for v8:
- Shawn has already applied two dts patches, so delete them at
v8 version, http://marc.info/?l=linux-arm-kernel&m=138785188404939&w=2
- Using of_get_property to avoid imx6 fail at probe when using old DTB [5/12]
- Do not consider failure if alias id is not existed, it can avoid fail at probe when using old DTB [8/12]
- We don't need more changes for [8/12] change due to we use "mxs_phy->port_id ==" as condition
Changes for v7:
- Fixed indentation problem at binding doc [1/14]
- s/ganranteed/guaranteed, and add explanation for "auto setting" [3/14]
- add static before SIMPLE_DEV_PM_OPS [13/14]
- add one patch to change usb device description [7/14]
- Delete the .nofity_suspend and .notify_resume due to Felipe does not agree to add them as PHY API, will use other ways to implement them in future.
Changes for v6:
- Add description for IC bug fixes logic. [9/15]
- Move is_imx6q_phy and is_imx6sl_phy from [9/15] to [14/15]
- %s/mxs_phy_clock_switch/mxs_phy_clock_switch_delay to reflect the function meaning more precise [15/15]
Changes for v5:
Add Marc and Michael Grzeschik's commnets
- typo error at [2/15]
- sqhash patches which introducing mxs_phy_disconnect_line and fixed but at this function. [13/15]
- Introducing flag MXS_PHY_NEED_IP_FIX who stands for the SoCs who have IC fixes. [2/15, 8/15]
- Delete one patch for low speed connection problem at every rare situations due to the root cause has still not found.
Peter Chen (12):
usb: doc: phy-mxs: Add more compatible strings
usb: phy-mxs: Add platform judgement code
usb: phy-mxs: Add auto clock and power setting
usb: doc: phy-mxs: update binding for adding anatop phandle
usb: phy-mxs: Add anatop regmap
usb: phy-mxs: change description of usb device speed
usb: phy-mxs: Enable IC fixes for related SoCs
usb: phy-mxs: add controller id
usb: phy: Add set_wakeup API
usb: phy-mxs: Add implementation of set_wakeup
usb: phy-mxs: Add system suspend/resume API
usb: phy-mxs: Add sync time after controller clear phcd
Documentation/devicetree/bindings/usb/mxs-phy.txt | 5 +- drivers/usb/phy/phy-mxs-usb.c | 308 ++++++++++++++++++++- include/linux/usb/phy.h | 16 + 3 files changed, 314 insertions(+), 15 deletions(-)
Signature · 1 line
1.7.8
PATCH v8 1/12 usb: doc: phy-mxs: Add more compatible strings
Add "fsl,imx6q-usbphy" for imx6dq and imx6dl, add
"fsl,imx6sl-usbphy" for imx6sl.
--- Documentation/devicetree/bindings/usb/mxs-phy.txt | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
Documentation/devicetree/bindings/usb/mxs-phy.txt +2 -1
@@ -1,7 +1,8 @@ * Freescale MXS USB Phy Device Required properties: -- compatible: Should be "fsl,imx23-usbphy" +- compatible: "fsl,imx23-usbphy" for imx23 and imx28, "fsl,imx6q-usbphy" + for imx6dq and imx6dl, "fsl,imx6sl-usbphy" for imx6sl - reg: Should contain registers location and length - interrupts: Should contain phy interrupt
Signature · 1 line
1.7.8
PATCH v8 2/12 usb: phy-mxs: Add platform judgement code
In reply to Peter ChenThe mxs-phy has several bugs and features at different versions, the driver code can get it through of_device_id.data.
--- drivers/usb/phy/phy-mxs-usb.c | 58 ++++++++++++++++++++++++++++++++++------ 1 files changed, 49 insertions(+), 9 deletions(-)
drivers/usb/phy/phy-mxs-usb.c +49 -9
@@ -1,5 +1,5 @@/* -* Copyright 2012 Freescale Semiconductor, Inc. +* Copyright 2012-2013 Freescale Semiconductor, Inc. * Copyright (C) 2012 Marek Vasut <[email protected]> * on behalf of DENX Software Engineering GmbH *
@@ -20,6 +20,7 @@#include <linux/delay.h> #include <linux/err.h> #include <linux/io.h> +#include <linux/of_device.h> #define DRIVER_NAME "mxs_phy"
@@ -34,13 +35,55 @@#define BM_USBPHY_CTRL_ENUTMILEVEL2 BIT(14)#define BM_USBPHY_CTRL_ENHOSTDISCONDETECT BIT(1) +#define to_mxs_phy (p) container_of((p), struct mxs_phy, phy) + +/* Do disconnection between PHY and controller without vbus */ +#define MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS BIT(0) + +/* +* The PHY will be in messy if there is a wakeup after putting +* bus to suspend (set portsc.suspendM) but before setting PHY to low +* power mode (set portsc.phcd). +*/ +#define MXS_PHY_ABNORMAL_IN_SUSPEND BIT(1) + +/* +* The SOF sends too fast after resuming, it will cause disconnection +* between host and high speed device. +*/ +#define MXS_PHY_SENDING_SOF_TOO_FAST BIT(2) + +struct mxs_phy_data { +unsigned int flags; +}; + +static const struct mxs_phy_data imx23_phy_data = { + .flags =MXS_PHY_ABNORMAL_IN_SUSPEND |MXS_PHY_SENDING_SOF_TOO_FAST , +}; + +static const struct mxs_phy_data imx6q_phy_data = { + .flags =MXS_PHY_SENDING_SOF_TOO_FAST | +MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS , +}; + +static const struct mxs_phy_data imx6sl_phy_data = { + .flags =MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS , +}; + +static const struct of_device_id mxs_phy_dt_ids[] = { + { .compatible ="fsl,imx6sl-usbphy" , .data = &imx6sl_phy_data, }, + { .compatible ="fsl,imx6q-usbphy" , .data = &imx6q_phy_data, }, + { .compatible ="fsl,imx23-usbphy" , .data = &imx23_phy_data, }, + {/* sentinel */ } +}; +MODULE_DEVICE_TABLE (of, mxs_phy_dt_ids); +struct mxs_phy {struct usb_phy phy;struct clk *clk; +const struct mxs_phy_data *data; }; -#define to_mxs_phy (p) container_of((p), struct mxs_phy, phy) -static int mxs_phy_hw_init (struct mxs_phy *mxs_phy) {int ret;
@@ -131,6 +174,8 @@ static int mxs_phy_probe(struct platform_device *pdev)struct clk *clk;struct mxs_phy *mxs_phy;int ret; +const struct of_device_id *of_id = +of_match_device (mxs_phy_dt_ids, &pdev->dev); res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); base =devm_ioremap_resource (&pdev->dev, res);
@@ -163,6 +208,7 @@ static int mxs_phy_probe(struct platform_device *pdev)ATOMIC_INIT_NOTIFIER_HEAD (&mxs_phy->phy.notifier); mxs_phy->clk = clk; + mxs_phy->data = of_id->data;platform_set_drvdata (pdev, mxs_phy);
@@ -182,12 +228,6 @@ static int mxs_phy_remove(struct platform_device *pdev)return 0 ; } -static const struct of_device_id mxs_phy_dt_ids[] = { - { .compatible ="fsl,imx23-usbphy" , }, - {/* sentinel */ } -}; -MODULE_DEVICE_TABLE (of, mxs_phy_dt_ids); -static struct platform_driver mxs_phy_driver = { .probe = mxs_phy_probe, .remove = mxs_phy_remove,
Signature · 1 line
1.7.8
PATCH v8 3/12 usb: phy-mxs: Add auto clock and power setting
In reply to Peter ChenThe auto setting is used to open related power and clocks automatically after receiving wakeup signal.
With this feature, the PHY's clock and power can be recovered correctly from low power mode, it is guaranteed by IC logic.
--- drivers/usb/phy/phy-mxs-usb.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-)
drivers/usb/phy/phy-mxs-usb.c +17 -3
@@ -31,6 +31,11 @@#define BM_USBPHY_CTRL_SFTRST BIT(31)#define BM_USBPHY_CTRL_CLKGATE BIT(30) +#define BM_USBPHY_CTRL_ENAUTOSET_USBCLKS BIT(26) +#define BM_USBPHY_CTRL_ENAUTOCLR_USBCLKGATE BIT(25) +#define BM_USBPHY_CTRL_ENAUTOCLR_PHY_PWD BIT(20) +#define BM_USBPHY_CTRL_ENAUTOCLR_CLKGATE BIT(19) +#define BM_USBPHY_CTRL_ENAUTO_PWRON_PLL BIT(18)#define BM_USBPHY_CTRL_ENUTMILEVEL3 BIT(15)#define BM_USBPHY_CTRL_ENUTMILEVEL2 BIT(14)#define BM_USBPHY_CTRL_ENHOSTDISCONDETECT BIT(1)
@@ -96,9 +101,18 @@ static int mxs_phy_hw_init(struct mxs_phy *mxs_phy)/* Power up the PHY */ writel (0 , base +HW_USBPHY_PWD ); -/* enable FS/LS device */ -writel (BM_USBPHY_CTRL_ENUTMILEVEL2 | -BM_USBPHY_CTRL_ENUTMILEVEL3 , +/* +* USB PHY Ctrl Setting +* - Auto clock/power on +* - Enable full/low speed support +*/ +writel (BM_USBPHY_CTRL_ENAUTOSET_USBCLKS | +BM_USBPHY_CTRL_ENAUTOCLR_USBCLKGATE | +BM_USBPHY_CTRL_ENAUTOCLR_PHY_PWD | +BM_USBPHY_CTRL_ENAUTOCLR_CLKGATE | +BM_USBPHY_CTRL_ENAUTO_PWRON_PLL | +BM_USBPHY_CTRL_ENUTMILEVEL2 | +BM_USBPHY_CTRL_ENUTMILEVEL3 , base +HW_USBPHY_CTRL_SET );return 0 ;
Signature · 1 line
1.7.8
PATCH v8 4/12 usb: doc: phy-mxs: update binding for adding anatop phandle
In reply to Peter ChenAdd anatop phandle which is used to access anatop registers to control PHY's power and other USB operations.
--- Documentation/devicetree/bindings/usb/mxs-phy.txt | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
Documentation/devicetree/bindings/usb/mxs-phy.txt +2 -0
@@ -5,10 +5,12 @@ Required properties: for imx6dq and imx6dl, "fsl,imx6sl-usbphy" for imx6sl - reg: Should contain registers location and length - interrupts: Should contain phy interrupt +- fsl,anatop: phandle for anatop register, it is only for imx6 SoC series Example: usbphy1: usbphy at 020c9000 { compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy"; reg = <0x020c9000 0x1000>; interrupts = <0 44 0x04>; + fsl,anatop = <&anatop>; };
Signature · 1 line
1.7.8
PATCH v8 5/12 usb: phy-mxs: Add anatop regmap
In reply to Peter ChenIt is needed by imx6 SoC series, but not for imx23 and imx28.
--- drivers/usb/phy/phy-mxs-usb.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-)
drivers/usb/phy/phy-mxs-usb.c +15 -0
@@ -21,6 +21,8 @@#include <linux/err.h> #include <linux/io.h> #include <linux/of_device.h> +#include <linux/regmap.h> +#include <linux/mfd/syscon.h> #define DRIVER_NAME "mxs_phy"
@@ -87,6 +89,7 @@ struct mxs_phy {struct usb_phy phy;struct clk *clk;const struct mxs_phy_data *data; +struct regmap *regmap_anatop; };static int mxs_phy_hw_init (struct mxs_phy *mxs_phy)
@@ -190,6 +193,7 @@ static int mxs_phy_probe(struct platform_device *pdev)int ret;const struct of_device_id *of_id =of_match_device (mxs_phy_dt_ids, &pdev->dev); +struct device_node *np = pdev->dev.of_node; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); base =devm_ioremap_resource (&pdev->dev, res);
@@ -209,6 +213,17 @@ static int mxs_phy_probe(struct platform_device *pdev)return -ENOMEM ; } +/* Some SoCs don't have anatop registers */ +if (of_get_property (np,"fsl,anatop" ,NULL )) { + mxs_phy->regmap_anatop =syscon_regmap_lookup_by_phandle + (np,"fsl,anatop" ); +if (IS_ERR (mxs_phy->regmap_anatop)) { +dev_dbg (&pdev->dev, +"failed to find regmap for anatop\n" ); +return PTR_ERR (mxs_phy->regmap_anatop); + } + } + mxs_phy->phy.io_priv = base; mxs_phy->phy.dev = &pdev->dev; mxs_phy->phy.label =DRIVER_NAME ;
Signature · 1 line
1.7.8
PATCH v8 6/12 usb: phy-mxs: change description of usb device speed
In reply to Peter ChenChange "high speed" to "HS"
Change "non-high speed" to "FS/LS"
Implementation of notify_suspend and notify_resume will be different according to mxs_phy_data->flags.
--- drivers/usb/phy/phy-mxs-usb.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/usb/phy/phy-mxs-usb.c +4 -4
@@ -161,8 +161,8 @@ static int mxs_phy_suspend(struct usb_phy *x, int suspend)static int mxs_phy_on_connect (struct usb_phy *phy,enum usb_device_speed speed) { -dev_dbg (phy->dev,"%s speed device has connected\n" , - (speed ==USB_SPEED_HIGH ) ?"high" :"non-high" ); +dev_dbg (phy->dev,"%s device has connected\n" , + (speed ==USB_SPEED_HIGH ) ?"HS" :"FS/LS" );if (speed ==USB_SPEED_HIGH ) writel(BM_USBPHY_CTRL_ENHOSTDISCONDETECT,
@@ -174,8 +174,8 @@ static int mxs_phy_on_connect(struct usb_phy *phy,static int mxs_phy_on_disconnect (struct usb_phy *phy,enum usb_device_speed speed) { -dev_dbg (phy->dev,"%s speed device has disconnected\n" , - (speed ==USB_SPEED_HIGH ) ?"high" :"non-high" ); +dev_dbg (phy->dev,"%s device has disconnected\n" , + (speed ==USB_SPEED_HIGH ) ?"HS" :"FS/LS" );if (speed ==USB_SPEED_HIGH ) writel(BM_USBPHY_CTRL_ENHOSTDISCONDETECT,
Signature · 1 line
1.7.8
PATCH v8 7/12 usb: phy-mxs: Enable IC fixes for related SoCs
In reply to Peter ChenTwo PHY bugs are fixed by IC logic, but these bits are not enabled by default, so we enable them at driver.
The two bugs are: MXS_PHY_ABNORMAL_IN_SUSPEND and MXS_PHY_SENDING_SOF_TOO_FAST which are described at code.
--- drivers/usb/phy/phy-mxs-usb.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-)
drivers/usb/phy/phy-mxs-usb.c +21 -2
@@ -31,6 +31,10 @@#define HW_USBPHY_CTRL_SET 0x34#define HW_USBPHY_CTRL_CLR 0x38 +#define HW_USBPHY_IP 0x90 +#define HW_USBPHY_IP_SET 0x94 +#define HW_USBPHY_IP_CLR 0x98 +#define BM_USBPHY_CTRL_SFTRST BIT(31)#define BM_USBPHY_CTRL_CLKGATE BIT(30)#define BM_USBPHY_CTRL_ENAUTOSET_USBCLKS BIT(26)
@@ -42,6 +46,8 @@#define BM_USBPHY_CTRL_ENUTMILEVEL2 BIT(14)#define BM_USBPHY_CTRL_ENHOSTDISCONDETECT BIT(1) +#define BM_USBPHY_IP_FIX (BIT(17) | BIT(18)) +#define to_mxs_phy (p) container_of((p), struct mxs_phy, phy)/* Do disconnection between PHY and controller without vbus */
@@ -60,6 +66,14 @@*/ #define MXS_PHY_SENDING_SOF_TOO_FAST BIT(2) +/* +* IC has bug fixes logic, they include +* MXS_PHY_ABNORMAL_IN_SUSPEND and MXS_PHY_SENDING_SOF_TOO_FAST +* which are described at above flags, the RTL will handle it +* according to different versions. +*/ +#define MXS_PHY_NEED_IP_FIX BIT(3) +struct mxs_phy_data {unsigned int flags; };
@@ -70,11 +84,13 @@ static const struct mxs_phy_data imx23_phy_data = {static const struct mxs_phy_data imx6q_phy_data = { .flags =MXS_PHY_SENDING_SOF_TOO_FAST | -MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS , +MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS | +MXS_PHY_NEED_IP_FIX , };static const struct mxs_phy_data imx6sl_phy_data = { - .flags =MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS , + .flags =MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS | +MXS_PHY_NEED_IP_FIX , };static const struct of_device_id mxs_phy_dt_ids[] = {
@@ -118,6 +134,9 @@ static int mxs_phy_hw_init(struct mxs_phy *mxs_phy)BM_USBPHY_CTRL_ENUTMILEVEL3 , base + HW_USBPHY_CTRL_SET); +if (mxs_phy->data->flags &MXS_PHY_NEED_IP_FIX ) +writel (BM_USBPHY_IP_FIX , base +HW_USBPHY_IP_SET ); +return 0 ; }
Signature · 1 line
1.7.8
PATCH v8 8/12 usb: phy-mxs: add controller id
In reply to Peter ChenIt is used to access un-regulator registers according to different controllers.
--- drivers/usb/phy/phy-mxs-usb.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
drivers/usb/phy/phy-mxs-usb.c +6 -0
@@ -106,6 +106,7 @@ struct mxs_phy {struct clk *clk;const struct mxs_phy_data *data;struct regmap *regmap_anatop; +int port_id; };static int mxs_phy_hw_init (struct mxs_phy *mxs_phy)
@@ -243,6 +244,11 @@ static int mxs_phy_probe(struct platform_device *pdev) } } + ret =of_alias_get_id (np,"usbphy" ); +if (ret <0 ) +dev_dbg (&pdev->dev,"failed to get alias id, errno %d\n" , ret); + mxs_phy->port_id = ret; + mxs_phy->phy.io_priv = base; mxs_phy->phy.dev = &pdev->dev; mxs_phy->phy.label =DRIVER_NAME ;
Signature · 1 line
1.7.8
PATCH v8 9/12 usb: phy: Add set_wakeup API
In reply to Peter ChenThis API is used to set wakeup enable at PHY registers, in that case, the PHY can be waken up from suspend due to external events, like vbus change, dp/dm change and id change.
--- include/linux/usb/phy.h | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-)
include/linux/usb/phy.h +16 -0
@@ -111,6 +111,13 @@ struct usb_phy {int (*set_suspend)(struct usb_phy *x,int suspend); +/* +* Set wakeup enable for PHY, in that case, the PHY can be +* waken up from suspend status due to external events, +* like vbus change, dp/dm change and id. +*/ +int (*set_wakeup)(struct usb_phy *x,bool enabled); +/* notify phy connect status change */ int (*notify_connect)(struct usb_phy *x,enum usb_device_speed speed);
@@ -265,6 +272,15 @@ usb_phy_set_suspend(struct usb_phy *x, int suspend) }static inline int +usb_phy_set_wakeup (struct usb_phy *x,bool enabled) +{ +if (x && x->set_wakeup) +return x->set_wakeup (x, enabled); +else +return 0 ; +} + +static inline int usb_phy_notify_connect (struct usb_phy *x,enum usb_device_speed speed) {if (x && x->notify_connect)
Signature · 1 line
1.7.8
PATCH v8 10/12 usb: phy-mxs: Add implementation of set_wakeup
In reply to Peter ChenWhen we need the PHY can be waken up by external signals, we can call this API. Besides, we call mxs_phy_disconnect_line at this API to close the connection between USB PHY and controller, after that, the line state from controller is SE0. Once the PHY is out of power, without calling mxs_phy_disconnect_line, there are unknown wakeups due to dp/dm floating at device mode.
--- drivers/usb/phy/phy-mxs-usb.c | 116 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 116 insertions(+), 0 deletions(-)
drivers/usb/phy/phy-mxs-usb.c +116 -0
@@ -31,6 +31,9 @@#define HW_USBPHY_CTRL_SET 0x34#define HW_USBPHY_CTRL_CLR 0x38 +#define HW_USBPHY_DEBUG_SET 0x54 +#define HW_USBPHY_DEBUG_CLR 0x58 +#define HW_USBPHY_IP 0x90#define HW_USBPHY_IP_SET 0x94#define HW_USBPHY_IP_CLR 0x98
@@ -39,6 +42,9 @@#define BM_USBPHY_CTRL_CLKGATE BIT(30)#define BM_USBPHY_CTRL_ENAUTOSET_USBCLKS BIT(26)#define BM_USBPHY_CTRL_ENAUTOCLR_USBCLKGATE BIT(25) +#define BM_USBPHY_CTRL_ENVBUSCHG_WKUP BIT(23) +#define BM_USBPHY_CTRL_ENIDCHG_WKUP BIT(22) +#define BM_USBPHY_CTRL_ENDPDMCHG_WKUP BIT(21)#define BM_USBPHY_CTRL_ENAUTOCLR_PHY_PWD BIT(20)#define BM_USBPHY_CTRL_ENAUTOCLR_CLKGATE BIT(19)#define BM_USBPHY_CTRL_ENAUTO_PWRON_PLL BIT(18)
@@ -48,6 +54,25 @@#define BM_USBPHY_IP_FIX (BIT(17) | BIT(18)) +#define BM_USBPHY_DEBUG_CLKGATE BIT(30) + +/* Anatop Registers */ +#define ANADIG_USB1_VBUS_DET_STAT 0x1c0 +#define ANADIG_USB2_VBUS_DET_STAT 0x220 + +#define ANADIG_USB1_LOOPBACK_SET 0x1e4 +#define ANADIG_USB1_LOOPBACK_CLR 0x1e8 +#define ANADIG_USB2_LOOPBACK_SET 0x244 +#define ANADIG_USB2_LOOPBACK_CLR 0x248 + +#define BM_ANADIG_USB1_VBUS_DET_STAT_VBUS_VALID BIT(3) +#define BM_ANADIG_USB2_VBUS_DET_STAT_VBUS_VALID BIT(3) + +#define BM_ANADIG_USB1_LOOPBACK_UTMI_DIG_TST1 BIT(2) +#define BM_ANADIG_USB1_LOOPBACK_TSTI_TX_EN BIT(5) +#define BM_ANADIG_USB2_LOOPBACK_UTMI_DIG_TST1 BIT(2) +#define BM_ANADIG_USB2_LOOPBACK_TSTI_TX_EN BIT(5) +#define to_mxs_phy (p) container_of((p), struct mxs_phy, phy)/* Do disconnection between PHY and controller without vbus */
@@ -141,6 +166,79 @@ static int mxs_phy_hw_init(struct mxs_phy *mxs_phy)return 0 ; } +/* Return true if the vbus is there */ +static bool mxs_phy_get_vbus_status (struct mxs_phy *mxs_phy) +{ +unsigned int vbus_value; + +if (mxs_phy->port_id ==0 ) +regmap_read (mxs_phy->regmap_anatop, +ANADIG_USB1_VBUS_DET_STAT , + &vbus_value); +else if (mxs_phy->port_id ==1 ) +regmap_read (mxs_phy->regmap_anatop, +ANADIG_USB2_VBUS_DET_STAT , + &vbus_value); + +if (vbus_value &BM_ANADIG_USB1_VBUS_DET_STAT_VBUS_VALID ) +return true; +else +return false; +} + +static void __mxs_phy_disconnect_line (struct mxs_phy *mxs_phy,bool disconnect) +{ +void __iomem *base = mxs_phy->phy.io_priv; +u32 reg; + +if (disconnect) +writel_relaxed (BM_USBPHY_DEBUG_CLKGATE , + base +HW_USBPHY_DEBUG_CLR ); + +if (mxs_phy->port_id ==0 ) { + reg = disconnect ?ANADIG_USB1_LOOPBACK_SET + :ANADIG_USB1_LOOPBACK_CLR ; +regmap_write (mxs_phy->regmap_anatop, reg, +BM_ANADIG_USB1_LOOPBACK_UTMI_DIG_TST1 | +BM_ANADIG_USB1_LOOPBACK_TSTI_TX_EN ); + }else if (mxs_phy->port_id ==1 ) { + reg = disconnect ?ANADIG_USB2_LOOPBACK_SET + :ANADIG_USB2_LOOPBACK_CLR ; +regmap_write (mxs_phy->regmap_anatop, reg, +BM_ANADIG_USB2_LOOPBACK_UTMI_DIG_TST1 | +BM_ANADIG_USB2_LOOPBACK_TSTI_TX_EN ); + } + +if (!disconnect) +writel_relaxed (BM_USBPHY_DEBUG_CLKGATE , + base +HW_USBPHY_DEBUG_SET ); + +/* Delay some time, and let Linestate be SE0 for controller */ +if (disconnect) +usleep_range (500 ,1000 ); +} + +static void mxs_phy_disconnect_line (struct mxs_phy *mxs_phy,bool on) +{ +bool vbus_is_on = false; + +/* If the SoCs don't need to disconnect line without vbus, quit */ +if (!(mxs_phy->data->flags &MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS )) +return ; + +/* If the SoCs don't have anatop, quit */ +if (!mxs_phy->regmap_anatop) +return ; + + vbus_is_on =mxs_phy_get_vbus_status (mxs_phy); + +if (on && !vbus_is_on) +__mxs_phy_disconnect_line (mxs_phy, true); +else +__mxs_phy_disconnect_line (mxs_phy, false); + +} +static int mxs_phy_init (struct usb_phy *phy) {struct mxs_phy *mxs_phy =to_mxs_phy (phy);
@@ -178,6 +276,23 @@ static int mxs_phy_suspend(struct usb_phy *x, int suspend)return 0 ; } +static int mxs_phy_set_wakeup (struct usb_phy *x,bool enabled) +{ +struct mxs_phy *mxs_phy =to_mxs_phy (x); +u32 value =BM_USBPHY_CTRL_ENVBUSCHG_WKUP | +BM_USBPHY_CTRL_ENDPDMCHG_WKUP | +BM_USBPHY_CTRL_ENIDCHG_WKUP ; +if (enabled) { +mxs_phy_disconnect_line (mxs_phy, true); +writel_relaxed (value, x->io_priv +HW_USBPHY_CTRL_SET ); + }else { +writel_relaxed (value, x->io_priv +HW_USBPHY_CTRL_CLR ); +mxs_phy_disconnect_line (mxs_phy, false); + } + +return 0 ; +} +static int mxs_phy_on_connect (struct usb_phy *phy,enum usb_device_speed speed) {
@@ -258,6 +373,7 @@ static int mxs_phy_probe(struct platform_device *pdev) mxs_phy->phy.notify_connect = mxs_phy_on_connect; mxs_phy->phy.notify_disconnect = mxs_phy_on_disconnect; mxs_phy->phy.type =USB_PHY_TYPE_USB2 ; + mxs_phy->phy.set_wakeup = mxs_phy_set_wakeup;ATOMIC_INIT_NOTIFIER_HEAD (&mxs_phy->phy.notifier);
Signature · 1 line
1.7.8
PATCH v8 11/12 usb: phy-mxs: Add system suspend/resume API
In reply to Peter ChenWe need this to keep PHY's power on or off during the system suspend mode. If we need to enable USB wakeup, then we must keep PHY's power being on during the system suspend mode. Otherwise, we need to keep PHY's power being off to save power.
--- drivers/usb/phy/phy-mxs-usb.c | 59 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-)
drivers/usb/phy/phy-mxs-usb.c +59 -0
@@ -57,6 +57,10 @@#define BM_USBPHY_DEBUG_CLKGATE BIT(30)/* Anatop Registers */ +#define ANADIG_ANA_MISC0 0x150 +#define ANADIG_ANA_MISC0_SET 0x154 +#define ANADIG_ANA_MISC0_CLR 0x158 +#define ANADIG_USB1_VBUS_DET_STAT 0x1c0#define ANADIG_USB2_VBUS_DET_STAT 0x220
@@ -65,6 +69,9 @@#define ANADIG_USB2_LOOPBACK_SET 0x244#define ANADIG_USB2_LOOPBACK_CLR 0x248 +#define BM_ANADIG_ANA_MISC0_STOP_MODE_CONFIG BIT(12) +#define BM_ANADIG_ANA_MISC0_STOP_MODE_CONFIG_SL BIT(11) +#define BM_ANADIG_USB1_VBUS_DET_STAT_VBUS_VALID BIT(3)#define BM_ANADIG_USB2_VBUS_DET_STAT_VBUS_VALID BIT(3)
@@ -134,6 +141,16 @@ struct mxs_phy {int port_id; }; +static inline bool is_imx6q_phy (struct mxs_phy *mxs_phy) +{ +return mxs_phy->data == &imx6q_phy_data; +} + +static inline bool is_imx6sl_phy (struct mxs_phy *mxs_phy) +{ +return mxs_phy->data == &imx6sl_phy_data; +} +static int mxs_phy_hw_init (struct mxs_phy *mxs_phy) {int ret;
@@ -239,6 +256,22 @@ static void mxs_phy_disconnect_line(struct mxs_phy *mxs_phy, bool on) } +static void mxs_phy_enable_ldo_in_suspend (struct mxs_phy *mxs_phy,bool on) +{ +unsigned int reg = on ?ANADIG_ANA_MISC0_SET :ANADIG_ANA_MISC0_CLR ; + +/* If the SoCs don't have anatop, quit */ +if (!mxs_phy->regmap_anatop) +return ; + +if (is_imx6q_phy (mxs_phy)) +regmap_write (mxs_phy->regmap_anatop, reg, +BM_ANADIG_ANA_MISC0_STOP_MODE_CONFIG ); +else if (is_imx6sl_phy (mxs_phy)) +regmap_write (mxs_phy->regmap_anatop, + reg,BM_ANADIG_ANA_MISC0_STOP_MODE_CONFIG_SL ); +} +static int mxs_phy_init (struct usb_phy *phy) {struct mxs_phy *mxs_phy =to_mxs_phy (phy);
@@ -382,6 +415,8 @@ static int mxs_phy_probe(struct platform_device *pdev)platform_set_drvdata (pdev, mxs_phy); +device_set_wakeup_capable (&pdev->dev, true); + ret =usb_add_phy_dev (&mxs_phy->phy);if (ret)return ret;
@@ -398,6 +433,29 @@ static int mxs_phy_remove(struct platform_device *pdev)return 0 ; } +static int mxs_phy_system_suspend (struct device *dev) +{ +struct mxs_phy *mxs_phy =dev_get_drvdata (dev); + +if (device_may_wakeup (dev)) +mxs_phy_enable_ldo_in_suspend (mxs_phy, true); + +return 0 ; +} + +static int mxs_phy_system_resume (struct device *dev) +{ +struct mxs_phy *mxs_phy =dev_get_drvdata (dev); + +if (device_may_wakeup (dev)) +mxs_phy_enable_ldo_in_suspend (mxs_phy, false); + +return 0 ; +} + +static SIMPLE_DEV_PM_OPS(mxs_phy_pm, mxs_phy_system_suspend, + mxs_phy_system_resume); +static struct platform_driver mxs_phy_driver = { .probe = mxs_phy_probe, .remove = mxs_phy_remove,
@@ -405,6 +463,7 @@ static struct platform_driver mxs_phy_driver = { .name = DRIVER_NAME, .owner = THIS_MODULE, .of_match_table = mxs_phy_dt_ids, + .pm = &mxs_phy_pm, }, };
Signature · 1 line
1.7.8
PATCH v8 11/12 usb: phy-mxs: Add system suspend/resume API
Hi,
Quoted 16 lines · Peter Chen
drivers/usb/phy/phy-mxs-usb.c +12
-0@@ -398,6 +433,29 @@ static int mxs_phy_remove(struct platform_device *pdev)return 0 ; } +static int mxs_phy_system_suspend (struct device *dev) +{ +struct mxs_phy *mxs_phy =dev_get_drvdata (dev); + +if (device_may_wakeup (dev)) +mxs_phy_enable_ldo_in_suspend (mxs_phy, true); + +return 0 ; +} + +static int mxs_phy_system_resume (struct device *dev) +{
drivers/usb/phy/phy-mxs-usb.c static int mxs_phy_remove(struct platform_device *pdev) · line 457
Quoted 10 lines
drivers/usb/phy/phy-mxs-usb.c +10
-0+struct mxs_phy *mxs_phy =dev_get_drvdata (dev); + +if (device_may_wakeup (dev)) +mxs_phy_enable_ldo_in_suspend (mxs_phy, false); + +return 0 ; +} + +static SIMPLE_DEV_PM_OPS(mxs_phy_pm, mxs_phy_system_suspend, + mxs_phy_system_resume);
this will give "Defined but not used" warnings when !PM_SLEEP.
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131226/be7bcff9/attachment.sig>
PATCH v8 11/12 usb: phy-mxs: Add system suspend/resume API
Quoted 23 lines · Felipe Balbi
Hi,
Quoted 20 lines · Peter Chen
drivers/usb/phy/phy-mxs-usb.c +16
-0@@ -398,6 +433,29 @@ static int mxs_phy_remove(struct platform_device *pdev)return 0 ; } +static int mxs_phy_system_suspend (struct device *dev) +{ +struct mxs_phy *mxs_phy =dev_get_drvdata (dev); + +if (device_may_wakeup (dev)) +mxs_phy_enable_ldo_in_suspend (mxs_phy, true); + +return 0 ; +} + +static int mxs_phy_system_resume (struct device *dev) +{ +struct mxs_phy *mxs_phy =dev_get_drvdata (dev); + +if (device_may_wakeup (dev)) +mxs_phy_enable_ldo_in_suspend (mxs_phy, false);
Quoted 9 lines
drivers/usb/phy/phy-mxs-usb.c static int mxs_phy_remove(struct platform_device *pdev) · line 457
Quoted 6 lines
drivers/usb/phy/phy-mxs-usb.c +6
-0+ +return 0 ; +} + +static SIMPLE_DEV_PM_OPS(mxs_phy_pm, mxs_phy_system_suspend, + mxs_phy_system_resume);this will give "Defined but not used" warnings when !PM_SLEEP.
Oh, sorry, will change.
Signature · 2 lines
Best Regards, Peter Chen
PATCH v8 12/12 usb: phy-mxs: Add sync time after controller clear phcd
In reply to Peter ChenAfter clear portsc.phcd, PHY needs 200us stable time for switch 32K clock to AHB clock.
--- drivers/usb/phy/phy-mxs-usb.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-)
drivers/usb/phy/phy-mxs-usb.c +11 -0
@@ -151,6 +151,15 @@ static inline bool is_imx6sl_phy(struct mxs_phy *mxs_phy)return mxs_phy->data == &imx6sl_phy_data; } +/* +* PHY needs some 32K cycles to switch from 32K clock to +* bus (such as AHB/AXI, etc) clock. +*/ +static void mxs_phy_clock_switch_delay (void ) +{ +usleep_range (300 ,400 ); +} +static int mxs_phy_hw_init (struct mxs_phy *mxs_phy) {int ret;
@@ -276,6 +285,7 @@ static int mxs_phy_init(struct usb_phy *phy) {struct mxs_phy *mxs_phy =to_mxs_phy (phy); +mxs_phy_clock_switch_delay ();clk_prepare_enable (mxs_phy->clk);return mxs_phy_hw_init (mxs_phy); }
@@ -300,6 +310,7 @@ static int mxs_phy_suspend(struct usb_phy *x, int suspend) x->io_priv + HW_USBPHY_CTRL_SET);clk_disable_unprepare (mxs_phy->clk); }else { +mxs_phy_clock_switch_delay ();clk_prepare_enable (mxs_phy->clk);writel (BM_USBPHY_CTRL_CLKGATE , x->io_priv +HW_USBPHY_CTRL_CLR );
Signature · 1 line
1.7.8