* [PATCH v7 01/14] usb: doc: phy-mxs: Add more compatible strings
2013-12-20 7:51 [PATCH v7 00/14] Add power management support for mxs phy Peter Chen
@ 2013-12-20 7:51 ` Peter Chen
2013-12-20 7:51 ` [PATCH v7 02/14] usb: phy-mxs: Add platform judgement code Peter Chen
` (9 subsequent siblings)
10 siblings, 0 replies; 26+ messages in thread
From: Peter Chen @ 2013-12-20 7:51 UTC (permalink / raw)
To: balbi, shawn.guo, rob.herring, grant.likely
Cc: marex, devicetree, m.grzeschik, frank.li, linux-doc, gregkh,
linux-usb, peter.chen, kernel, festevam, linux-arm-kernel
Add "fsl,imx6q-usbphy" for imx6dq and imx6dl, add
"fsl,imx6sl-usbphy" for imx6sl.
Signed-off-by: Peter Chen <peter.chen@freescale.com>
---
Documentation/devicetree/bindings/usb/mxs-phy.txt | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Documentation/devicetree/bindings/usb/mxs-phy.txt b/Documentation/devicetree/bindings/usb/mxs-phy.txt
index 5835b27..b43d4c9e 100644
--- a/Documentation/devicetree/bindings/usb/mxs-phy.txt
+++ b/Documentation/devicetree/bindings/usb/mxs-phy.txt
@@ -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
--
1.7.8
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v7 02/14] usb: phy-mxs: Add platform judgement code
2013-12-20 7:51 [PATCH v7 00/14] Add power management support for mxs phy Peter Chen
2013-12-20 7:51 ` [PATCH v7 01/14] usb: doc: phy-mxs: Add more compatible strings Peter Chen
@ 2013-12-20 7:51 ` Peter Chen
2013-12-20 7:51 ` [PATCH v7 03/14] usb: phy-mxs: Add auto clock and power setting Peter Chen
` (8 subsequent siblings)
10 siblings, 0 replies; 26+ messages in thread
From: Peter Chen @ 2013-12-20 7:51 UTC (permalink / raw)
To: balbi, shawn.guo, rob.herring, grant.likely
Cc: marex, devicetree, m.grzeschik, frank.li, linux-doc, gregkh,
linux-usb, peter.chen, kernel, festevam, linux-arm-kernel
The mxs-phy has several bugs and features at different
versions, the driver code can get it through of_device_id.data.
Signed-off-by: Peter Chen <peter.chen@freescale.com>
---
drivers/usb/phy/phy-mxs-usb.c | 58 ++++++++++++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 9 deletions(-)
diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
index 545844b..6d49040 100644
--- a/drivers/usb/phy/phy-mxs-usb.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 Freescale Semiconductor, Inc.
+ * Copyright 2012-2013 Freescale Semiconductor, Inc.
* Copyright (C) 2012 Marek Vasut <marex@denx.de>
* 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,
--
1.7.8
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v7 03/14] usb: phy-mxs: Add auto clock and power setting
2013-12-20 7:51 [PATCH v7 00/14] Add power management support for mxs phy Peter Chen
2013-12-20 7:51 ` [PATCH v7 01/14] usb: doc: phy-mxs: Add more compatible strings Peter Chen
2013-12-20 7:51 ` [PATCH v7 02/14] usb: phy-mxs: Add platform judgement code Peter Chen
@ 2013-12-20 7:51 ` Peter Chen
2013-12-20 7:52 ` [PATCH v7 04/14] usb: doc: phy-mxs: update binding for adding anatop phandle Peter Chen
` (7 subsequent siblings)
10 siblings, 0 replies; 26+ messages in thread
From: Peter Chen @ 2013-12-20 7:51 UTC (permalink / raw)
To: balbi, shawn.guo, rob.herring, grant.likely
Cc: marex, devicetree, m.grzeschik, frank.li, linux-doc, gregkh,
linux-usb, peter.chen, kernel, festevam, linux-arm-kernel
The 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.
Signed-off-by: Peter Chen <peter.chen@freescale.com>
---
drivers/usb/phy/phy-mxs-usb.c | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
index 6d49040..0c6f3bc 100644
--- a/drivers/usb/phy/phy-mxs-usb.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
@@ -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;
--
1.7.8
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v7 04/14] usb: doc: phy-mxs: update binding for adding anatop phandle
2013-12-20 7:51 [PATCH v7 00/14] Add power management support for mxs phy Peter Chen
` (2 preceding siblings ...)
2013-12-20 7:51 ` [PATCH v7 03/14] usb: phy-mxs: Add auto clock and power setting Peter Chen
@ 2013-12-20 7:52 ` Peter Chen
2013-12-20 7:52 ` [PATCH v7 05/14] ARM: dts: imx6: add anatop phandle for usbphy Peter Chen
` (6 subsequent siblings)
10 siblings, 0 replies; 26+ messages in thread
From: Peter Chen @ 2013-12-20 7:52 UTC (permalink / raw)
To: balbi, shawn.guo, rob.herring, grant.likely
Cc: linux-usb, linux-arm-kernel, festevam, marex, kernel, m.grzeschik,
frank.li, peter.chen, gregkh, devicetree, linux-doc
Add anatop phandle which is used to access anatop registers to
control PHY's power and other USB operations.
Signed-off-by: Peter Chen <peter.chen@freescale.com>
---
Documentation/devicetree/bindings/usb/mxs-phy.txt | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/Documentation/devicetree/bindings/usb/mxs-phy.txt b/Documentation/devicetree/bindings/usb/mxs-phy.txt
index b43d4c9e..fc6659d 100644
--- a/Documentation/devicetree/bindings/usb/mxs-phy.txt
+++ b/Documentation/devicetree/bindings/usb/mxs-phy.txt
@@ -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@020c9000 {
compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy";
reg = <0x020c9000 0x1000>;
interrupts = <0 44 0x04>;
+ fsl,anatop = <&anatop>;
};
--
1.7.8
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v7 05/14] ARM: dts: imx6: add anatop phandle for usbphy
2013-12-20 7:51 [PATCH v7 00/14] Add power management support for mxs phy Peter Chen
` (3 preceding siblings ...)
2013-12-20 7:52 ` [PATCH v7 04/14] usb: doc: phy-mxs: update binding for adding anatop phandle Peter Chen
@ 2013-12-20 7:52 ` Peter Chen
2013-12-20 7:52 ` [PATCH v7 08/14] usb: phy-mxs: Enable IC fixes for related SoCs Peter Chen
` (5 subsequent siblings)
10 siblings, 0 replies; 26+ messages in thread
From: Peter Chen @ 2013-12-20 7:52 UTC (permalink / raw)
To: balbi, shawn.guo, rob.herring, grant.likely
Cc: linux-usb, linux-arm-kernel, festevam, marex, kernel, m.grzeschik,
frank.li, peter.chen, gregkh, devicetree, linux-doc
Add anatop phandle for usbphy
Signed-off-by: Peter Chen <peter.chen@freescale.com>
---
arch/arm/boot/dts/imx6qdl.dtsi | 2 ++
arch/arm/boot/dts/imx6sl.dtsi | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 59154dc..4e74962 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -557,6 +557,7 @@
reg = <0x020c9000 0x1000>;
interrupts = <0 44 0x04>;
clocks = <&clks 182>;
+ fsl,anatop = <&anatop>;
};
usbphy2: usbphy@020ca000 {
@@ -564,6 +565,7 @@
reg = <0x020ca000 0x1000>;
interrupts = <0 45 0x04>;
clocks = <&clks 183>;
+ fsl,anatop = <&anatop>;
};
snvs@020cc000 {
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 28558f1..30322b5 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -489,6 +489,7 @@
reg = <0x020c9000 0x1000>;
interrupts = <0 44 0x04>;
clocks = <&clks IMX6SL_CLK_USBPHY1>;
+ fsl,anatop = <&anatop>;
};
usbphy2: usbphy@020ca000 {
@@ -496,6 +497,7 @@
reg = <0x020ca000 0x1000>;
interrupts = <0 45 0x04>;
clocks = <&clks IMX6SL_CLK_USBPHY2>;
+ fsl,anatop = <&anatop>;
};
snvs@020cc000 {
--
1.7.8
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v7 08/14] usb: phy-mxs: Enable IC fixes for related SoCs
2013-12-20 7:51 [PATCH v7 00/14] Add power management support for mxs phy Peter Chen
` (4 preceding siblings ...)
2013-12-20 7:52 ` [PATCH v7 05/14] ARM: dts: imx6: add anatop phandle for usbphy Peter Chen
@ 2013-12-20 7:52 ` Peter Chen
2013-12-20 7:52 ` [PATCH v7 09/14] ARM: dts: imx: add mxs phy controller id Peter Chen
` (4 subsequent siblings)
10 siblings, 0 replies; 26+ messages in thread
From: Peter Chen @ 2013-12-20 7:52 UTC (permalink / raw)
To: balbi, shawn.guo, rob.herring, grant.likely
Cc: linux-usb, linux-arm-kernel, festevam, marex, kernel, m.grzeschik,
frank.li, peter.chen, gregkh, devicetree, linux-doc
Two 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.
Signed-off-by: Peter Chen <peter.chen@freescale.com>
---
drivers/usb/phy/phy-mxs-usb.c | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
index 489096f..f28bdd8 100644
--- a/drivers/usb/phy/phy-mxs-usb.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
@@ -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 */
@@ -63,6 +69,14 @@
/* The SoCs who have anatop module */
#define MXS_PHY_HAS_ANATOP BIT(3)
+/*
+ * 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(4)
+
struct mxs_phy_data {
unsigned int flags;
};
@@ -74,12 +88,14 @@ 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_HAS_ANATOP,
+ MXS_PHY_HAS_ANATOP |
+ MXS_PHY_NEED_IP_FIX,
};
static const struct mxs_phy_data imx6sl_phy_data = {
.flags = MXS_PHY_DISCONNECT_LINE_WITHOUT_VBUS |
- MXS_PHY_HAS_ANATOP,
+ MXS_PHY_HAS_ANATOP |
+ MXS_PHY_NEED_IP_FIX,
};
static const struct of_device_id mxs_phy_dt_ids[] = {
@@ -123,6 +139,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;
}
--
1.7.8
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v7 09/14] ARM: dts: imx: add mxs phy controller id
2013-12-20 7:51 [PATCH v7 00/14] Add power management support for mxs phy Peter Chen
` (5 preceding siblings ...)
2013-12-20 7:52 ` [PATCH v7 08/14] usb: phy-mxs: Enable IC fixes for related SoCs Peter Chen
@ 2013-12-20 7:52 ` Peter Chen
[not found] ` <1387525930-27313-1-git-send-email-peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
` (3 subsequent siblings)
10 siblings, 0 replies; 26+ messages in thread
From: Peter Chen @ 2013-12-20 7:52 UTC (permalink / raw)
To: balbi, shawn.guo, rob.herring, grant.likely
Cc: linux-usb, linux-arm-kernel, festevam, marex, kernel, m.grzeschik,
frank.li, peter.chen, gregkh, devicetree, linux-doc
We need to use controller id to access different register regions
for mxs phy.
Signed-off-by: Peter Chen <peter.chen@freescale.com>
---
arch/arm/boot/dts/imx23.dtsi | 1 +
arch/arm/boot/dts/imx28.dtsi | 2 ++
arch/arm/boot/dts/imx6qdl.dtsi | 2 ++
arch/arm/boot/dts/imx6sl.dtsi | 2 ++
4 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
index c96ceae..a231f3d 100644
--- a/arch/arm/boot/dts/imx23.dtsi
+++ b/arch/arm/boot/dts/imx23.dtsi
@@ -23,6 +23,7 @@
serial1 = &auart1;
spi0 = &ssp0;
spi1 = &ssp1;
+ usbphy0 = &usbphy0;
};
cpus {
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index cda19c8..671dda0 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -32,6 +32,8 @@
serial4 = &auart4;
spi0 = &ssp1;
spi1 = &ssp2;
+ usbphy0 = &usbphy0;
+ usbphy1 = &usbphy1;
};
cpus {
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 4e74962..c23803d 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -33,6 +33,8 @@
spi1 = &ecspi2;
spi2 = &ecspi3;
spi3 = &ecspi4;
+ usbphy0 = &usbphy1;
+ usbphy1 = &usbphy2;
};
intc: interrupt-controller@00a01000 {
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 30322b5..a06d939 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -27,6 +27,8 @@
spi1 = &ecspi2;
spi2 = &ecspi3;
spi3 = &ecspi4;
+ usbphy0 = &usbphy1;
+ usbphy1 = &usbphy2;
};
cpus {
--
1.7.8
^ permalink raw reply related [flat|nested] 26+ messages in thread
[parent not found: <1387525930-27313-1-git-send-email-peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org>]
* [PATCH v7 06/14] usb: phy-mxs: Add anatop regmap
[not found] ` <1387525930-27313-1-git-send-email-peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
@ 2013-12-20 7:52 ` Peter Chen
2013-12-24 0:15 ` Shawn Guo
2013-12-20 7:52 ` [PATCH v7 07/14] usb: phy-mxs: change description of usb device speed Peter Chen
` (3 subsequent siblings)
4 siblings, 1 reply; 26+ messages in thread
From: Peter Chen @ 2013-12-20 7:52 UTC (permalink / raw)
To: balbi-l0cyMroinI0, shawn.guo-QSEj5FYQhm4dnm+yROfE0A,
rob.herring-bsGFqQB8/DxBDgjK7y7TUQ,
grant.likely-QSEj5FYQhm4dnm+yROfE0A
Cc: linux-usb-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
festevam-Re5JQEeQqe8AvxtiuMwx3w, marex-ynQEQJNshbs,
kernel-bIcnvbaLZ9MEGnE8C9+IrQ, m.grzeschik-bIcnvbaLZ9MEGnE8C9+IrQ,
frank.li-KZfg59tc24xl57MIdRCFDg,
peter.chen-KZfg59tc24xl57MIdRCFDg,
gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-doc-u79uwXL29TY76Z2rM5mHXA
It is needed by imx6 SoC series, but not for imx23 and imx28.
Signed-off-by: Peter Chen <peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
---
drivers/usb/phy/phy-mxs-usb.c | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
index 0c6f3bc..0ef930a 100644
--- a/drivers/usb/phy/phy-mxs-usb.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
@@ -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"
@@ -58,6 +60,9 @@
*/
#define MXS_PHY_SENDING_SOF_TOO_FAST BIT(2)
+/* The SoCs who have anatop module */
+#define MXS_PHY_HAS_ANATOP BIT(3)
+
struct mxs_phy_data {
unsigned int flags;
};
@@ -68,11 +73,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_HAS_ANATOP,
};
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_HAS_ANATOP,
};
static const struct of_device_id mxs_phy_dt_ids[] = {
@@ -87,6 +94,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 +198,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);
@@ -226,6 +235,16 @@ static int mxs_phy_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, mxs_phy);
+ if (mxs_phy->data->flags & MXS_PHY_HAS_ANATOP) {
+ 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);
+ }
+ }
+
ret = usb_add_phy_dev(&mxs_phy->phy);
if (ret)
return ret;
--
1.7.8
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 26+ messages in thread
* Re: [PATCH v7 06/14] usb: phy-mxs: Add anatop regmap
2013-12-20 7:52 ` [PATCH v7 06/14] usb: phy-mxs: Add anatop regmap Peter Chen
@ 2013-12-24 0:15 ` Shawn Guo
2013-12-24 1:20 ` Peter Chen
0 siblings, 1 reply; 26+ messages in thread
From: Shawn Guo @ 2013-12-24 0:15 UTC (permalink / raw)
To: Peter Chen
Cc: balbi, rob.herring, grant.likely, linux-usb, linux-arm-kernel,
festevam, marex, kernel, m.grzeschik, frank.li, gregkh,
devicetree, linux-doc
On Fri, Dec 20, 2013 at 03:52:02PM +0800, Peter Chen wrote:
> It is needed by imx6 SoC series, but not for imx23 and imx28.
>
> Signed-off-by: Peter Chen <peter.chen@freescale.com>
> ---
> drivers/usb/phy/phy-mxs-usb.c | 23 +++++++++++++++++++++--
> 1 files changed, 21 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
> index 0c6f3bc..0ef930a 100644
> --- a/drivers/usb/phy/phy-mxs-usb.c
> +++ b/drivers/usb/phy/phy-mxs-usb.c
> @@ -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"
>
> @@ -58,6 +60,9 @@
> */
> #define MXS_PHY_SENDING_SOF_TOO_FAST BIT(2)
>
> +/* The SoCs who have anatop module */
> +#define MXS_PHY_HAS_ANATOP BIT(3)
> +
> struct mxs_phy_data {
> unsigned int flags;
> };
> @@ -68,11 +73,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_HAS_ANATOP,
> };
>
> 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_HAS_ANATOP,
> };
>
> static const struct of_device_id mxs_phy_dt_ids[] = {
> @@ -87,6 +94,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 +198,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);
> @@ -226,6 +235,16 @@ static int mxs_phy_probe(struct platform_device *pdev)
>
> platform_set_drvdata(pdev, mxs_phy);
>
> + if (mxs_phy->data->flags & MXS_PHY_HAS_ANATOP) {
> + 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);
I'm looking at the merge dependency that Felipe mentions, and just think
of the DTB compatibility thing. Does the above code mean that USB will
be broken if someone runs the new kernel with an old DTB on his board?
We're entering the stage where we need to maintain the DTB compatibility
in kernel. That said, if users choose to upgrade their kernel only
(running with an old DTB), it's okay we do not give them new
features, but we shouldn't cause any regression/breakage for them.
Shawn
> + }
> + }
> +
> ret = usb_add_phy_dev(&mxs_phy->phy);
> if (ret)
> return ret;
> --
> 1.7.8
>
>
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v7 06/14] usb: phy-mxs: Add anatop regmap
2013-12-24 0:15 ` Shawn Guo
@ 2013-12-24 1:20 ` Peter Chen
[not found] ` <20131224012010.GA13518-KgLukfWpBlCctlrPMvKcciBecyulp+rMXqFh9Ls21Oc@public.gmane.org>
0 siblings, 1 reply; 26+ messages in thread
From: Peter Chen @ 2013-12-24 1:20 UTC (permalink / raw)
To: Shawn Guo
Cc: marex, devicetree, m.grzeschik, frank.li, linux-doc, gregkh,
linux-usb, rob.herring, balbi, kernel, grant.likely, festevam,
linux-arm-kernel
On Tue, Dec 24, 2013 at 08:15:00AM +0800, Shawn Guo wrote:
> On Fri, Dec 20, 2013 at 03:52:02PM +0800, Peter Chen wrote:
> > It is needed by imx6 SoC series, but not for imx23 and imx28.
> >
> > Signed-off-by: Peter Chen <peter.chen@freescale.com>
> > ---
> > drivers/usb/phy/phy-mxs-usb.c | 23 +++++++++++++++++++++--
> > 1 files changed, 21 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
> > index 0c6f3bc..0ef930a 100644
> > --- a/drivers/usb/phy/phy-mxs-usb.c
> > +++ b/drivers/usb/phy/phy-mxs-usb.c
> > @@ -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"
> >
> > @@ -58,6 +60,9 @@
> > */
> > #define MXS_PHY_SENDING_SOF_TOO_FAST BIT(2)
> >
> > +/* The SoCs who have anatop module */
> > +#define MXS_PHY_HAS_ANATOP BIT(3)
> > +
> > struct mxs_phy_data {
> > unsigned int flags;
> > };
> > @@ -68,11 +73,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_HAS_ANATOP,
> > };
> >
> > 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_HAS_ANATOP,
> > };
> >
> > static const struct of_device_id mxs_phy_dt_ids[] = {
> > @@ -87,6 +94,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 +198,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);
> > @@ -226,6 +235,16 @@ static int mxs_phy_probe(struct platform_device *pdev)
> >
> > platform_set_drvdata(pdev, mxs_phy);
> >
> > + if (mxs_phy->data->flags & MXS_PHY_HAS_ANATOP) {
> > + 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);
>
> I'm looking at the merge dependency that Felipe mentions, and just think
> of the DTB compatibility thing. Does the above code mean that USB will
> be broken if someone runs the new kernel with an old DTB on his board?
>
> We're entering the stage where we need to maintain the DTB compatibility
> in kernel. That said, if users choose to upgrade their kernel only
> (running with an old DTB), it's okay we do not give them new
> features, but we shouldn't cause any regression/breakage for them.
>
Then, this patch needs to change for old imx6 DTB. I will use of_find_property
like my previous version patch, do you think so?
http://marc.info/?l=linux-usb&m=138361742123380&w=2
I will send v8 just for this one (using my v3 patch) if you think two dts
related patches are ok.
--
Best Regards,
Peter Chen
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v7 07/14] usb: phy-mxs: change description of usb device speed
[not found] ` <1387525930-27313-1-git-send-email-peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2013-12-20 7:52 ` [PATCH v7 06/14] usb: phy-mxs: Add anatop regmap Peter Chen
@ 2013-12-20 7:52 ` Peter Chen
2013-12-20 10:40 ` David Laight
2013-12-20 7:52 ` [PATCH v7 10/14] usb: phy-mxs: add controller id Peter Chen
` (2 subsequent siblings)
4 siblings, 1 reply; 26+ messages in thread
From: Peter Chen @ 2013-12-20 7:52 UTC (permalink / raw)
To: balbi-l0cyMroinI0, shawn.guo-QSEj5FYQhm4dnm+yROfE0A,
rob.herring-bsGFqQB8/DxBDgjK7y7TUQ,
grant.likely-QSEj5FYQhm4dnm+yROfE0A
Cc: linux-usb-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
festevam-Re5JQEeQqe8AvxtiuMwx3w, marex-ynQEQJNshbs,
kernel-bIcnvbaLZ9MEGnE8C9+IrQ, m.grzeschik-bIcnvbaLZ9MEGnE8C9+IrQ,
frank.li-KZfg59tc24xl57MIdRCFDg,
peter.chen-KZfg59tc24xl57MIdRCFDg,
gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-doc-u79uwXL29TY76Z2rM5mHXA
Change "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.
Signed-off-by: Peter Chen <peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
---
drivers/usb/phy/phy-mxs-usb.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
index 0ef930a..489096f 100644
--- a/drivers/usb/phy/phy-mxs-usb.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
@@ -166,8 +166,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,
@@ -179,8 +179,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,
--
1.7.8
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 26+ messages in thread
* RE: [PATCH v7 07/14] usb: phy-mxs: change description of usb device speed
2013-12-20 7:52 ` [PATCH v7 07/14] usb: phy-mxs: change description of usb device speed Peter Chen
@ 2013-12-20 10:40 ` David Laight
[not found] ` <AE90C24D6B3A694183C094C60CF0A2F6026B74C0-CgBM+Bx2aUAnGFn1LkZF6NBPR1lH4CV8@public.gmane.org>
0 siblings, 1 reply; 26+ messages in thread
From: David Laight @ 2013-12-20 10:40 UTC (permalink / raw)
To: Peter Chen, balbi, shawn.guo, rob.herring, grant.likely
Cc: linux-usb, linux-arm-kernel, festevam, marex, kernel, m.grzeschik,
frank.li, gregkh, devicetree, linux-doc
> From: Peter Chen
> Sent: 20 December 2013 07:52
> Change "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.
>
> Signed-off-by: Peter Chen <peter.chen@freescale.com>
> ---
> drivers/usb/phy/phy-mxs-usb.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
> index 0ef930a..489096f 100644
> --- a/drivers/usb/phy/phy-mxs-usb.c
> +++ b/drivers/usb/phy/phy-mxs-usb.c
> @@ -166,8 +166,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");
Seems you are making these messages even more cryptic.
With all the speeds that USB supports remembering what 'full'
means is hard enough without having a cryptic acronym.
David
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v7 10/14] usb: phy-mxs: add controller id
[not found] ` <1387525930-27313-1-git-send-email-peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
2013-12-20 7:52 ` [PATCH v7 06/14] usb: phy-mxs: Add anatop regmap Peter Chen
2013-12-20 7:52 ` [PATCH v7 07/14] usb: phy-mxs: change description of usb device speed Peter Chen
@ 2013-12-20 7:52 ` Peter Chen
2013-12-24 2:08 ` Shawn Guo
2013-12-20 7:52 ` [PATCH v7 12/14] usb: phy-mxs: Add implementation of set_wakeup Peter Chen
2013-12-20 7:52 ` [PATCH v7 14/14] usb: phy-mxs: Add sync time after controller clear phcd Peter Chen
4 siblings, 1 reply; 26+ messages in thread
From: Peter Chen @ 2013-12-20 7:52 UTC (permalink / raw)
To: balbi-l0cyMroinI0, shawn.guo-QSEj5FYQhm4dnm+yROfE0A,
rob.herring-bsGFqQB8/DxBDgjK7y7TUQ,
grant.likely-QSEj5FYQhm4dnm+yROfE0A
Cc: linux-usb-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
festevam-Re5JQEeQqe8AvxtiuMwx3w, marex-ynQEQJNshbs,
kernel-bIcnvbaLZ9MEGnE8C9+IrQ, m.grzeschik-bIcnvbaLZ9MEGnE8C9+IrQ,
frank.li-KZfg59tc24xl57MIdRCFDg,
peter.chen-KZfg59tc24xl57MIdRCFDg,
gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-doc-u79uwXL29TY76Z2rM5mHXA
It is used to access un-regulator registers according to
different controllers.
Signed-off-by: Peter Chen <peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
---
drivers/usb/phy/phy-mxs-usb.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
index f28bdd8..09ece2b 100644
--- a/drivers/usb/phy/phy-mxs-usb.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
@@ -111,6 +111,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)
@@ -237,6 +238,13 @@ static int mxs_phy_probe(struct platform_device *pdev)
return -ENOMEM;
}
+ ret = of_alias_get_id(np, "usbphy");
+ if (ret < 0) {
+ dev_err(&pdev->dev, "failed to get alias id, errno %d\n", ret);
+ return ret;
+ }
+ mxs_phy->port_id = ret;
+
mxs_phy->phy.io_priv = base;
mxs_phy->phy.dev = &pdev->dev;
mxs_phy->phy.label = DRIVER_NAME;
--
1.7.8
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 26+ messages in thread
* Re: [PATCH v7 10/14] usb: phy-mxs: add controller id
2013-12-20 7:52 ` [PATCH v7 10/14] usb: phy-mxs: add controller id Peter Chen
@ 2013-12-24 2:08 ` Shawn Guo
2013-12-24 1:34 ` Peter Chen
0 siblings, 1 reply; 26+ messages in thread
From: Shawn Guo @ 2013-12-24 2:08 UTC (permalink / raw)
To: Peter Chen
Cc: balbi, rob.herring, grant.likely, linux-usb, linux-arm-kernel,
festevam, marex, kernel, m.grzeschik, frank.li, gregkh,
devicetree, linux-doc
On Fri, Dec 20, 2013 at 03:52:06PM +0800, Peter Chen wrote:
> It is used to access un-regulator registers according to
> different controllers.
>
> Signed-off-by: Peter Chen <peter.chen@freescale.com>
> ---
> drivers/usb/phy/phy-mxs-usb.c | 8 ++++++++
> 1 files changed, 8 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
> index f28bdd8..09ece2b 100644
> --- a/drivers/usb/phy/phy-mxs-usb.c
> +++ b/drivers/usb/phy/phy-mxs-usb.c
> @@ -111,6 +111,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)
> @@ -237,6 +238,13 @@ static int mxs_phy_probe(struct platform_device *pdev)
> return -ENOMEM;
> }
>
> + ret = of_alias_get_id(np, "usbphy");
> + if (ret < 0) {
> + dev_err(&pdev->dev, "failed to get alias id, errno %d\n", ret);
> + return ret;
> + }
It has the same compatibility issue with an old DTB. In case the alias
is not found, we should keep driver work in the existing way rather than
failing out.
Shawn
> + mxs_phy->port_id = ret;
> +
> mxs_phy->phy.io_priv = base;
> mxs_phy->phy.dev = &pdev->dev;
> mxs_phy->phy.label = DRIVER_NAME;
> --
> 1.7.8
>
>
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v7 10/14] usb: phy-mxs: add controller id
2013-12-24 2:08 ` Shawn Guo
@ 2013-12-24 1:34 ` Peter Chen
2013-12-24 2:25 ` Shawn Guo
0 siblings, 1 reply; 26+ messages in thread
From: Peter Chen @ 2013-12-24 1:34 UTC (permalink / raw)
To: Shawn Guo
Cc: balbi, rob.herring, grant.likely, linux-usb, linux-arm-kernel,
festevam, marex, kernel, m.grzeschik, frank.li, gregkh,
devicetree, linux-doc
On Tue, Dec 24, 2013 at 10:08:28AM +0800, Shawn Guo wrote:
> On Fri, Dec 20, 2013 at 03:52:06PM +0800, Peter Chen wrote:
> > It is used to access un-regulator registers according to
> > different controllers.
> >
> > Signed-off-by: Peter Chen <peter.chen@freescale.com>
> > ---
> > drivers/usb/phy/phy-mxs-usb.c | 8 ++++++++
> > 1 files changed, 8 insertions(+), 0 deletions(-)
> >
> > diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
> > index f28bdd8..09ece2b 100644
> > --- a/drivers/usb/phy/phy-mxs-usb.c
> > +++ b/drivers/usb/phy/phy-mxs-usb.c
> > @@ -111,6 +111,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)
> > @@ -237,6 +238,13 @@ static int mxs_phy_probe(struct platform_device *pdev)
> > return -ENOMEM;
> > }
> >
> > + ret = of_alias_get_id(np, "usbphy");
> > + if (ret < 0) {
> > + dev_err(&pdev->dev, "failed to get alias id, errno %d\n", ret);
> > + return ret;
> > + }
>
> It has the same compatibility issue with an old DTB. In case the alias
> is not found, we should keep driver work in the existing way rather than
> failing out.
>
Thanks, will change.
Do the two DTS patches are ok?
--
Best Regards,
Peter Chen
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v7 10/14] usb: phy-mxs: add controller id
2013-12-24 1:34 ` Peter Chen
@ 2013-12-24 2:25 ` Shawn Guo
2013-12-24 2:09 ` Peter Chen
0 siblings, 1 reply; 26+ messages in thread
From: Shawn Guo @ 2013-12-24 2:25 UTC (permalink / raw)
To: Peter Chen
Cc: balbi, rob.herring, grant.likely, linux-usb, linux-arm-kernel,
festevam, marex, kernel, m.grzeschik, frank.li, gregkh,
devicetree, linux-doc
On Tue, Dec 24, 2013 at 09:34:47AM +0800, Peter Chen wrote:
> On Tue, Dec 24, 2013 at 10:08:28AM +0800, Shawn Guo wrote:
> > On Fri, Dec 20, 2013 at 03:52:06PM +0800, Peter Chen wrote:
> > > It is used to access un-regulator registers according to
> > > different controllers.
> > >
> > > Signed-off-by: Peter Chen <peter.chen@freescale.com>
> > > ---
> > > drivers/usb/phy/phy-mxs-usb.c | 8 ++++++++
> > > 1 files changed, 8 insertions(+), 0 deletions(-)
> > >
> > > diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
> > > index f28bdd8..09ece2b 100644
> > > --- a/drivers/usb/phy/phy-mxs-usb.c
> > > +++ b/drivers/usb/phy/phy-mxs-usb.c
> > > @@ -111,6 +111,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)
> > > @@ -237,6 +238,13 @@ static int mxs_phy_probe(struct platform_device *pdev)
> > > return -ENOMEM;
> > > }
> > >
> > > + ret = of_alias_get_id(np, "usbphy");
> > > + if (ret < 0) {
> > > + dev_err(&pdev->dev, "failed to get alias id, errno %d\n", ret);
> > > + return ret;
> > > + }
> >
> > It has the same compatibility issue with an old DTB. In case the alias
> > is not found, we should keep driver work in the existing way rather than
> > failing out.
> >
>
> Thanks, will change.
>
> Do the two DTS patches are ok?
Yes. And with the DTS change being optional to kernel driver, the DTS
and driver changes can be merged independently through two trees. So
I just applied those two DTS patches.
Shawn
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v7 10/14] usb: phy-mxs: add controller id
2013-12-24 2:25 ` Shawn Guo
@ 2013-12-24 2:09 ` Peter Chen
[not found] ` <20131224020916.GC13518-KgLukfWpBlCctlrPMvKcciBecyulp+rMXqFh9Ls21Oc@public.gmane.org>
0 siblings, 1 reply; 26+ messages in thread
From: Peter Chen @ 2013-12-24 2:09 UTC (permalink / raw)
To: Shawn Guo
Cc: balbi, rob.herring, grant.likely, linux-usb, linux-arm-kernel,
festevam, marex, kernel, m.grzeschik, frank.li, gregkh,
devicetree, linux-doc
On Tue, Dec 24, 2013 at 10:25:17AM +0800, Shawn Guo wrote:
> On Tue, Dec 24, 2013 at 09:34:47AM +0800, Peter Chen wrote:
> > On Tue, Dec 24, 2013 at 10:08:28AM +0800, Shawn Guo wrote:
> > > On Fri, Dec 20, 2013 at 03:52:06PM +0800, Peter Chen wrote:
> > > > It is used to access un-regulator registers according to
> > > > different controllers.
> > > >
> > > > Signed-off-by: Peter Chen <peter.chen@freescale.com>
> > > > ---
> > > > drivers/usb/phy/phy-mxs-usb.c | 8 ++++++++
> > > > 1 files changed, 8 insertions(+), 0 deletions(-)
> > > >
> > > > diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
> > > > index f28bdd8..09ece2b 100644
> > > > --- a/drivers/usb/phy/phy-mxs-usb.c
> > > > +++ b/drivers/usb/phy/phy-mxs-usb.c
> > > > @@ -111,6 +111,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)
> > > > @@ -237,6 +238,13 @@ static int mxs_phy_probe(struct platform_device *pdev)
> > > > return -ENOMEM;
> > > > }
> > > >
> > > > + ret = of_alias_get_id(np, "usbphy");
> > > > + if (ret < 0) {
> > > > + dev_err(&pdev->dev, "failed to get alias id, errno %d\n", ret);
> > > > + return ret;
> > > > + }
> > >
> > > It has the same compatibility issue with an old DTB. In case the alias
> > > is not found, we should keep driver work in the existing way rather than
> > > failing out.
> > >
> >
> > Thanks, will change.
> >
> > Do the two DTS patches are ok?
>
> Yes. And with the DTS change being optional to kernel driver, the DTS
> and driver changes can be merged independently through two trees. So
> I just applied those two DTS patches.
>
Including doc update or not?
--
Best Regards,
Peter Chen
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v7 12/14] usb: phy-mxs: Add implementation of set_wakeup
[not found] ` <1387525930-27313-1-git-send-email-peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
` (2 preceding siblings ...)
2013-12-20 7:52 ` [PATCH v7 10/14] usb: phy-mxs: add controller id Peter Chen
@ 2013-12-20 7:52 ` Peter Chen
2013-12-20 7:52 ` [PATCH v7 14/14] usb: phy-mxs: Add sync time after controller clear phcd Peter Chen
4 siblings, 0 replies; 26+ messages in thread
From: Peter Chen @ 2013-12-20 7:52 UTC (permalink / raw)
To: balbi-l0cyMroinI0, shawn.guo-QSEj5FYQhm4dnm+yROfE0A,
rob.herring-bsGFqQB8/DxBDgjK7y7TUQ,
grant.likely-QSEj5FYQhm4dnm+yROfE0A
Cc: linux-usb-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
festevam-Re5JQEeQqe8AvxtiuMwx3w, marex-ynQEQJNshbs,
kernel-bIcnvbaLZ9MEGnE8C9+IrQ, m.grzeschik-bIcnvbaLZ9MEGnE8C9+IrQ,
frank.li-KZfg59tc24xl57MIdRCFDg,
peter.chen-KZfg59tc24xl57MIdRCFDg,
gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-doc-u79uwXL29TY76Z2rM5mHXA
When 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.
Signed-off-by: Peter Chen <peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
---
drivers/usb/phy/phy-mxs-usb.c | 116 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 116 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
index 09ece2b..d4812fc 100644
--- a/drivers/usb/phy/phy-mxs-usb.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
@@ -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 */
@@ -146,6 +171,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);
@@ -183,6 +281,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)
{
@@ -254,6 +369,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);
--
1.7.8
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v7 14/14] usb: phy-mxs: Add sync time after controller clear phcd
[not found] ` <1387525930-27313-1-git-send-email-peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
` (3 preceding siblings ...)
2013-12-20 7:52 ` [PATCH v7 12/14] usb: phy-mxs: Add implementation of set_wakeup Peter Chen
@ 2013-12-20 7:52 ` Peter Chen
4 siblings, 0 replies; 26+ messages in thread
From: Peter Chen @ 2013-12-20 7:52 UTC (permalink / raw)
To: balbi-l0cyMroinI0, shawn.guo-QSEj5FYQhm4dnm+yROfE0A,
rob.herring-bsGFqQB8/DxBDgjK7y7TUQ,
grant.likely-QSEj5FYQhm4dnm+yROfE0A
Cc: linux-usb-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
festevam-Re5JQEeQqe8AvxtiuMwx3w, marex-ynQEQJNshbs,
kernel-bIcnvbaLZ9MEGnE8C9+IrQ, m.grzeschik-bIcnvbaLZ9MEGnE8C9+IrQ,
frank.li-KZfg59tc24xl57MIdRCFDg,
peter.chen-KZfg59tc24xl57MIdRCFDg,
gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-doc-u79uwXL29TY76Z2rM5mHXA
After clear portsc.phcd, PHY needs 200us stable time for switch
32K clock to AHB clock.
Signed-off-by: Peter Chen <peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
---
drivers/usb/phy/phy-mxs-usb.c | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
index d75670a..6c3dae2 100644
--- a/drivers/usb/phy/phy-mxs-usb.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
@@ -156,6 +156,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;
@@ -281,6 +290,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);
}
@@ -305,6 +315,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);
--
1.7.8
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v7 11/14] usb: phy: Add set_wakeup API
2013-12-20 7:51 [PATCH v7 00/14] Add power management support for mxs phy Peter Chen
` (7 preceding siblings ...)
[not found] ` <1387525930-27313-1-git-send-email-peter.chen-KZfg59tc24xl57MIdRCFDg@public.gmane.org>
@ 2013-12-20 7:52 ` Peter Chen
2013-12-20 7:52 ` [PATCH v7 13/14] usb: phy-mxs: Add system suspend/resume API Peter Chen
2013-12-23 16:58 ` [PATCH v7 00/14] Add power management support for mxs phy Felipe Balbi
10 siblings, 0 replies; 26+ messages in thread
From: Peter Chen @ 2013-12-20 7:52 UTC (permalink / raw)
To: balbi, shawn.guo, rob.herring, grant.likely
Cc: linux-usb, linux-arm-kernel, festevam, marex, kernel, m.grzeschik,
frank.li, peter.chen, gregkh, devicetree, linux-doc
This 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.
Signed-off-by: Peter Chen <peter.chen@freescale.com>
---
include/linux/usb/phy.h | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h
index 6c0b1c5..c2c6f49 100644
--- a/include/linux/usb/phy.h
+++ b/include/linux/usb/phy.h
@@ -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)
--
1.7.8
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v7 13/14] usb: phy-mxs: Add system suspend/resume API
2013-12-20 7:51 [PATCH v7 00/14] Add power management support for mxs phy Peter Chen
` (8 preceding siblings ...)
2013-12-20 7:52 ` [PATCH v7 11/14] usb: phy: Add set_wakeup API Peter Chen
@ 2013-12-20 7:52 ` Peter Chen
2013-12-23 16:58 ` [PATCH v7 00/14] Add power management support for mxs phy Felipe Balbi
10 siblings, 0 replies; 26+ messages in thread
From: Peter Chen @ 2013-12-20 7:52 UTC (permalink / raw)
To: balbi, shawn.guo, rob.herring, grant.likely
Cc: linux-usb, linux-arm-kernel, festevam, marex, kernel, m.grzeschik,
frank.li, peter.chen, gregkh, devicetree, linux-doc
We 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.
Signed-off-by: Peter Chen <peter.chen@freescale.com>
---
drivers/usb/phy/phy-mxs-usb.c | 59 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 59 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
index d4812fc..d75670a 100644
--- a/drivers/usb/phy/phy-mxs-usb.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
@@ -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)
@@ -139,6 +146,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;
@@ -244,6 +261,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);
@@ -388,6 +421,8 @@ static int mxs_phy_probe(struct platform_device *pdev)
}
}
+ device_set_wakeup_capable(&pdev->dev, true);
+
ret = usb_add_phy_dev(&mxs_phy->phy);
if (ret)
return ret;
@@ -404,6 +439,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,
@@ -411,6 +469,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,
},
};
--
1.7.8
^ permalink raw reply related [flat|nested] 26+ messages in thread
* Re: [PATCH v7 00/14] Add power management support for mxs phy
2013-12-20 7:51 [PATCH v7 00/14] Add power management support for mxs phy Peter Chen
` (9 preceding siblings ...)
2013-12-20 7:52 ` [PATCH v7 13/14] usb: phy-mxs: Add system suspend/resume API Peter Chen
@ 2013-12-23 16:58 ` Felipe Balbi
10 siblings, 0 replies; 26+ messages in thread
From: Felipe Balbi @ 2013-12-23 16:58 UTC (permalink / raw)
To: Peter Chen
Cc: marex, devicetree, m.grzeschik, frank.li, linux-doc, gregkh,
linux-usb, rob.herring, balbi, kernel, grant.likely, shawn.guo,
festevam, linux-arm-kernel
[-- Attachment #1.1: Type: text/plain, Size: 1513 bytes --]
Hi,
On Fri, Dec 20, 2013 at 03:51:56PM +0800, Peter Chen wrote:
> 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.
I can't take all patches through my tree because it lacks acked-by's.
But I'm afraid there are dependencies with your patches.
> Peter Chen (14):
> usb: doc: phy-mxs: Add more compatible strings
ok
> usb: phy-mxs: Add platform judgement code
ok
> usb: phy-mxs: Add auto clock and power setting
ok
> usb: doc: phy-mxs: update binding for adding anatop phandle
ok
> ARM: dts: imx6: add anatop phandle for usbphy
misses Ack
> usb: phy-mxs: Add anatop regmap
depends on previous
> usb: phy-mxs: change description of usb device speed
ok
> usb: phy-mxs: Enable IC fixes for related SoCs
ok
> ARM: dts: imx: add mxs phy controller id
misses Ack
> usb: phy-mxs: add controller id
depends on previous
> usb: phy: Add set_wakeup API
ok
> usb: phy-mxs: Add implementation of set_wakeup
ok
> usb: phy-mxs: Add system suspend/resume API
ok
> usb: phy-mxs: Add sync time after controller clear phcd
ok
Considering the dependencies, I think it's safer to defer this patchset
until next merge window.
cheers
--
balbi
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 26+ messages in thread