hc
2023-11-06 e3e12f52b214121840b44c91de5b3e5af5d3eb84
kernel/drivers/mmc/host/dw_mmc-rockchip.c
....@@ -438,8 +438,10 @@
438438 if (!pdev->dev.of_node)
439439 return -ENODEV;
440440
441
- if (!device_property_read_bool(&pdev->dev, "non-removable") &&
442
- !device_property_read_bool(&pdev->dev, "cd-gpios"))
441
+ if ((!device_property_read_bool(&pdev->dev, "non-removable") &&
442
+ !device_property_read_bool(&pdev->dev, "cd-gpios")) ||
443
+ (device_property_read_bool(&pdev->dev, "no-sd") &&
444
+ device_property_read_bool(&pdev->dev, "no-mmc")))
443445 use_rpm = false;
444446
445447 match = of_match_node(dw_mci_rockchip_match, pdev->dev.of_node);
....@@ -496,6 +498,7 @@
496498 .remove = dw_mci_rockchip_remove,
497499 .driver = {
498500 .name = "dwmmc_rockchip",
501
+ .probe_type = PROBE_PREFER_ASYNCHRONOUS,
499502 .of_match_table = dw_mci_rockchip_match,
500503 .pm = &dw_mci_rockchip_dev_pm_ops,
501504 },