[PATCH 0/5] USB: atmel: rework clock handling

[PATCH 0/5] USB: atmel: rework clock handling

[Boris Brezillon]

Hello,

This series reworks clock handling in atmel USB host drivers, and while
doing so fixes a regression introduced by 3440ef1 (ARM: at91/dt: fix USB
high-speed clock to select UTMI).

Best Regards,

Boris

Boris Brezillon (5):
  USB: ehci-atmel: rework clk handling
  USB: host: ohci-at91: remove useless uclk clock
  USB: atmel: update DT bindings documentation
  ARM: at91/dt: remove useless uhpck clock references from ehci
    defintions
  ARM: at91/dt: remove useless usb clock

 .../devicetree/bindings/usb/atmel-usb.txt          | 25 ++++++++++++++++++
 arch/arm/boot/dts/at91rm9200.dtsi                  |  4 +--
 arch/arm/boot/dts/at91sam9260.dtsi                 |  4 +--
 arch/arm/boot/dts/at91sam9261.dtsi                 |  4 +--
 arch/arm/boot/dts/at91sam9263.dtsi                 |  4 +--
 arch/arm/boot/dts/at91sam9g45.dtsi                 |  8 +++---
 arch/arm/boot/dts/at91sam9n12.dtsi                 |  5 ++--
 arch/arm/boot/dts/at91sam9x5.dtsi                  |  8 +++---
 arch/arm/boot/dts/sama5d3.dtsi                     |  9 +++----
 arch/arm/boot/dts/sama5d4.dtsi                     |  9 +++----
 drivers/usb/host/ehci-atmel.c                      | 30 +++++++---------------
 drivers/usb/host/ohci-at91.c                       | 18 +++----------
 12 files changed, 63 insertions(+), 65 deletions(-)

-- 
1.9.1

[PATCH 1/5] USB: ehci-atmel: rework clk handling

[Boris Brezillon]

The EHCI IP only needs the UTMI/UPLL (uclk) and the peripheral (iclk)
clocks to work properly. Remove the useless system clock (fclk).

Avoid calling set_rate on the fixed rate UTMI/IPLL clock and remove
useless IS_ENABLED(CONFIG_COMMON_CLK) tests (all at91 platforms have been
moved to the CCF).

This patch also fixes a bug introduced by 3440ef1 (ARM: at91/dt: fix USB
high-speed clock to select UTMI), which was leaving the usb clock
uninitialized and preventing the OHCI driver from setting the usb clock
rate to 48MHz.
This bug was caused by several things:
1/ usb clock drivers set the CLK_SET_RATE_GATE flag, which means the rate
   cannot be changed once the clock is prepared
2/ The EHCI driver was retrieving and preparing/enabling the uhpck
   clock which was in turn preparing its parent clock (the usb clock),
   thus preventing any rate change because of 1/

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
---
 drivers/usb/host/ehci-atmel.c | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c
index 663f790..be0964a 100644
--- a/drivers/usb/host/ehci-atmel.c
+++ b/drivers/usb/host/ehci-atmel.c
@@ -34,7 +34,6 @@ static const char hcd_name[] = "ehci-atmel";
 
 struct atmel_ehci_priv {
 	struct clk *iclk;
-	struct clk *fclk;
 	struct clk *uclk;
 	bool clocked;
 };
@@ -51,12 +50,9 @@ static void atmel_start_clock(struct atmel_ehci_priv *atmel_ehci)
 {
 	if (atmel_ehci->clocked)
 		return;
-	if (IS_ENABLED(CONFIG_COMMON_CLK)) {
-		clk_set_rate(atmel_ehci->uclk, 48000000);
-		clk_prepare_enable(atmel_ehci->uclk);
-	}
+
+	clk_prepare_enable(atmel_ehci->uclk);
 	clk_prepare_enable(atmel_ehci->iclk);
-	clk_prepare_enable(atmel_ehci->fclk);
 	atmel_ehci->clocked = true;
 }
 
