lkml.org 
[lkml]   [2015]   [Jul]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Subject[PATCH v2 0/4] regulator: input: Merge max77843 haptic driver into max77693
Date
Hi Mark,

This patchset depends on "regulator: Merge max77843 into max77693" [0]
which you applied already. Dmitry agreed [1] to take this through
regulator tree.

Can you apply it?


Changes since v1
================
1. Fix signed-off-by in patch 4/4.
2. Add acked-by Dmitry.


Description
===========
The Maxim 77843 haptic driver differs from 77693 by:
1. Setting the bias.
2. Different configuration register.
3. Not enabling the low-sys DAC.
4. Using same regmap for PMIC and haptic blocks.

The patchset merges max77843 driver into the max77693.


Dependencies
============
The patchset *depends on* "regulator: Merge max77843 into max77693" [0]
which was applied by Mark Brown (regulator tree). The mentioned
regulator patchset actually changed also MFD drivers and other headers
so the child drivers (like max77693 regulator or haptic) can be used
with both max77693 and max77843 main MFD drivers.


Merging ideas
=============
0. Patches 1 and 2 can be applied directly.
For rest of it (patches 3 and 4):
1. If this will go to v4.3, then maybe Mark Brown could prepare
an immutable branch (or a tag) with the [0] patchset?
2. If this will go to v4.4, then patchset can wait till MFD/regulator
changes reach Linus' tree.
3. Everything will go through regulator tree (with Dmitry's ack).


Best regards,
Krzysztof

[0] https://lkml.org/lkml/2015/7/15/554
[1] http://www.spinics.net/lists/kernel/msg2044546.html

Krzysztof Kozlowski (4):
Input: max77693: Remove a read-only pwm_divisor field
Input: max77693: Prepare for adding support for Maxim 77843
Input: max77693: Add support for Maxim 77843
Input: Remove the max77843 haptic driver

drivers/input/misc/Kconfig | 18 +-
drivers/input/misc/Makefile | 1 -
drivers/input/misc/max77693-haptic.c | 91 +++++++--
drivers/input/misc/max77843-haptic.c | 359 -----------------------------------
4 files changed, 82 insertions(+), 387 deletions(-)
delete mode 100644 drivers/input/misc/max77843-haptic.c

--
1.9.1



\
 
 \ /
  Last update: 2015-07-30 07:21    [W:1.547 / U:0.092 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site