Merge remote-tracking branch 'char-misc/char-misc-next'

diff --cc drivers/extcon/extcon-class.c
Simple merge

diff --cc drivers/uio/uio.c
Simple merge

diff --cc drivers/usb/dwc3/Kconfig
Simple merge

diff --cc drivers/usb/dwc3/dwc3-omap.c
index ecd99451ee90d3faf53b6e2c04e7514243b65627,b26c2a4b4fb5c9d3b49ec92085a189b8e6d1480e..7f7ea62e961b54c48516f40c79bba7a8c3fb9102
--- 1/drivers/usb/dwc3/dwc3-omap.c
--- 2/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@@ -389,10 -457,20 +437,18 @@@ static int dwc3_omap_probe(struct platf
                return -EINVAL;
        }
  
 -      base = devm_ioremap_nocache(dev, res->start, resource_size(res));
 -      if (!base) {
 -              dev_err(dev, "ioremap failed\n");
 -              return -ENOMEM;
 -      }
 +      base = devm_ioremap_resource(dev, res);
 +      if (IS_ERR(base))
 +              return PTR_ERR(base);
  
+       if (of_property_read_bool(node, "vbus-supply")) {
+               vbus_reg = devm_regulator_get(dev, "vbus");
+               if (IS_ERR(vbus_reg)) {
+                       dev_err(dev, "vbus init failed\n");
+                       return PTR_ERR(vbus_reg);
+               }
+       }
+ 
        spin_lock_init(&omap->lock);
  
        omap->dev       = dev;

diff --cc include/linux/mfd/palmas.h
Simple merge