@@ -64,10 +60,9 @@ static void atmel_stop_clock(struct atmel_ehci_priv *atmel_ehci)
 {
 	if (!atmel_ehci->clocked)
 		return;
-	clk_disable_unprepare(atmel_ehci->fclk);
+
 	clk_disable_unprepare(atmel_ehci->iclk);
-	if (IS_ENABLED(CONFIG_COMMON_CLK))
-		clk_disable_unprepare(atmel_ehci->uclk);
+	clk_disable_unprepare(atmel_ehci->uclk);
 	atmel_ehci->clocked = false;
 }
 
@@ -146,20 +141,13 @@ static int ehci_atmel_drv_probe(struct platform_device *pdev)
 		retval = -ENOENT;
 		goto fail_request_resource;
 	}
-	atmel_ehci->fclk = devm_clk_get(&pdev->dev, "uhpck");
-	if (IS_ERR(atmel_ehci->fclk)) {
-		dev_err(&pdev->dev, "Error getting function clock\n");
-		retval = -ENOENT;
+
+	atmel_ehci->uclk = devm_clk_get(&pdev->dev, "usb_clk");
+	if (IS_ERR(atmel_ehci->uclk)) {
+		dev_err(&pdev->dev, "failed to get uclk\n");
+		retval = PTR_ERR(atmel_ehci->uclk);
 		goto fail_request_resource;
 	}
-	if (IS_ENABLED(CONFIG_COMMON_CLK)) {
-		atmel_ehci->uclk = devm_clk_get(&pdev->dev, "usb_clk");
-		if (IS_ERR(atmel_ehci->uclk)) {
-			dev_err(&pdev->dev, "failed to get uclk\n");
-			retval = PTR_ERR(atmel_ehci->uclk);
-			goto fail_request_resource;
-		}
-	}
 
 	ehci = hcd_to_ehci(hcd);
 	/* registers start at offset 0x0 */
-- 
1.9.1

Re: [PATCH 1/5] USB: ehci-atmel: rework clk handling

[Alan Stern]

On Tue, 17 Mar 2015, Boris Brezillon wrote:

> The EHCI IP only needs the UTMI/UPLL (uclk) and the peripheral (iclk)
> clocks to work properly. Remove the useless system clock (fclk).
> 
> Avoid calling set_rate on the fixed rate UTMI/IPLL clock and remove
> useless IS_ENABLED(CONFIG_COMMON_CLK) tests (all at91 platforms have been
> moved to the CCF).
> 
> This patch also fixes a bug introduced by 3440ef1 (ARM: at91/dt: fix USB
> high-speed clock to select UTMI), which was leaving the usb clock
> uninitialized and preventing the OHCI driver from setting the usb clock
> rate to 48MHz.
> This bug was caused by several things:
> 1/ usb clock drivers set the CLK_SET_RATE_GATE flag, which means the rate
>    cannot be changed once the clock is prepared
> 2/ The EHCI driver was retrieving and preparing/enabling the uhpck
>    clock which was in turn preparing its parent clock (the usb clock),
>    thus preventing any rate change because of 1/
> 
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>

Acked-by: Alan Stern <stern@rowland.harvard.edu>

Re: [PATCH 1/5] USB: ehci-atmel: rework clk handling

[Nicolas Ferre]

Le 17/03/2015 20:01, Alan Stern a écrit :
> On Tue, 17 Mar 2015, Boris Brezillon wrote:
> 
>> The EHCI IP only needs the UTMI/UPLL (uclk) and the peripheral (iclk)
>> clocks to work properly. Remove the useless system clock (fclk).
>>
>> Avoid calling set_rate on the fixed rate UTMI/IPLL clock and remove
>> useless IS_ENABLED(CONFIG_COMMON_CLK) tests (all at91 platforms have been
>> moved to the CCF).
>>
>> This patch also fixes a bug introduced by 3440ef1 (ARM: at91/dt: fix USB
>> high-speed clock to select UTMI), which was leaving the usb clock
>> uninitialized and preventing the OHCI driver from setting the usb clock
>> rate to 48MHz.
>> This bug was caused by several things:
>> 1/ usb clock drivers set the CLK_SET_RATE_GATE flag, which means the rate
>>    cannot be changed once the clock is prepared
>> 2/ The EHCI driver was retrieving and preparing/enabling the uhpck
>>    clock which was in turn preparing its parent clock (the usb clock),
>>    thus preventing any rate change because of 1/
>>
>> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> 
> Acked-by: Alan Stern <stern@rowland.harvard.edu>

Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
and:
Fixes: 3440ef169100 ("ARM: at91/dt: fix USB high-speed clock to select UTMI")

Alan, Greg,

Can you please take this patch (only this patch 1/5 of the series) as a fix 
for the 4.0-rc? It would solve the issue that we see on at91sam9x5/at91sam9n12.
I'll take care of the rest of the series for 4.1.

If you want me to take it of to re-send the patch, tell me.

Thanks, bye,
-- 
Nicolas Ferre

Re: [PATCH 1/5] USB: ehci-atmel: rework clk handling

[Greg Kroah-Hartman]

On Wed, Mar 18, 2015 at 12:16:22PM +0100, Nicolas Ferre wrote:
> Le 17/03/2015 20:01, Alan Stern a écrit :
> > On Tue, 17 Mar 2015, Boris Brezillon wrote:
> > 
> >> The EHCI IP only needs the UTMI/UPLL (uclk) and the peripheral (iclk)
> >> clocks to work properly. Remove the useless system clock (fclk).
> >>
> >> Avoid calling set_rate on the fixed rate UTMI/IPLL clock and remove
> >> useless IS_ENABLED(CONFIG_COMMON_CLK) tests (all at91 platforms have been
> >> moved to the CCF).
> >>
> >> This patch also fixes a bug introduced by 3440ef1 (ARM: at91/dt: fix USB
> >> high-speed clock to select UTMI), which was leaving the usb clock
> >> uninitialized and preventing the OHCI driver from setting the usb clock
> >> rate to 48MHz.
> >> This bug was caused by several things:
> >> 1/ usb clock drivers set the CLK_SET_RATE_GATE flag, which means the rate
> >>    cannot be changed once the clock is prepared
> >> 2/ The EHCI driver was retrieving and preparing/enabling the uhpck
> >>    clock which was in turn preparing its parent clock (the usb clock),
> >>    thus preventing any rate change because of 1/
> >>
> >> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> > 
> > Acked-by: Alan Stern <stern@rowland.harvard.edu>
> 
> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> and:
> Fixes: 3440ef169100 ("ARM: at91/dt: fix USB high-speed clock to select UTMI")
> 
> Alan, Greg,
> 
> Can you please take this patch (only this patch 1/5 of the series) as a fix 
> for the 4.0-rc? It would solve the issue that we see on at91sam9x5/at91sam9n12.
> I'll take care of the rest of the series for 4.1.
> 
> If you want me to take it of to re-send the patch, tell me.

I'll queue it up now, thanks.  You can take the rest of the series :)

thanks,

greg k-h

Re: [PATCH 1/5] USB: ehci-atmel: rework clk handling

[Douglas Gilbert]

On 15-03-18 08:28 AM, Greg Kroah-Hartman wrote:
> On Wed, Mar 18, 2015 at 12:16:22PM +0100, Nicolas Ferre wrote:
>> Le 17/03/2015 20:01, Alan Stern a écrit :
>>> On Tue, 17 Mar 2015, Boris Brezillon wrote:
>>>
>>>> The EHCI IP only needs the UTMI/UPLL (uclk) and the peripheral (iclk)
>>>> clocks to work properly. Remove the useless system clock (fclk).
>>>>
>>>> Avoid calling set_rate on the fixed rate UTMI/IPLL clock and remove
>>>> useless IS_ENABLED(CONFIG_COMMON_CLK) tests (all at91 platforms have been
>>>> moved to the CCF).
>>>>
>>>> This patch also fixes a bug introduced by 3440ef1 (ARM: at91/dt: fix USB
>>>> high-speed clock to select UTMI), which was leaving the usb clock
>>>> uninitialized and preventing the OHCI driver from setting the usb clock
>>>> rate to 48MHz.
>>>> This bug was caused by several things:
>>>> 1/ usb clock drivers set the CLK_SET_RATE_GATE flag, which means the rate
>>>>     cannot be changed once the clock is prepared
>>>> 2/ The EHCI driver was retrieving and preparing/enabling the uhpck
>>>>     clock which was in turn preparing its parent clock (the usb clock),
>>>>     thus preventing any rate change because of 1/
>>>>
>>>> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
>>>
>>> Acked-by: Alan Stern <stern@rowland.harvard.edu>
>>
>> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
>> and:
>> Fixes: 3440ef169100 ("ARM: at91/dt: fix USB high-speed clock to select UTMI")
>>
>> Alan, Greg,
>>
>> Can you please take this patch (only this patch 1/5 of the series) as a fix
>> for the 4.0-rc? It would solve the issue that we see on at91sam9x5/at91sam9n12.
>> I'll take care of the rest of the series for 4.1.
>>
>> If you want me to take it of to re-send the patch, tell me.
>
> I'll queue it up now, thanks.  You can take the rest of the series :)

Hi,
I reported this error to Nicolas based on tests with
lk 4.0-rc4. With the same USB WiFi dongle and platform
this patch fixes my problem.

Tested-by: Douglas Gilbert <dgilbert@interlog.com>

[PATCH 2/5] USB: host: ohci-at91: remove useless uclk clock

[Boris Brezillon]

Now that the system clock driver is forwarding set_rate request to the
parent clock, we can safely call clk_set_rate on the system clk and get
rid of the uclk field.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
---
 drivers/usb/host/ohci-at91.c | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 7cce85a..15df00c 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -39,7 +39,6 @@
 struct ohci_at91_priv {
 	struct clk *iclk;
 	struct clk *fclk;
-	struct clk *uclk;
 	struct clk *hclk;
 	bool clocked;
 	bool wakeup;		/* Saved wake-up state for resume */
@@ -64,10 +63,8 @@ static void at91_start_clock(struct ohci_at91_priv *ohci_at91)
 {
 	if (ohci_at91->clocked)
 		return;
-	if (IS_ENABLED(CONFIG_COMMON_CLK)) {
-		clk_set_rate(ohci_at91->uclk, 48000000);
-		clk_prepare_enable(ohci_at91->uclk);
-	}
+
+	clk_set_rate(ohci_at91->fclk, 48000000);
 	clk_prepare_enable(ohci_at91->hclk);
 	clk_prepare_enable(ohci_at91->iclk);
 	clk_prepare_enable(ohci_at91->fclk);
@@ -78,11 +75,10 @@ static void at91_stop_clock(struct ohci_at91_priv *ohci_at91)
 {
 	if (!ohci_at91->clocked)
 		return;
+
 	clk_disable_unprepare(ohci_at91->fclk);
 	clk_disable_unprepare(ohci_at91->iclk);
 	clk_disable_unprepare(ohci_at91->hclk);
-	if (IS_ENABLED(CONFIG_COMMON_CLK))
-		clk_disable_unprepare(ohci_at91->uclk);
 	ohci_at91->clocked = false;
 }
 
@@ -191,14 +187,6 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
 		retval = PTR_ERR(ohci_at91->hclk);
 		goto err;
 	}
-	if (IS_ENABLED(CONFIG_COMMON_CLK)) {
-		ohci_at91->uclk = devm_clk_get(dev, "usb_clk");
-		if (IS_ERR(ohci_at91->uclk)) {
-			dev_err(dev, "failed to get uclk\n");
-			retval = PTR_ERR(ohci_at91->uclk);
-			goto err;
-		}
-	}
 
 	board = hcd->self.controller->platform_data;
 	ohci = hcd_to_ohci(hcd);
-- 
1.9.1

Re: [PATCH 2/5] USB: host: ohci-at91: remove useless uclk clock

[Alan Stern]

On Tue, 17 Mar 2015, Boris Brezillon wrote:

> Now that the system clock driver is forwarding set_rate request to the
> parent clock, we can safely call clk_set_rate on the system clk and get
> rid of the uclk field.
> 
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>

Acked-by: Alan Stern <stern@rowland.harvard.edu>

Re: [PATCH 2/5] USB: host: ohci-at91: remove useless uclk clock

[Nicolas Ferre]

Le 17/03/2015 20:02, Alan Stern a écrit :
> On Tue, 17 Mar 2015, Boris Brezillon wrote:
> 
>> Now that the system clock driver is forwarding set_rate request to the
>> parent clock, we can safely call clk_set_rate on the system clk and get
>> rid of the uclk field.
>>
>> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> 
> Acked-by: Alan Stern <stern@rowland.harvard.edu>

Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Hi Alan,

As I don't have any other "drivers" patch for 4.1, would you mind taking
this patch with your tree?
I'll take care of the remaining ones dealing with Device Tree: they are
independent anyway.

Thanks, bye.
-- 
Nicolas Ferre

Re: [PATCH 2/5] USB: host: ohci-at91: remove useless uclk clock

[Alan Stern]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: TEXT/PLAIN; charset=UTF-8, Size: 788 bytes --]

On Mon, 23 Mar 2015, Nicolas Ferre wrote:

> Le 17/03/2015 20:02, Alan Stern a écrit :
> > On Tue, 17 Mar 2015, Boris Brezillon wrote:
> > 
> >> Now that the system clock driver is forwarding set_rate request to the
> >> parent clock, we can safely call clk_set_rate on the system clk and get
> >> rid of the uclk field.
> >>
> >> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> > 
> > Acked-by: Alan Stern <stern@rowland.harvard.edu>
> 
> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> 
> Hi Alan,
> 
> As I don't have any other "drivers" patch for 4.1, would you mind taking
> this patch with your tree?
> I'll take care of the remaining ones dealing with Device Tree: they are
> independent anyway.

Greg can take this patch; it's fine with me.

Alan Stern

[PATCH 3/5] USB: atmel: update DT bindings documentation

[Boris Brezillon]

Add documentation for the missing clocks, clock-names, reg and interrupts
properties.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
---
 .../devicetree/bindings/usb/atmel-usb.txt          | 25 ++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/Documentation/devicetree/bindings/usb/atmel-usb.txt b/Documentation/devicetree/bindings/usb/atmel-usb.txt
index e180d56..1be8d7a 100644
--- a/Documentation/devicetree/bindings/usb/atmel-usb.txt
+++ b/Documentation/devicetree/bindings/usb/atmel-usb.txt
@@ -5,6 +5,13 @@ OHCI
 Required properties:
  - compatible: Should be "atmel,at91rm9200-ohci" for USB controllers
    used in host mode.
+ - reg: Address and length of the register set for the device
+ - interrupts: Should contain ehci interrupt
+ - clocks: Should reference the peripheral, host and system clocks
+ - clock-names: Should contains two strings
+		"ohci_clk" for the peripheral clock
+		"hclk" for the host clock
+		"uhpck" for the system clock
  - num-ports: Number of ports.
  - atmel,vbus-gpio: If present, specifies a gpio that needs to be
    activated for the bus to be powered.
@@ -14,6 +21,8 @@ Required properties:
 usb0: ohci@00500000 {
 	compatible = "atmel,at91rm9200-ohci", "usb-ohci";
 	reg = <0x00500000 0x100000>;
+	clocks = <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
+	clock-names = "ohci_clk", "hclk", "uhpck";
 	interrupts = <20 4>;
 	num-ports = <2>;
 };
@@ -23,11 +32,19 @@ EHCI
 Required properties:
  - compatible: Should be "atmel,at91sam9g45-ehci" for USB controllers
    used in host mode.
+ - reg: Address and length of the register set for the device
+ - interrupts: Should contain ehci interrupt
+ - clocks: Should reference the peripheral and the UTMI clocks
+ - clock-names: Should contains two strings
+		"ehci_clk" for the peripheral clock
+		"usb_clk" for the UTMI clock
 
 usb1: ehci@00800000 {
 	compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
 	reg = <0x00800000 0x100000>;
 	interrupts = <22 4>;
+	clocks = <&utmi>, <&uhphs_clk>;
+	clock-names = "usb_clk", "ehci_clk";
 };
 
 AT91 USB device controller
@@ -53,6 +70,8 @@ usb1: gadget@fffa4000 {
 	compatible = "atmel,at91rm9200-udc";
 	reg = <0xfffa4000 0x4000>;
 	interrupts = <10 4>;
+	clocks = <&udc_clk>, <&udpck>;
+	clock-names = "pclk", "hclk";
 	atmel,vbus-gpio = <&pioC 5 0>;
 };
 
@@ -65,6 +84,10 @@ Required properties:
 	       "sama5d3-udc"
  - reg: Address and length of the register set for the device
  - interrupts: Should contain usba interrupt
+ - clocks: Should reference the peripheral and host clocks
+ - clock-names: Should contains two strings
+		"pclk" for the peripheral clock
+		"hclk" for the host clock
  - ep childnode: To specify the number of endpoints and their properties.
 
 Optional properties:
@@ -86,6 +109,8 @@ usb2: gadget@fff78000 {
 	reg = <0x00600000 0x80000
 	       0xfff78000 0x400>;
 	interrupts = <27 4 0>;
+	clocks = <&utmi>, <&udphs_clk>;
+	clock-names = "hclk", "pclk";
 	atmel,vbus-gpio = <&pioB 19 0>;
 
 	ep0 {
-- 
1.9.1

[PATCH 4/5] ARM: at91/dt: remove useless uhpck clock references from ehci defintions

[Boris Brezillon]

The uhpck is useless for High-Speed communications, remove the reference
to this clock in all ehci definitions.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
---
 arch/arm/boot/dts/at91sam9g45.dtsi | 4 ++--
 arch/arm/boot/dts/at91sam9x5.dtsi  | 4 ++--
 arch/arm/boot/dts/sama5d3.dtsi     | 4 ++--
 arch/arm/boot/dts/sama5d4.dtsi     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index 488af63..a5895f3 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -1300,8 +1300,8 @@
 			compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
 			reg = <0x00800000 0x100000>;
 			interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
-			clocks = <&utmi>, <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
-			clock-names = "usb_clk", "ehci_clk", "hclk", "uhpck";
+			clocks = <&utmi>, <&uhphs_clk>;
+			clock-names = "usb_clk", "ehci_clk";
 			status = "disabled";
 		};
 	};
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index d221179..9a74a90 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -1185,8 +1185,8 @@
 			compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
 			reg = <0x00700000 0x100000>;
 			interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
-			clocks = <&utmi>, <&uhphs_clk>, <&uhpck>;
-			clock-names = "usb_clk", "ehci_clk", "uhpck";
+			clocks = <&utmi>, <&uhphs_clk>;
+			clock-names = "usb_clk", "ehci_clk";
 			status = "disabled";
 		};
 	};
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index 367af53..a266a39 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -1415,8 +1415,8 @@
 			compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
 			reg = <0x00700000 0x100000>;
 			interrupts = <32 IRQ_TYPE_LEVEL_HIGH 2>;
