Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge tag 'mfd-fixes-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
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
+6
-5
drivers/mfd/omap-usb-host.c
+6
-5
drivers/mfd/omap-usb-host.c
···
528
}
529
530
static const struct of_device_id usbhs_child_match_table[] = {
531
-
{ .compatible = "ti,omap-ehci", },
532
-
{ .compatible = "ti,omap-ohci", },
533
{ }
534
};
535
···
855
.pm = &usbhsomap_dev_pm_ops,
856
.of_match_table = usbhs_omap_dt_ids,
857
},
858
.remove = usbhs_omap_remove,
859
};
860
···
865
MODULE_LICENSE("GPL v2");
866
MODULE_DESCRIPTION("usb host common core driver for omap EHCI and OHCI");
867
868
-
static int __init omap_usbhs_drvinit(void)
869
{
870
-
return platform_driver_probe(&usbhs_omap_driver, usbhs_omap_probe);
871
}
872
873
/*
···
879
*/
880
fs_initcall_sync(omap_usbhs_drvinit);
881
882
-
static void __exit omap_usbhs_drvexit(void)
883
{
884
platform_driver_unregister(&usbhs_omap_driver);
885
}
···
528
}
529
530
static const struct of_device_id usbhs_child_match_table[] = {
531
+
{ .compatible = "ti,ehci-omap", },
532
+
{ .compatible = "ti,ohci-omap3", },
533
{ }
534
};
535
···
855
.pm = &usbhsomap_dev_pm_ops,
856
.of_match_table = usbhs_omap_dt_ids,
857
},
858
+
.probe = usbhs_omap_probe,
859
.remove = usbhs_omap_remove,
860
};
861
···
864
MODULE_LICENSE("GPL v2");
865
MODULE_DESCRIPTION("usb host common core driver for omap EHCI and OHCI");
866
867
+
static int omap_usbhs_drvinit(void)
868
{
869
+
return platform_driver_register(&usbhs_omap_driver);
870
}
871
872
/*
···
878
*/
879
fs_initcall_sync(omap_usbhs_drvinit);
880
881
+
static void omap_usbhs_drvexit(void)
882
{
883
platform_driver_unregister(&usbhs_omap_driver);
884
}
+10
-8
include/linux/mfd/da9063/pdata.h
+10
-8
include/linux/mfd/da9063/pdata.h
···
21
/*
22
* Regulator configuration
23
*/
24
-
/* DA9063 regulator IDs */
25
enum {
26
/* BUCKs */
27
DA9063_ID_BCORE1,
···
37
DA9063_ID_BMEM_BIO_MERGED,
38
/* When two BUCKs are merged, they cannot be reused separately */
39
40
-
/* LDOs */
41
-
DA9063_ID_LDO1,
42
-
DA9063_ID_LDO2,
43
DA9063_ID_LDO3,
44
-
DA9063_ID_LDO4,
45
-
DA9063_ID_LDO5,
46
-
DA9063_ID_LDO6,
47
DA9063_ID_LDO7,
48
DA9063_ID_LDO8,
49
DA9063_ID_LDO9,
50
-
DA9063_ID_LDO10,
51
DA9063_ID_LDO11,
52
};
53
54
/* Regulators platform data */
···
21
/*
22
* Regulator configuration
23
*/
24
+
/* DA9063 and DA9063L regulator IDs */
25
enum {
26
/* BUCKs */
27
DA9063_ID_BCORE1,
···
37
DA9063_ID_BMEM_BIO_MERGED,
38
/* When two BUCKs are merged, they cannot be reused separately */
39
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 */
48
+
DA9063_ID_LDO1,
49
+
DA9063_ID_LDO2,
50
+
DA9063_ID_LDO4,
51
+
DA9063_ID_LDO5,
52
+
DA9063_ID_LDO6,
53
+
DA9063_ID_LDO10,
54
};
55
56
/* Regulators platform data */