Skip to contentSkip to conversation

usb: add clock support for generic EHCI

PATCH Superseded Masahiro Yamada 2 participants 4 messages Jan 25, 2016

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 usb: add clock support for generic EHCI

This driver is designed in a generic manner, so clocks should be handled genericly as well.

---

Changes in v2:
- rephrase git-log
- rebase on commit 12f229ea
- do not store clk devices and IDs in the private data

 drivers/usb/host/ehci-generic.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
drivers/usb/host/ehci-generic.c +15 -0
index 1292caa..98f9db7 100644
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <clk.h>
 #include <dm.h>
 #include "ehci.h"
 
@@ -21,6 +22,20 @@ static int ehci_usb_probe(struct udevice *dev)
 {
 	struct ehci_hccr *hccr = (struct ehci_hccr *)dev_get_addr(dev);
 	struct ehci_hcor *hcor;
+	int i = 0;
+
+	while (1) {
+		struct udevice *clk_dev;
+		int clk_id;
+
+		clk_id = clk_get_by_index(dev, i, &clk_dev);
+		if (clk_id < 0)
+			break;
+		if (clk_enable(clk_dev, clk_id))
+			printf("failed to enable clock (dev=%s, id=%d)\n",
+			       clk_dev->name, clk_id);
+		i++;
+	}
 
 	hcor = (struct ehci_hcor *)((uintptr_t)hccr +
 				    HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
Signature · 1 line
1.9.1
#1 lore raw

PATCH v2 1/1 usb: add clock support for generic EHCI

Quoted 27 lines · Masahiro Yamada

This driver is designed in a generic manner, so clocks should be handled genericly as well.

---

Changes in v2:
- rephrase git-log
- rebase on commit 12f229ea
- do not store clk devices and IDs in the private data

 drivers/usb/host/ehci-generic.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
(quoted diff) +0 -0

b/drivers/usb/host/ehci-generic.c index 1292caa..98f9db7 100644

drivers/usb/host/ehci-generic.c +1 -0
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <clk.h>
 #include <dm.h>
 #include "ehci.h"
 

drivers/usb/host/ehci-generic.c static int ehci_usb_probe(struct udevice *dev) · line 27

Quoted 6 lines
drivers/usb/host/ehci-generic.c +3 -0
@@ -21,6 +22,20 @@ static int ehci_usb_probe(struct udevice *dev)
 {
 	struct ehci_hccr *hccr = (struct ehci_hccr *)dev_get_addr(dev);
 	struct ehci_hcor *hcor;
+	int i = 0;
+
+	while (1) {

You can do for (i = 0; ; i++) {} here ;-)

Quoted 4 lines
drivers/usb/host/ehci-generic.c +4 -0
+		struct udevice *clk_dev;
+		int clk_id;
+
+		clk_id = clk_get_by_index(dev, i, &clk_dev);

drivers/usb/host/ehci-generic.c static int ehci_usb_probe(struct udevice *dev) · line 41

Quoted 10 lines
drivers/usb/host/ehci-generic.c +7 -0
+		if (clk_id < 0)
+			break;
+		if (clk_enable(clk_dev, clk_id))
+			printf("failed to enable clock (dev=%s, id=%d)\n",
+			       clk_dev->name, clk_id);
+		i++;
+	}
 
 	hcor = (struct ehci_hcor *)((uintptr_t)hccr +
 				    HC_LENGTH(ehci_readl(&hccr->cr_capbase)));

What about disabling the clock? Is it doable with the current clock framework or shall we abandon it for now ?

Best regards,
Marek Vasut

#2 lore raw

PATCH v2 1/1 usb: add clock support for generic EHCI

2016-01-25 14:13 GMT+09:00 Marek Vasut <[email protected]>:

Quoted 49 lines · Masahiro Yamada
Quoted 27 lines

This driver is designed in a generic manner, so clocks should be handled genericly as well.

---

Changes in v2:
- rephrase git-log
- rebase on commit 12f229ea
- do not store clk devices and IDs in the private data

 drivers/usb/host/ehci-generic.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
(quoted diff) +0 -0

b/drivers/usb/host/ehci-generic.c index 1292caa..98f9db7 100644

drivers/usb/host/ehci-generic.c +1 -0
@@ -5,6 +5,7 @@
  */
 
 #include <common.h>
+#include <clk.h>
 #include <dm.h>
 #include "ehci.h"
 

drivers/usb/host/ehci-generic.c static int ehci_usb_probe(struct udevice *dev) · line 27

Quoted 6 lines
drivers/usb/host/ehci-generic.c +3 -0
@@ -21,6 +22,20 @@ static int ehci_usb_probe(struct udevice *dev)
 {
      struct ehci_hccr *hccr = (struct ehci_hccr *)dev_get_addr(dev);
      struct ehci_hcor *hcor;
+     int i = 0;
+
+     while (1) {

You can do for (i = 0; ; i++) {} here ;-)

Quoted 12 lines
drivers/usb/host/ehci-generic.c +11 -0
+             struct udevice *clk_dev;
+             int clk_id;
+
+             clk_id = clk_get_by_index(dev, i, &clk_dev);
+             if (clk_id < 0)
+                     break;
+             if (clk_enable(clk_dev, clk_id))
+                     printf("failed to enable clock (dev=%s, id=%d)\n",
+                            clk_dev->name, clk_id);
+             i++;
+     }
 
Quoted 5 lines

drivers/usb/host/ehci-generic.c static int ehci_usb_probe(struct udevice *dev) · line 41

Quoted 2 lines
drivers/usb/host/ehci-generic.c +0 -0
      hcor = (struct ehci_hcor *)((uintptr_t)hccr +
                                  HC_LENGTH(ehci_readl(&hccr->cr_capbase)));

What about disabling the clock? Is it doable with the current clock framework or shall we abandon it for now ?

clk_disable() is not supported in U-Boot, at least for now. (see include/clk.h and you will only find clk_enable.)

I think this patch is the best I can do now.

(ccing Simon, again)

Signature · 2 lines
Best Regards
Masahiro Yamada
#3 lore raw

PATCH v2 1/1 usb: add clock support for generic EHCI

Quoted 43 lines · Masahiro Yamada

2016-01-25 14:13 GMT+09:00 Marek Vasut <[email protected]>:

Quoted 42 lines · Masahiro Yamada
Quoted 30 lines

This driver is designed in a generic manner, so clocks should be handled genericly as well.

---

Changes in v2:
- rephrase git-log
- rebase on commit 12f229ea
- do not store clk devices and IDs in the private data

 drivers/usb/host/ehci-generic.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
(quoted diff) +0 -0

b/drivers/usb/host/ehci-generic.c index 1292caa..98f9db7 100644

drivers/usb/host/ehci-generic.c +1 -0
@@ -5,6 +5,7 @@
 
  */
 
 #include <common.h>
 
+#include <clk.h>
 

#include <dm.h>
#include "ehci.h"

drivers/usb/host/ehci-generic.c static int ehci_usb_probe(struct udevice *dev) · line 30

Quoted 9 lines
drivers/usb/host/ehci-generic.c +3 -0
@@ -21,6 +22,20 @@ static int ehci_usb_probe(struct udevice *dev)
 
 {
 
      struct ehci_hccr *hccr = (struct ehci_hccr *)dev_get_addr(dev);
      struct ehci_hcor *hcor;
 
+     int i = 0;
+
+     while (1) {

You can do for (i = 0; ; i++) {} here ;-)

I forgot to mention that if you do the for() thing, you can drop the i++ at the end of this function and you also can drop the explicit int i = 0; initialization.

Quoted 20 lines
Quoted 12 lines
Quoted 12 lines
drivers/usb/host/ehci-generic.c +11 -0
+             struct udevice *clk_dev;
+             int clk_id;
+
+             clk_id = clk_get_by_index(dev, i, &clk_dev);
+             if (clk_id < 0)
+                     break;
+             if (clk_enable(clk_dev, clk_id))
+                     printf("failed to enable clock (dev=%s, id=%d)\n",
+                            clk_dev->name, clk_id);
+             i++;
+     }
Quoted 7 lines
Quoted 4 lines
      hcor = (struct ehci_hcor *)((uintptr_t)hccr +
      
                                  HC_LENGTH(ehci_readl(&hccr->cr_capbase
                                  )));

What about disabling the clock? Is it doable with the current clock framework or shall we abandon it for now ?

Quoted 6 lines

clk_disable() is not supported in U-Boot, at least for now. (see include/clk.h and you will only find clk_enable.)

I think this patch is the best I can do now.

(ccing Simon, again)

In that case, I am fine with it. Thanks!