-			clocks = <&utmi>, <&uhphs_clk>, <&uhpck>;
-			clock-names = "usb_clk", "ehci_clk", "uhpck";
+			clocks = <&utmi>, <&uhphs_clk>;
+			clock-names = "usb_clk", "ehci_clk";
 			status = "disabled";
 		};
 
diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi
index 4303874..4bfe7c1 100644
--- a/arch/arm/boot/dts/sama5d4.dtsi
+++ b/arch/arm/boot/dts/sama5d4.dtsi
@@ -260,8 +260,8 @@
 			compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
 			reg = <0x00600000 0x100000>;
 			interrupts = <46 IRQ_TYPE_LEVEL_HIGH 2>;
-			clocks = <&utmi>, <&uhphs_clk>, <&uhpck>;
-			clock-names = "usb_clk", "ehci_clk", "uhpck";
+			clocks = <&utmi>, <&uhphs_clk>;
+			clock-names = "usb_clk", "ehci_clk";
 			status = "disabled";
 		};
 
-- 
1.9.1

[PATCH 5/5] ARM: at91/dt: remove useless usb clock

[Boris Brezillon]

The ohci driver now calls clk_set_rate on the uhpck clock (which forwards
set_rate requests to its parent: the usb clock).
Remove useless references to usb clocks from ohci definitions.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
---
 arch/arm/boot/dts/at91rm9200.dtsi  | 4 ++--
 arch/arm/boot/dts/at91sam9260.dtsi | 4 ++--
 arch/arm/boot/dts/at91sam9261.dtsi | 4 ++--
 arch/arm/boot/dts/at91sam9263.dtsi | 4 ++--
 arch/arm/boot/dts/at91sam9g45.dtsi | 4 ++--
 arch/arm/boot/dts/at91sam9n12.dtsi | 5 ++---
 arch/arm/boot/dts/at91sam9x5.dtsi  | 4 ++--
 arch/arm/boot/dts/sama5d3.dtsi     | 5 ++---
 arch/arm/boot/dts/sama5d4.dtsi     | 5 ++---
 9 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/arch/arm/boot/dts/at91rm9200.dtsi b/arch/arm/boot/dts/at91rm9200.dtsi
