Commit bb778553 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman

staging: octeon-usb: support official bindings

Support official DT bindings alongside with the deprecated ones.
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a25e2780
...@@ -3594,9 +3594,12 @@ static int octeon_usb_probe(struct platform_device *pdev) ...@@ -3594,9 +3594,12 @@ static int octeon_usb_probe(struct platform_device *pdev)
usbn_node = dev->of_node->parent; usbn_node = dev->of_node->parent;
i = of_property_read_u32(usbn_node, 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) { if (i) {
dev_err(dev, "No USBN \"refclk-frequency\"\n"); dev_err(dev, "No USBN \"clock-frequency\"\n");
return -ENXIO; return -ENXIO;
} }
switch (clock_rate) { switch (clock_rate) {
...@@ -3610,14 +3613,17 @@ static int octeon_usb_probe(struct platform_device *pdev) ...@@ -3610,14 +3613,17 @@ static int octeon_usb_probe(struct platform_device *pdev)
initialize_flags = CVMX_USB_INITIALIZE_FLAGS_CLOCK_48MHZ; initialize_flags = CVMX_USB_INITIALIZE_FLAGS_CLOCK_48MHZ;
break; break;
default: default:
dev_err(dev, "Illebal USBN \"refclk-frequency\" %u\n", dev_err(dev, "Illegal USBN \"clock-frequency\" %u\n",
clock_rate); clock_rate);
return -ENXIO; return -ENXIO;
} }
i = of_property_read_string(usbn_node, 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) if (!i && strcmp("crystal", clock_type) == 0)
is_crystal_clock = true; is_crystal_clock = true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment