On 18/01/14 19:19, Sergei Shtylyov wrote:
Hello.
On 18-01-2014 19:03, Ben Dooks wrote:
Add support for the phy-rcar-gen2-usb driver to be probed from device
tree.
Signed-off-by: Ben Dooks <ben.dooks@xxxxxxxxxxxxxxx>
Reviewed-by: Ian Molton <ian.molton@xxxxxxxxxxxxxxx>
---
Cc: linux-usb@xxxxxxxxxxxxxxx (open list:USB PHY LAYER)
Cc: linux-sh@xxxxxxxxxxxxxxx (open list:ARM/SHMOBILE ARM...)
Cc: Magnus Damm <magnus.damm@xxxxxxxxx> (supporter:ARM/SHMOBILE ARM...)
Cc: Simon Horman <horms@xxxxxxxxxxxx> (supporter:ARM/SHMOBILE ARM...)
Cc: devicetree@xxxxxxxxxxxxxxx (open list:OPEN FIRMWARE AND...)
---
drivers/usb/phy/phy-rcar-gen2-usb.c | 35
++++++++++++++++++++++++++++++-----
1 file changed, 30 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/phy/phy-rcar-gen2-usb.c
b/drivers/usb/phy/phy-rcar-gen2-usb.c
index db3ab34..906b74b 100644
--- a/drivers/usb/phy/phy-rcar-gen2-usb.c
+++ b/drivers/usb/phy/phy-rcar-gen2-usb.c
[...]
@@ -177,8 +185,9 @@ static int rcar_gen2_usb_phy_probe(struct
platform_device *pdev)
struct clk *clk;
int retval;
+ of_id = of_match_device(rcar_gen2_usb_phy_ofmatch, &pdev->dev);
I don't think another match is needed.
pdata = dev_get_platdata(&pdev->dev);
- if (!pdata) {
+ if (!pdata && !of_id) {
dev_err(dev, "No platform data\n");
return -EINVAL;
}
@@ -203,16 +212,31 @@ static int rcar_gen2_usb_phy_probe(struct
platform_device *pdev)
[...]
+ if (of_id) {
Isn't checking dev->of_node enough?
of_node does not contain the id of the entry matched at start time/
+ int len = 0;
+
+ if (of_get_property(dev->of_node, "renesas,usb0-hs", &len))
+ priv->ugctrl2 = USBHS_UGCTRL2_USB0_HS;
+ else
+ priv->ugctrl2 = USBHS_UGCTRL2_USB0_PCI;
+
+ if (of_get_property(dev->of_node, "renesas,usb2-ss", &len))
+ priv->ugctrl2 |= USBHS_UGCTRL2_USB2_SS;
Where is the bindings file you document these properties in?
Should have been in another patch in the series.
--
Ben Dooks http://www.codethink.co.uk/
Senior Engineer Codethink - Providing Genius
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