index 21c2b50..31892a1 100644
--- a/arch/arm/boot/dts/at91rm9200.dtsi
+++ b/arch/arm/boot/dts/at91rm9200.dtsi
@@ -936,8 +936,8 @@
 			compatible = "atmel,at91rm9200-ohci", "usb-ohci";
 			reg = <0x00300000 0x100000>;
 			interrupts = <23 IRQ_TYPE_LEVEL_HIGH 2>;
-			clocks = <&usb>, <&ohci_clk>, <&ohci_clk>, <&uhpck>;
-			clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck";
+			clocks = <&ohci_clk>, <&ohci_clk>, <&uhpck>;
+			clock-names = "ohci_clk", "hclk", "uhpck";
 			status = "disabled";
 		};
 	};
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index e7f0a4a..2dabe77 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -1008,8 +1008,8 @@
 			compatible = "atmel,at91rm9200-ohci", "usb-ohci";
 			reg = <0x00500000 0x100000>;
 			interrupts = <20 IRQ_TYPE_LEVEL_HIGH 2>;
-			clocks = <&usb>, <&ohci_clk>, <&ohci_clk>, <&uhpck>;
-			clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck";
+			clocks = <&ohci_clk>, <&ohci_clk>, <&uhpck>;
+			clock-names = "ohci_clk", "hclk", "uhpck";
 			status = "disabled";
 		};
 	};
