|
@@ -686,52 +686,39 @@ static int ci_get_platdata(struct device *dev,
|
|
|
if (usb_get_maximum_speed(dev) == USB_SPEED_FULL)
|
|
|
platdata->flags |= CI_HDRC_FORCE_FULLSPEED;
|
|
|
|
|
|
- if (of_find_property(dev->of_node, "phy-clkgate-delay-us", NULL))
|
|
|
- of_property_read_u32(dev->of_node, "phy-clkgate-delay-us",
|
|
|
+ of_property_read_u32(dev->of_node, "phy-clkgate-delay-us",
|
|
|
&platdata->phy_clkgate_delay_us);
|
|
|
|
|
|
platdata->itc_setting = 1;
|
|
|
- if (of_find_property(dev->of_node, "itc-setting", NULL)) {
|
|
|
- ret = of_property_read_u32(dev->of_node, "itc-setting",
|
|
|
- &platdata->itc_setting);
|
|
|
- if (ret) {
|
|
|
- dev_err(dev,
|
|
|
- "failed to get itc-setting\n");
|
|
|
- return ret;
|
|
|
- }
|
|
|
- }
|
|
|
|
|
|
- if (of_find_property(dev->of_node, "ahb-burst-config", NULL)) {
|
|
|
- ret = of_property_read_u32(dev->of_node, "ahb-burst-config",
|
|
|
- &platdata->ahb_burst_config);
|
|
|
- if (ret) {
|
|
|
- dev_err(dev,
|
|
|
- "failed to get ahb-burst-config\n");
|
|
|
- return ret;
|
|
|
- }
|
|
|
+ of_property_read_u32(dev->of_node, "itc-setting",
|
|
|
+ &platdata->itc_setting);
|
|
|
+
|
|
|
+ ret = of_property_read_u32(dev->of_node, "ahb-burst-config",
|
|
|
+ &platdata->ahb_burst_config);
|
|
|
+ if (!ret) {
|
|
|
platdata->flags |= CI_HDRC_OVERRIDE_AHB_BURST;
|
|
|
+ } else if (ret != -EINVAL) {
|
|
|
+ dev_err(dev, "failed to get ahb-burst-config\n");
|
|
|
+ return ret;
|
|
|
}
|
|
|
|
|
|
- if (of_find_property(dev->of_node, "tx-burst-size-dword", NULL)) {
|
|
|
- ret = of_property_read_u32(dev->of_node, "tx-burst-size-dword",
|
|
|
- &platdata->tx_burst_size);
|
|
|
- if (ret) {
|
|
|
- dev_err(dev,
|
|
|
- "failed to get tx-burst-size-dword\n");
|
|
|
- return ret;
|
|
|
- }
|
|
|
+ ret = of_property_read_u32(dev->of_node, "tx-burst-size-dword",
|
|
|
+ &platdata->tx_burst_size);
|
|
|
+ if (!ret) {
|
|
|
platdata->flags |= CI_HDRC_OVERRIDE_TX_BURST;
|
|
|
+ } else if (ret != -EINVAL) {
|
|
|
+ dev_err(dev, "failed to get tx-burst-size-dword\n");
|
|
|
+ return ret;
|
|
|
}
|
|
|
|
|
|
- if (of_find_property(dev->of_node, "rx-burst-size-dword", NULL)) {
|
|
|
- ret = of_property_read_u32(dev->of_node, "rx-burst-size-dword",
|
|
|
- &platdata->rx_burst_size);
|
|
|
- if (ret) {
|
|
|
- dev_err(dev,
|
|
|
- "failed to get rx-burst-size-dword\n");
|
|
|
- return ret;
|
|
|
- }
|
|
|
+ ret = of_property_read_u32(dev->of_node, "rx-burst-size-dword",
|
|
|
+ &platdata->rx_burst_size);
|
|
|
+ if (!ret) {
|
|
|
platdata->flags |= CI_HDRC_OVERRIDE_RX_BURST;
|
|
|
+ } else if (ret != -EINVAL) {
|
|
|
+ dev_err(dev, "failed to get rx-burst-size-dword\n");
|
|
|
+ return ret;
|
|
|
}
|
|
|
|
|
|
ext_id = ERR_PTR(-ENODEV);
|