Merge branch 'fixes-rc1' into omap-for-v4.3/fixes

diff --combined arch/arm/configs/omap2plus_defconfig
index 7b35e70d4bb371fd337cf426a36392c54ac7303f,1860f517421d36e5e526cd6a74947d28c25db046..ffc8fa2565f966538b18e91e96db32aa49110596
--- 1/arch/arm/configs/omap2plus_defconfig
--- 2/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@@ -240,7 -240,7 +240,7 @@@ CONFIG_SSI_PROTOCOL=
  CONFIG_PINCTRL_SINGLE=y
  CONFIG_DEBUG_GPIO=y
  CONFIG_GPIO_SYSFS=y
- CONFIG_GPIO_PCF857X=m
+ CONFIG_GPIO_PCF857X=y
  CONFIG_GPIO_TWL4030=y
  CONFIG_GPIO_PALMAS=y
  CONFIG_W1=m
@@@ -350,8 -350,6 +350,8 @@@ CONFIG_USB_MUSB_HDRC=
  CONFIG_USB_MUSB_OMAP2PLUS=m
  CONFIG_USB_MUSB_AM35X=m
  CONFIG_USB_MUSB_DSPS=m
 +CONFIG_USB_INVENTRA_DMA=y
 +CONFIG_USB_TI_CPPI41_DMA=y
  CONFIG_USB_DWC3=m
  CONFIG_USB_TEST=m
  CONFIG_AM335X_PHY_USB=y