diff --git a/arch/arm/boot/dts/at91sam9261.dtsi b/arch/arm/boot/dts/at91sam9261.dtsi
index d55fdf2..db811f9 100644
--- a/arch/arm/boot/dts/at91sam9261.dtsi
+++ b/arch/arm/boot/dts/at91sam9261.dtsi
@@ -75,8 +75,8 @@
 			compatible = "atmel,at91rm9200-ohci", "usb-ohci";
 			reg = <0x00500000 0x100000>;
 			interrupts = <20 IRQ_TYPE_LEVEL_HIGH 2>;
-			clocks = <&usb>, <&ohci_clk>, <&hclk0>, <&uhpck>;
-			clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck";
+			clocks = <&ohci_clk>, <&hclk0>, <&uhpck>;
+			clock-names = "ohci_clk", "hclk", "uhpck";
 			status = "disabled";
 		};
 
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
index fce301c..aa981cd 100644
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -1010,8 +1010,8 @@
 			compatible = "atmel,at91rm9200-ohci", "usb-ohci";
 			reg = <0x00a00000 0x100000>;
 			interrupts = <29 IRQ_TYPE_LEVEL_HIGH 2>;
-			clocks = <&usb>, <&ohci_clk>, <&ohci_clk>, <&uhpck>;
-			clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck";
+			clocks = <&ohci_clk>, <&ohci_clk>, <&uhpck>;
+			clock-names = "ohci_clk", "hclk", "uhpck";
 			status = "disabled";
 		};
 	};
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index a5895f3..644570e 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -1291,8 +1291,8 @@
 			compatible = "atmel,at91rm9200-ohci", "usb-ohci";
 			reg = <0x00700000 0x100000>;
 			interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
