Merge branches 'ib-mfd-arm-i2c-4.14', 'ib-mfd-arm-usb-video-4.14', 'ib-mfd-hwmon...

diff --combined arch/arm/mach-omap1/board-osk.c
index 4dfb995048103b8bff965b6119f3665e54887a40,f20361b8ffb6e0986079a1177b75e3bf5b470dd4,4dfb995048103b8bff965b6119f3665e54887a40,95ac1929aede4d3f82cabcf627ccf548d369b6c6,4dfb995048103b8bff965b6119f3665e54887a40,95ac1929aede4d3f82cabcf627ccf548d369b6c6,4dfb995048103b8bff965b6119f3665e54887a40..d579f4e04137433a1413f039e2432fd2f4c92b25
--- 1/arch/arm/mach-omap1/board-osk.c
--- 2/arch/arm/mach-omap1/board-osk.c
--- 3/arch/arm/mach-omap1/board-osk.c
--- 4/arch/arm/mach-omap1/board-osk.c
--- 5/arch/arm/mach-omap1/board-osk.c
--- 6/arch/arm/mach-omap1/board-osk.c
--- 7/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@@@@@@@ -38,7 -38,7 -38,7 -38,7 -38,7 -38,7 -38,7 +38,7 @@@@@@@@
       #include <linux/mtd/mtd.h>
       #include <linux/mtd/partitions.h>
       #include <linux/mtd/physmap.h>
- -----#include <linux/i2c/tps65010.h>
+ +++++#include <linux/mfd/tps65010.h>
       #include <linux/platform_data/gpio-omap.h>
       #include <linux/platform_data/omap1_bl.h>
       
@@@@@@@@ -441,13 -441,13 -441,13 -441,11 -441,13 -441,11 -441,13 +441,11 @@@@@@@@ static struct spi_board_info __initdat
        .chip_select            = 0,
       } };
       
--- - -#ifdef   CONFIG_PM
       static irqreturn_t
       osk_mistral_wake_interrupt(int irq, void *ignored)
       {
        return IRQ_HANDLED;
       }
--- - -#endif
       
       static void __init osk_mistral_init(void)
       {
@@@@@@@@ -515,7 -515,7 -515,7 -513,6 -515,7 -513,6 -515,7 +513,6 @@@@@@@@
       
                gpio_direction_input(OMAP_MPUIO(2));
                irq_set_irq_type(irq, IRQ_TYPE_EDGE_RISING);
--- - -#ifdef   CONFIG_PM
                /* share the IRQ in case someone wants to use the
                 * button for more than wakeup from system sleep.
                 */
@@@@@@@@ -529,7 -529,7 -529,7 -526,6 -529,7 -526,6 -529,7 +526,6 @@@@@@@@
                                ret);
                } else
                        enable_irq_wake(irq);
--- - -#endif
        } else
                printk(KERN_ERR "OSK+Mistral: wakeup button is awol\n");
       

diff --combined drivers/mfd/Kconfig
index 94ad2c1c3d9055df0b245e58db6dc4c9e9d9c2b2,94ad2c1c3d9055df0b245e58db6dc4c9e9d9c2b2,94ad2c1c3d9055df0b245e58db6dc4c9e9d9c2b2,fe76db945f466163f41a1a1209de897465673830,94ad2c1c3d9055df0b245e58db6dc4c9e9d9c2b2,94ad2c1c3d9055df0b245e58db6dc4c9e9d9c2b2,38d3ea466f741fbb674f7bf29152fbe134735be8..7a01e70ac0abb6408104ed32e160d2194505a45b
--- 1/drivers/mfd/Kconfig
--- 2/drivers/mfd/Kconfig
--- 3/drivers/mfd/Kconfig
--- 4/drivers/mfd/Kconfig
--- 5/drivers/mfd/Kconfig
--- 6/drivers/mfd/Kconfig
--- 7/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@@@@@@@ -951,13 -951,13 -951,13 -951,13 -951,13 -951,13 -951,13 +951,13 @@@@@@@@ config MFD_RC5T58
          different functionality of the device.
       
       config MFD_RK808
------  tristate "Rockchip RK808/RK818 Power Management Chip"
++++++  tristate "Rockchip RK805/RK808/RK818 Power Management Chip"
        depends on I2C && OF
        select MFD_CORE
        select REGMAP_I2C
        select REGMAP_IRQ
        help
------    If you say yes here you get support for the RK808 and RK818
++++++    If you say yes here you get support for the RK805, RK808 and RK818
          Power Management chips.
          This driver provides common support for accessing the device
          through I2C interface. The device supports multiple sub-devices
@@@@@@@@ -1723,6 -1723,6 -1723,6 -1723,20 -1723,6 -1723,6 -1723,6 +1723,20 @@@@@@@@ config MFD_STW481
          in various ST Microelectronics and ST-Ericsson embedded
          Nomadik series.
       
+++ +++config MFD_STM32_LPTIMER
+++ +++ tristate "Support for STM32 Low-Power Timer"
+++ +++ depends on (ARCH_STM32 && OF) || COMPILE_TEST
+++ +++ select MFD_CORE
+++ +++ select REGMAP
+++ +++ select REGMAP_MMIO
+++ +++ help
+++ +++   Select this option to enable STM32 Low-Power Timer driver
+++ +++   used for PWM, IIO Trigger, IIO Encoder and Counter. Shared
+++ +++   resources are also dealt with here.
+++ +++
+++ +++   To compile this driver as a module, choose M here: the
+++ +++   module will be called stm32-lptimer.
+++ +++
       config MFD_STM32_TIMERS
        tristate "Support for STM32 Timers"
        depends on (ARCH_STM32 && OF) || COMPILE_TEST