Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d02771fb authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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
parents 18d49ec3 10492ee8

drivers/mfd/omap-usb-host.c

+6 −5
Original line number Diff line number Diff line
@@ -528,8 +528,8 @@ static int usbhs_omap_get_dt_pdata(struct device *dev, 
}



static const struct of_device_id usbhs_child_match_table[] = {

	{ .compatible = "ti,omap-ehci", },

	{ .compatible = "ti,omap-ohci", },

	{ .compatible = "ti,ehci-omap", },

	{ .compatible = "ti,ohci-omap3", },

	{ }

};
@@ -855,6 +855,7 @@ static struct platform_driver usbhs_omap_driver = { 
		.pm		= &usbhsomap_dev_pm_ops,

		.of_match_table = usbhs_omap_dt_ids,

	},

	.probe		= usbhs_omap_probe,

	.remove		= usbhs_omap_remove,

};
@@ -864,9 +865,9 @@ MODULE_ALIAS("platform:" USBHS_DRIVER_NAME); 
MODULE_LICENSE("GPL v2");

MODULE_DESCRIPTION("usb host common core driver for omap EHCI and OHCI");



static int __init omap_usbhs_drvinit(void)

static int omap_usbhs_drvinit(void)

{

	return platform_driver_probe(&usbhs_omap_driver, usbhs_omap_probe);

	return platform_driver_register(&usbhs_omap_driver);

}



/*
@@ -878,7 +879,7 @@ static int __init omap_usbhs_drvinit(void) 
 */

fs_initcall_sync(omap_usbhs_drvinit);



static void __exit omap_usbhs_drvexit(void)

static void omap_usbhs_drvexit(void)

{

	platform_driver_unregister(&usbhs_omap_driver);

}

include/linux/mfd/da9063/pdata.h

+9 −7
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
/*

 * Regulator configuration

 */

/* DA9063 regulator IDs */

/* DA9063 and DA9063L regulator IDs */

enum {

	/* BUCKs */

	DA9063_ID_BCORE1,
@@ -37,18 +37,20 @@ enum { 
	DA9063_ID_BMEM_BIO_MERGED,

	/* When two BUCKs are merged, they cannot be reused separately */



	/* LDOs */

	/* LDOs on both DA9063 and DA9063L */

	DA9063_ID_LDO3,

	DA9063_ID_LDO7,

	DA9063_ID_LDO8,

	DA9063_ID_LDO9,

	DA9063_ID_LDO11,



	/* DA9063-only LDOs */

	DA9063_ID_LDO1,

	DA9063_ID_LDO2,

	DA9063_ID_LDO3,

	DA9063_ID_LDO4,

	DA9063_ID_LDO5,

	DA9063_ID_LDO6,

	DA9063_ID_LDO7,

	DA9063_ID_LDO8,

	DA9063_ID_LDO9,

	DA9063_ID_LDO10,

	DA9063_ID_LDO11,

};



/* Regulators platform data */