-			clocks = <&usb>, <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
-			clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck";
+			clocks = <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
+			clock-names = "ohci_clk", "hclk", "uhpck";
 			status = "disabled";
 		};
 
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index 0c53a37..8d4200d 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -940,9 +940,8 @@
 			compatible = "atmel,at91rm9200-ohci", "usb-ohci";
 			reg = <0x00500000 0x00100000>;
 			interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
-			clocks = <&usb>, <&uhphs_clk>, <&uhphs_clk>,
-				 <&uhpck>;
-			clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck";
+			clocks = <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
+			clock-names = "ohci_clk", "hclk", "uhpck";
 			status = "disabled";
 		};
 	};
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index 9a74a90..dab8bf9 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -1176,8 +1176,8 @@
 			compatible = "atmel,at91rm9200-ohci", "usb-ohci";
 			reg = <0x00600000 0x100000>;
 			interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
-			clocks = <&usb>, <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
-			clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck";
+			clocks = <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
+			clock-names = "ohci_clk", "hclk", "uhpck";
 			status = "disabled";
 		};
 
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index a266a39..b1ded48 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -1405,9 +1405,8 @@
 			compatible = "atmel,at91rm9200-ohci", "usb-ohci";
 			reg = <0x00600000 0x100000>;
 			interrupts = <32 IRQ_TYPE_LEVEL_HIGH 2>;
