Merge remote-tracking branch 'input/next'

diff --combined drivers/input/misc/max77693-haptic.c
index 29ddeb7be84bb485f676ea1fb632db48a53d9cfc,08d5394dd9815ea45f30b9670948d79f7317574e..46b0f48fbf49a3f6feb578e768a336c63f2c9fec
--- 1/drivers/input/misc/max77693-haptic.c
--- 2/drivers/input/misc/max77693-haptic.c
+++ b/drivers/input/misc/max77693-haptic.c
@@@ -3,7 -3,7 +3,7 @@@
   *
   * Copyright (C) 2014,2015 Samsung Electronics
   * Jaewon Kim <jaewon02.kim@samsung.com>
-  * Krzysztof Kozlowski <k.kozlowski@samsung.com>
+  * Krzysztof Kozlowski <krzk@kernel.org>
   *
   * This program is not provided / owned by Maxim Integrated Products.
   *
@@@ -70,13 -70,10 +70,13 @@@ struct max77693_haptic 
  
  static int max77693_haptic_set_duty_cycle(struct max77693_haptic *haptic)
  {
 -      int delta = (haptic->pwm_dev->period + haptic->pwm_duty) / 2;
 +      struct pwm_args pargs;
 +      int delta;
        int error;
  
 -      error = pwm_config(haptic->pwm_dev, delta, haptic->pwm_dev->period);
 +      pwm_get_args(haptic->pwm_dev, &pargs);
 +      delta = (pargs.period + haptic->pwm_duty) / 2;
 +      error = pwm_config(haptic->pwm_dev, delta, pargs.period);
        if (error) {
                dev_err(haptic->dev, "failed to configure pwm: %d\n", error);
                return error;
@@@ -237,7 -234,6 +237,7 @@@ static int max77693_haptic_play_effect(
                                       struct ff_effect *effect)
  {
        struct max77693_haptic *haptic = input_get_drvdata(dev);
 +      struct pwm_args pargs;
        u64 period_mag_multi;
  
        haptic->magnitude = effect->u.rumble.strong_magnitude;
@@@ -249,8 -245,7 +249,8 @@@
         * The formula to convert magnitude to pwm_duty as follows:
         * - pwm_duty = (magnitude * pwm_period) / MAX_MAGNITUDE(0xFFFF)
         */
 -      period_mag_multi = (u64)haptic->pwm_dev->period * haptic->magnitude;
 +      pwm_get_args(haptic->pwm_dev, &pargs);
 +      period_mag_multi = (u64)pargs.period * haptic->magnitude;
        haptic->pwm_duty = (unsigned int)(period_mag_multi >>
                                                MAX_MAGNITUDE_SHIFT);
  
@@@ -334,12 -329,6 +334,12 @@@ static int max77693_haptic_probe(struc
                return PTR_ERR(haptic->pwm_dev);
        }
  
 +      /*
 +       * FIXME: pwm_apply_args() should be removed when switching to the
 +       * atomic PWM API.
 +       */
 +      pwm_apply_args(haptic->pwm_dev);
 +
        haptic->motor_reg = devm_regulator_get(&pdev->dev, "haptic");
        if (IS_ERR(haptic->motor_reg)) {
                dev_err(&pdev->dev, "failed to get regulator\n");
@@@ -426,7 -415,7 +426,7 @@@ static struct platform_driver max77693_
  module_platform_driver(max77693_haptic_driver);
  
  MODULE_AUTHOR("Jaewon Kim <jaewon02.kim@samsung.com>");
- MODULE_AUTHOR("Krzysztof Kozlowski <k.kozlowski@samsung.com>");
+ MODULE_AUTHOR("Krzysztof Kozlowski <krzk@kernel.org>");
  MODULE_DESCRIPTION("MAXIM 77693/77843 Haptic driver");
  MODULE_ALIAS("platform:max77693-haptic");
  MODULE_LICENSE("GPL");

diff --combined drivers/input/touchscreen/Kconfig
index 754e6aa0851dfb5e77009d412896bda5b094ce42,c3e20e5357d4f9489542efb19e585b45df68bc77..fce1e41ffe8b040d143bc9c03ea0931e719a3bec
--- 1/drivers/input/touchscreen/Kconfig
--- 2/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@@ -115,14 -115,6 +115,14 @@@ config TOUCHSCREEN_ATMEL_MX
          To compile this driver as a module, choose M here: the
          module will be called atmel_mxt_ts.
  
 +config TOUCHSCREEN_ATMEL_MXT_T37
 +      bool "Support T37 Diagnostic Data"
 +      depends on TOUCHSCREEN_ATMEL_MXT && VIDEO_V4L2
 +      select VIDEOBUF2_VMALLOC
 +      help
 +        Say Y here if you want support to output data from the T37
 +        Diagnostic Data object using a V4L device.
 +
  config TOUCHSCREEN_AUO_PIXCIR
        tristate "AUO in-cell touchscreen using Pixcir ICs"
        depends on I2C
@@@ -313,19 -305,6 +313,6 @@@ config TOUCHSCREEN_EGALAX_SERIA
          To compile this driver as a module, choose M here: the
          module will be called egalax_ts_serial.
  
- config TOUCHSCREEN_FT6236
-       tristate "FT6236 I2C touchscreen"
-       depends on I2C
-       depends on GPIOLIB || COMPILE_TEST
-       help
-         Say Y here to enable support for the I2C connected FT6x06 and
-         FT6x36 family of capacitive touchscreen drivers.
- 
-         If unsure, say N.
- 
-         To compile this driver as a module, choose M here: the
-         module will be called ft6236.
- 
  config TOUCHSCREEN_FUJITSU
        tristate "Fujitsu serial touchscreen"
        select SERIO
@@@ -1082,7 -1061,6 +1069,7 @@@ config TOUCHSCREEN_SILEA
  config TOUCHSCREEN_SIS_I2C
        tristate "SiS 9200 family I2C touchscreen"
        depends on I2C
 +      select CRC_ITU_T
        depends on GPIOLIB || COMPILE_TEST
        help
          This enables support for SiS 9200 family over I2C based touchscreens.