diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2016-02-14 02:47:28 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-14 16:52:15 -0800 |
| commit | bb778553d491b65310b83c55274a2f09912d47a1 (patch) | |
| tree | 199ff8c4a9b13fa9aa65e2baf6d8cb512122fecb /drivers/staging/octeon-usb | |
| parent | a25e278020bf4cf1d8183bb81f86ec7d73d16dca (diff) | |
| download | linux-bb778553d491b65310b83c55274a2f09912d47a1.tar.gz linux-bb778553d491b65310b83c55274a2f09912d47a1.tar.xz | |
staging: octeon-usb: support official bindings
Support official DT bindings alongside with the deprecated ones.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/octeon-usb')
| -rw-r--r-- | drivers/staging/octeon-usb/octeon-hcd.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/staging/octeon-usb/octeon-hcd.c b/drivers/staging/octeon-usb/octeon-hcd.c index 7844e2036060..eaf6ded40990 100644 --- a/drivers/staging/octeon-usb/octeon-hcd.c +++ b/drivers/staging/octeon-usb/octeon-hcd.c @@ -3594,9 +3594,12 @@ static int octeon_usb_probe(struct platform_device *pdev) usbn_node = dev->of_node->parent; i = of_property_read_u32(usbn_node, - "refclk-frequency", &clock_rate); + "clock-frequency", &clock_rate); + if (i) + i = of_property_read_u32(usbn_node, + "refclk-frequency", &clock_rate); if (i) { - dev_err(dev, "No USBN \"refclk-frequency\"\n"); + dev_err(dev, "No USBN \"clock-frequency\"\n"); return -ENXIO; } switch (clock_rate) { @@ -3610,14 +3613,17 @@ static int octeon_usb_probe(struct platform_device *pdev) initialize_flags = CVMX_USB_INITIALIZE_FLAGS_CLOCK_48MHZ; break; default: - dev_err(dev, "Illebal USBN \"refclk-frequency\" %u\n", + dev_err(dev, "Illegal USBN \"clock-frequency\" %u\n", clock_rate); return -ENXIO; } i = of_property_read_string(usbn_node, - "refclk-type", &clock_type); + "cavium,refclk-type", &clock_type); + if (i) + i = of_property_read_string(usbn_node, + "refclk-type", &clock_type); if (!i && strcmp("crystal", clock_type) == 0) is_crystal_clock = true; |