-			clocks = <&usb>, <&uhphs_clk>, <&uhphs_clk>,
-				 <&uhpck>;
-			clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck";
+			clocks = <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
+			clock-names = "ohci_clk", "hclk", "uhpck";
 			status = "disabled";
 		};
 
diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi
index 4bfe7c1..8b16d6a 100644
--- a/arch/arm/boot/dts/sama5d4.dtsi
+++ b/arch/arm/boot/dts/sama5d4.dtsi
@@ -250,9 +250,8 @@
 			compatible = "atmel,at91rm9200-ohci", "usb-ohci";
 			reg = <0x00500000 0x100000>;
 			interrupts = <46 IRQ_TYPE_LEVEL_HIGH 2>;
-			clocks = <&usb>, <&uhphs_clk>, <&uhphs_clk>,
-				 <&uhpck>;
-			clock-names = "usb_clk", "ohci_clk", "hclk", "uhpck";
+			clocks = <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;
+			clock-names = "ohci_clk", "hclk", "uhpck";
 			status = "disabled";
 		};
 
-- 
1.9.1

Re: [PATCH 0/5] USB: atmel: rework clock handling

[Nicolas Ferre]

Le 17/03/2015 17:15, Boris Brezillon a écrit :
> Hello,
> 
> This series reworks clock handling in atmel USB host drivers, and while
> doing so fixes a regression introduced by 3440ef1 (ARM: at91/dt: fix USB
> high-speed clock to select UTMI).
> 
> Best Regards,
> 
> Boris
> 
> Boris Brezillon (5):
>   USB: ehci-atmel: rework clk handling
>   USB: host: ohci-at91: remove useless uclk clock

Now that these ones ^^^^ are in Linus' tree...

...these patches vvv

>   USB: atmel: update DT bindings documentation
>   ARM: at91/dt: remove useless uhpck clock references from ehci
>     defintions
>   ARM: at91/dt: remove useless usb clock

^^^^^ can be queued in at91-4.2-dt. They will go through the arm-soc route.

And BTW:
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>


Thanks Boris, bye.

>  .../devicetree/bindings/usb/atmel-usb.txt          | 25 ++++++++++++++++++
>  arch/arm/boot/dts/at91rm9200.dtsi                  |  4 +--
>  arch/arm/boot/dts/at91sam9260.dtsi                 |  4 +--
>  arch/arm/boot/dts/at91sam9261.dtsi                 |  4 +--
>  arch/arm/boot/dts/at91sam9263.dtsi                 |  4 +--
>  arch/arm/boot/dts/at91sam9g45.dtsi                 |  8 +++---
>  arch/arm/boot/dts/at91sam9n12.dtsi                 |  5 ++--
>  arch/arm/boot/dts/at91sam9x5.dtsi                  |  8 +++---
>  arch/arm/boot/dts/sama5d3.dtsi                     |  9 +++----
>  arch/arm/boot/dts/sama5d4.dtsi                     |  9 +++----
>  drivers/usb/host/ehci-atmel.c                      | 30 +++++++---------------
>  drivers/usb/host/ohci-at91.c                       | 18 +++----------
>  12 files changed, 63 insertions(+), 65 deletions(-)
> 


-- 
Nicolas Ferre