Lee writes: "MFD fixes for v4.19 - Fix Dialog DA9063 regulator constraints issue causing failure in probe - Fix OMAP Device Tree compatible strings to match DT" * tag 'mfd-fixes-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: mfd: omap-usb-host: Fix dts probe of children mfd: da9063: Fix DT probing with constraints
Unified · Split
| @@ -528,8 +528,8 @@ static int usbhs_omap_get_dt_pdata(struct device *dev, · 527 unmodified lines | ||
| 528 | 528 | } |
| 529 | 529 | |
| 530 | 530 | static const struct of_device_id usbhs_child_match_table[] = { |
| 531 | − { .compatible = "ti,omap-ehci", }, | |
| 532 | − { .compatible = "ti,omap-ohci", }, | |
| 531 | + { .compatible = "ti,ehci-omap", }, | |
| 532 | + { .compatible = "ti,ohci-omap3", }, | |
| 533 | 533 | { } |
| 534 | 534 | }; |
| 535 | 535 | |
| @@ -855,6 +855,7 @@ static struct platform_driver usbhs_omap_driver = { · 319 unmodified lines | ||
| 855 | 855 | .pm = &usbhsomap_dev_pm_ops, |
| 856 | 856 | .of_match_table = usbhs_omap_dt_ids, |
| 857 | 857 | }, |
| 858 | + .probe = usbhs_omap_probe, | |
| 858 | 859 | .remove = usbhs_omap_remove, |
| 859 | 860 | }; |
| 860 | 861 | |
| @@ -864,9 +865,9 @@ MODULE_ALIAS("platform:" USBHS_DRIVER_NAME); · 3 unmodified lines | ||
| 864 | 865 | MODULE_LICENSE("GPL v2"); |
| 865 | 866 | MODULE_DESCRIPTION("usb host common core driver for omap EHCI and OHCI"); |
| 866 | 867 | |
| 867 | −static int __init omap_usbhs_drvinit(void) | |
| 868 | +static int omap_usbhs_drvinit(void) | |
| 868 | 869 | { |
| 869 | − return platform_driver_probe(&usbhs_omap_driver, usbhs_omap_probe); | |
| 870 | + return platform_driver_register(&usbhs_omap_driver); | |
| 870 | 871 | } |
| 871 | 872 | |
| 872 | 873 | /* |
| @@ -878,7 +879,7 @@ static int __init omap_usbhs_drvinit(void) · 5 unmodified lines | ||
| 878 | 879 | */ |
| 879 | 880 | fs_initcall_sync(omap_usbhs_drvinit); |
| 880 | 881 | |
| 881 | −static void __exit omap_usbhs_drvexit(void) | |
| 882 | +static void omap_usbhs_drvexit(void) | |
| 882 | 883 | { |
| 883 | 884 | platform_driver_unregister(&usbhs_omap_driver); |
| 884 | 885 | } |
| @@ -21,7 +21,7 @@ · 20 unmodified lines | ||
| 21 | 21 | /* |
| 22 | 22 | * Regulator configuration |
| 23 | 23 | */ |
| 24 | −/* DA9063 regulator IDs */ | |
| 24 | +/* DA9063 and DA9063L regulator IDs */ | |
| 25 | 25 | enum { |
| 26 | 26 | /* BUCKs */ |
| 27 | 27 | DA9063_ID_BCORE1, |
| @@ -37,18 +37,20 @@ enum { · 9 unmodified lines | ||
| 37 | 37 | DA9063_ID_BMEM_BIO_MERGED, |
| 38 | 38 | /* When two BUCKs are merged, they cannot be reused separately */ |
| 39 | 39 | |
| 40 | − /* LDOs */ | |
| 40 | + /* LDOs on both DA9063 and DA9063L */ | |
| 41 | + DA9063_ID_LDO3, | |
| 42 | + DA9063_ID_LDO7, | |
| 43 | + DA9063_ID_LDO8, | |
| 44 | + DA9063_ID_LDO9, | |
| 45 | + DA9063_ID_LDO11, | |
| 46 | + | |
| 47 | + /* DA9063-only LDOs */ | |
| 41 | 48 | DA9063_ID_LDO1, |
| 42 | 49 | DA9063_ID_LDO2, |
| 43 | − DA9063_ID_LDO3, | |
| 44 | 50 | DA9063_ID_LDO4, |
| 45 | 51 | DA9063_ID_LDO5, |
| 46 | 52 | DA9063_ID_LDO6, |
| 47 | − DA9063_ID_LDO7, | |
| 48 | − DA9063_ID_LDO8, | |
| 49 | − DA9063_ID_LDO9, | |
| 50 | 53 | DA9063_ID_LDO10, |
| 51 | − DA9063_ID_LDO11, | |
| 52 | 54 | }; |
| 53 | 55 | |
| 54 | 56 | /* Regulators platform data */ |