usb: dwc3: core: convert to unified device property interface
authorHeikki Krogerus <heikki.krogerus@linux.intel.com>
Mon, 21 Sep 2015 08:14:35 +0000 (11:14 +0300)
committerFelipe Balbi <balbi@ti.com>
Sun, 27 Sep 2015 15:54:31 +0000 (10:54 -0500)
No functional affect on existing platforms, but the driver
is now ready to extract the properties also from ACPI tables
as well as from DT.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/dwc3/core.c

index 407151465645b3216c7b0d22755763d9744084e7..c72c8c5c1c5a858470dda715aa07be1794fc6795 100644 (file)
@@ -800,7 +800,6 @@ static int dwc3_probe(struct platform_device *pdev)
 {
        struct device           *dev = &pdev->dev;
        struct dwc3_platform_data *pdata = dev_get_platdata(dev);
-       struct device_node      *node = dev->of_node;
        struct resource         *res;
        struct dwc3             *dwc;
        u8                      lpm_nyet_threshold;
@@ -873,52 +872,51 @@ static int dwc3_probe(struct platform_device *pdev)
        dwc->maximum_speed = usb_get_maximum_speed(dev);
        dwc->dr_mode = usb_get_dr_mode(dev);
 
-       if (node) {
-               dwc->has_lpm_erratum = of_property_read_bool(node,
+       dwc->has_lpm_erratum = device_property_read_bool(dev,
                                "snps,has-lpm-erratum");
-               of_property_read_u8(node, "snps,lpm-nyet-threshold",
+       device_property_read_u8(dev, "snps,lpm-nyet-threshold",
                                &lpm_nyet_threshold);
-               dwc->is_utmi_l1_suspend = of_property_read_bool(node,
+       dwc->is_utmi_l1_suspend = device_property_read_bool(dev,
                                "snps,is-utmi-l1-suspend");
-               of_property_read_u8(node, "snps,hird-threshold",
+       device_property_read_u8(dev, "snps,hird-threshold",
                                &hird_threshold);
-               dwc->usb3_lpm_capable = of_property_read_bool(node,
+       dwc->usb3_lpm_capable = device_property_read_bool(dev,
                                "snps,usb3_lpm_capable");
 
-               dwc->needs_fifo_resize = of_property_read_bool(node,
+       dwc->needs_fifo_resize = device_property_read_bool(dev,
                                "tx-fifo-resize");
 
-               dwc->disable_scramble_quirk = of_property_read_bool(node,
+       dwc->disable_scramble_quirk = device_property_read_bool(dev,
                                "snps,disable_scramble_quirk");
-               dwc->u2exit_lfps_quirk = of_property_read_bool(node,
+       dwc->u2exit_lfps_quirk = device_property_read_bool(dev,
                                "snps,u2exit_lfps_quirk");
-               dwc->u2ss_inp3_quirk = of_property_read_bool(node,
+       dwc->u2ss_inp3_quirk = device_property_read_bool(dev,
                                "snps,u2ss_inp3_quirk");
-               dwc->req_p1p2p3_quirk = of_property_read_bool(node,
+       dwc->req_p1p2p3_quirk = device_property_read_bool(dev,
                                "snps,req_p1p2p3_quirk");
-               dwc->del_p1p2p3_quirk = of_property_read_bool(node,
+       dwc->del_p1p2p3_quirk = device_property_read_bool(dev,
                                "snps,del_p1p2p3_quirk");
-               dwc->del_phy_power_chg_quirk = of_property_read_bool(node,
+       dwc->del_phy_power_chg_quirk = device_property_read_bool(dev,
                                "snps,del_phy_power_chg_quirk");
-               dwc->lfps_filter_quirk = of_property_read_bool(node,
+       dwc->lfps_filter_quirk = device_property_read_bool(dev,
                                "snps,lfps_filter_quirk");
-               dwc->rx_detect_poll_quirk = of_property_read_bool(node,
+       dwc->rx_detect_poll_quirk = device_property_read_bool(dev,
                                "snps,rx_detect_poll_quirk");
-               dwc->dis_u3_susphy_quirk = of_property_read_bool(node,
+       dwc->dis_u3_susphy_quirk = device_property_read_bool(dev,
                                "snps,dis_u3_susphy_quirk");
-               dwc->dis_u2_susphy_quirk = of_property_read_bool(node,
+       dwc->dis_u2_susphy_quirk = device_property_read_bool(dev,
                                "snps,dis_u2_susphy_quirk");
 
-               dwc->tx_de_emphasis_quirk = of_property_read_bool(node,
+       dwc->tx_de_emphasis_quirk = device_property_read_bool(dev,
                                "snps,tx_de_emphasis_quirk");
-               of_property_read_u8(node, "snps,tx_de_emphasis",
+       device_property_read_u8(dev, "snps,tx_de_emphasis",
                                &tx_de_emphasis);
-               of_property_read_string(node, "snps,hsphy_interface",
-                                       &dwc->hsphy_interface);
-               of_property_read_u32(node,
-                                    "snps,quirk-frame-length-adjustment",
-                                    &fladj);
-       } else if (pdata) {
+       device_property_read_string(dev, "snps,hsphy_interface",
+                                   &dwc->hsphy_interface);
+       device_property_read_u32(dev, "snps,quirk-frame-length-adjustment",
+                                &fladj);
+
+       if (pdata) {
                dwc->maximum_speed = pdata->maximum_speed;
                dwc->has_lpm_erratum = pdata->has_lpm_erratum;
                if (pdata->lpm_nyet_threshold)