Add support for 66AK2G usb instances. However, the driver needs to be updated
to support PM_RUNTIME. This update has been validated to work on K2L and boot
tested on K2HK and K2E.
Version 2:
Clarify clock properties requirements in binding document
Franklin S Cooper Jr (2):
usb: dwc3: keystone: Add PM_RUNTIME Support to DWC3 Keystone USB
driver
dt-bindings: usb: keystone-usb: Update bindings pm and clocks
properties
.../devicetree/bindings/usb/keystone-usb.txt | 17 +++++++++++++++--
drivers/usb/dwc3/dwc3-keystone.c | 22 ++++++++++------------
2 files changed, 25 insertions(+), 14 deletions(-)
--
2.9.4.dirty
For 66AK2Gx there is a requirement to use PM Runtime to properly manage
clocks and the power domains. Therefore, add PM runtime support. Remove
legacy clock api's calls since other users of this driver worked without
these clock apis calls.
Signed-off-by: Franklin S Cooper Jr <[email protected]>
---
drivers/usb/dwc3/dwc3-keystone.c | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/drivers/usb/dwc3/dwc3-keystone.c b/drivers/usb/dwc3/dwc3-keystone.c
index 12ee23f..d2ed952 100644
--- a/drivers/usb/dwc3/dwc3-keystone.c
+++ b/drivers/usb/dwc3/dwc3-keystone.c
@@ -15,7 +15,6 @@
* GNU General Public License for more details.
*/
-#include <linux/clk.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/interrupt.h>
@@ -23,6 +22,7 @@
#include <linux/dma-mapping.h>
#include <linux/io.h>
#include <linux/of_platform.h>
+#include <linux/pm_runtime.h>
/* USBSS register offsets */
#define USBSS_REVISION 0x0000
@@ -41,7 +41,6 @@
struct dwc3_keystone {
struct device *dev;
- struct clk *clk;
void __iomem *usbss;
};
@@ -106,17 +105,13 @@ static int kdwc3_probe(struct platform_device *pdev)
if (IS_ERR(kdwc->usbss))
return PTR_ERR(kdwc->usbss);
- kdwc->clk = devm_clk_get(kdwc->dev, "usb");
- if (IS_ERR(kdwc->clk)) {
- dev_err(kdwc->dev, "unable to get usb clock\n");
- return PTR_ERR(kdwc->clk);
- }
+ pm_runtime_enable(kdwc->dev);
- error = clk_prepare_enable(kdwc->clk);
+ error = pm_runtime_get_sync(kdwc->dev);
if (error < 0) {
- dev_err(kdwc->dev, "unable to enable usb clock, error %d\n",
+ dev_err(kdwc->dev, "pm_runtime_get_sync failed, error %d\n",
error);
- return error;
+ goto err_irq;
}
irq = platform_get_irq(pdev, 0);
@@ -147,7 +142,8 @@ static int kdwc3_probe(struct platform_device *pdev)
err_core:
kdwc3_disable_irqs(kdwc);
err_irq:
- clk_disable_unprepare(kdwc->clk);
+ pm_runtime_put_sync(kdwc->dev);
+ pm_runtime_disable(kdwc->dev);
return error;
}
@@ -167,7 +163,9 @@ static int kdwc3_remove(struct platform_device *pdev)
kdwc3_disable_irqs(kdwc);
device_for_each_child(&pdev->dev, NULL, kdwc3_remove_core);
- clk_disable_unprepare(kdwc->clk);
+ pm_runtime_put_sync(kdwc->dev);
+ pm_runtime_disable(kdwc->dev);
+
platform_set_drvdata(pdev, NULL);
return 0;
--
2.9.4.dirty
Update various properties to properly indicate their requirement depending
on the SoC.
Signed-off-by: Franklin S Cooper Jr <[email protected]>
---
Version 2:
Clarify clock requirements in binding document
Documentation/devicetree/bindings/usb/keystone-usb.txt | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/usb/keystone-usb.txt b/Documentation/devicetree/bindings/usb/keystone-usb.txt
index 60527d3..2d1bef1 100644
--- a/Documentation/devicetree/bindings/usb/keystone-usb.txt
+++ b/Documentation/devicetree/bindings/usb/keystone-usb.txt
@@ -12,8 +12,21 @@ Required properties:
MPU.
- ranges: allows valid 1:1 translation between child's address space and
parent's address space.
- - clocks: Clock IDs array as required by the controller.
- - clock-names: names of clocks correseponding to IDs in the clock property.
+
+SoC-specific Required Properties:
+The following are mandatory properties for Keystone 2 66AK2HK, 66AK2L and 66AK2E
+SoCs only:
+
+- clocks: Clock ID for USB functional clock.
+- clock-names: Must be "usb".
+
+
+The following are mandatory properties for Keystone 2 66AK2G SoCs only:
+
+- power-domains: Should contain a phandle to a PM domain provider node
+ and an args specifier containing the USB device id
+ value. This property is as per the binding,
+ Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
Sub-nodes:
The dwc3 core should be added as subnode to Keystone DWC3 glue.
--
2.9.4.dirty
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
On 17/08/17 00:54, Franklin S Cooper Jr wrote:
> For 66AK2Gx there is a requirement to use PM Runtime to properly manage
> clocks and the power domains. Therefore, add PM runtime support. Remove
> legacy clock api's calls since other users of this driver worked without
> these clock apis calls.
>
> Signed-off-by: Franklin S Cooper Jr <[email protected]>
Acked-by: Roger Quadros <[email protected]>
> ---
> drivers/usb/dwc3/dwc3-keystone.c | 22 ++++++++++------------
> 1 file changed, 10 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/usb/dwc3/dwc3-keystone.c b/drivers/usb/dwc3/dwc3-keystone.c
> index 12ee23f..d2ed952 100644
> --- a/drivers/usb/dwc3/dwc3-keystone.c
> +++ b/drivers/usb/dwc3/dwc3-keystone.c
> @@ -15,7 +15,6 @@
> * GNU General Public License for more details.
> */
>
> -#include <linux/clk.h>
> #include <linux/module.h>
> #include <linux/kernel.h>
> #include <linux/interrupt.h>
> @@ -23,6 +22,7 @@
> #include <linux/dma-mapping.h>
> #include <linux/io.h>
> #include <linux/of_platform.h>
> +#include <linux/pm_runtime.h>
>
> /* USBSS register offsets */
> #define USBSS_REVISION 0x0000
> @@ -41,7 +41,6 @@
>
> struct dwc3_keystone {
> struct device *dev;
> - struct clk *clk;
> void __iomem *usbss;
> };
>
> @@ -106,17 +105,13 @@ static int kdwc3_probe(struct platform_device *pdev)
> if (IS_ERR(kdwc->usbss))
> return PTR_ERR(kdwc->usbss);
>
> - kdwc->clk = devm_clk_get(kdwc->dev, "usb");
> - if (IS_ERR(kdwc->clk)) {
> - dev_err(kdwc->dev, "unable to get usb clock\n");
> - return PTR_ERR(kdwc->clk);
> - }
> + pm_runtime_enable(kdwc->dev);
>
> - error = clk_prepare_enable(kdwc->clk);
> + error = pm_runtime_get_sync(kdwc->dev);
> if (error < 0) {
> - dev_err(kdwc->dev, "unable to enable usb clock, error %d\n",
> + dev_err(kdwc->dev, "pm_runtime_get_sync failed, error %d\n",
> error);
> - return error;
> + goto err_irq;
> }
>
> irq = platform_get_irq(pdev, 0);
> @@ -147,7 +142,8 @@ static int kdwc3_probe(struct platform_device *pdev)
> err_core:
> kdwc3_disable_irqs(kdwc);
> err_irq:
> - clk_disable_unprepare(kdwc->clk);
> + pm_runtime_put_sync(kdwc->dev);
> + pm_runtime_disable(kdwc->dev);
>
> return error;
> }
> @@ -167,7 +163,9 @@ static int kdwc3_remove(struct platform_device *pdev)
>
> kdwc3_disable_irqs(kdwc);
> device_for_each_child(&pdev->dev, NULL, kdwc3_remove_core);
> - clk_disable_unprepare(kdwc->clk);
> + pm_runtime_put_sync(kdwc->dev);
> + pm_runtime_disable(kdwc->dev);
> +
> platform_set_drvdata(pdev, NULL);
>
> return 0;
>
--
cheers,
-roger
Hi,
Franklin S Cooper Jr <[email protected]> writes:
> For 66AK2Gx there is a requirement to use PM Runtime to properly manage
> clocks and the power domains. Therefore, add PM runtime support. Remove
> legacy clock api's calls since other users of this driver worked without
> these clock apis calls.
>
> Signed-off-by: Franklin S Cooper Jr <[email protected]>
> ---
I already have the previous version of this in my tree. Seems like the
only difference was on binding document, right? Do I need to change
anything in my 'next' and/or 'testing/next' branches?
--
balbi
On 08/17/2017 07:04 AM, Felipe Balbi wrote:
>
> Hi,
>
> Franklin S Cooper Jr <[email protected]> writes:
>> For 66AK2Gx there is a requirement to use PM Runtime to properly manage
>> clocks and the power domains. Therefore, add PM runtime support. Remove
>> legacy clock api's calls since other users of this driver worked without
>> these clock apis calls.
>>
>> Signed-off-by: Franklin S Cooper Jr <[email protected]>
>> ---
>
> I already have the previous version of this in my tree. Seems like the
> only difference was on binding document, right? Do I need to change
> anything in my 'next' and/or 'testing/next' branches?
Correct the binding document is the only difference. Both of your
branches looks good.
>
Hi,
Franklin S Cooper Jr <[email protected]> writes:
>> Franklin S Cooper Jr <[email protected]> writes:
>>> For 66AK2Gx there is a requirement to use PM Runtime to properly manage
>>> clocks and the power domains. Therefore, add PM runtime support. Remove
>>> legacy clock api's calls since other users of this driver worked without
>>> these clock apis calls.
>>>
>>> Signed-off-by: Franklin S Cooper Jr <[email protected]>
>>> ---
>>
>> I already have the previous version of this in my tree. Seems like the
>> only difference was on binding document, right? Do I need to change
>> anything in my 'next' and/or 'testing/next' branches?
>
> Correct the binding document is the only difference. Both of your
> branches looks good.
cool, thanks :-)
--
balbi
On Wed, Aug 16, 2017 at 04:54:08PM -0500, Franklin S Cooper Jr wrote:
> Update various properties to properly indicate their requirement depending
> on the SoC.
>
> Signed-off-by: Franklin S Cooper Jr <[email protected]>
> ---
> Version 2:
> Clarify clock requirements in binding document
>
> Documentation/devicetree/bindings/usb/keystone-usb.txt | 17 +++++++++++++++--
> 1 file changed, 15 insertions(+), 2 deletions(-)
Acked-by: Rob Herring <[email protected]>