Krzysztof Kozlowski 6eaa247a5b Input: max77693: Prepare for adding support for Maxim 77843 ...

Prepare the driver for supporting two devices: Maxim 77693 and 77843:
1. Add table of device ids and store current device type for later
   usage.
2. Differentiate the haptic device configuration.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

2015-08-07 14:57:25 +01:00

..

accessibility

…

acpi

Merge tag 'acpica-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2015-07-02 17:11:28 -07:00

amba

…

android

…

ata

Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2015-06-26 11:08:27 -07:00

atm

…

auxdisplay

…

base

Merge branch 'akpm' (patches from Andrew)

2015-07-01 17:47:51 -07:00

bcma

…

block

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2015-07-04 19:36:06 -07:00

bluetooth

Bluetooth: ath3k: Add support of 04ca:300d AR3012 device

2015-06-18 21:00:06 +03:00

bus

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2015-06-26 11:54:29 -07:00

cdrom

…

char

Merge tag 'drm-intel-next-fixes-2015-07-02' of git://anongit.freedesktop.org/drm-intel

2015-07-02 14:36:40 -07:00

clk

Merge tag 'module-builtin_driver-v4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2015-07-02 10:42:13 -07:00

clocksource

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2015-07-01 15:44:18 -07:00

connector

…

cpufreq

Merge tag 'module-builtin_driver-v4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2015-07-02 10:42:13 -07:00

cpuidle

Merge tag 'module-builtin_driver-v4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2015-07-02 10:42:13 -07:00

crypto

crypto: marvell/cesa - another fix up for of_get_named_gen_pool() rename

2015-07-03 11:37:02 -07:00

dca

…

devfreq

…

dio

…

dma

Merge branch 'akpm' (patches from Andrew)

2015-07-01 17:47:51 -07:00

dma-buf

…

edac

Merge tag 'edac_urgent_for_4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

2015-07-03 12:10:12 -07:00

eisa

…

extcon

mfd/extcon: max77843: Rename defines to allow inclusion with max77693

2015-07-16 21:39:30 +01:00

firewire

…

firmware

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

2015-07-03 15:20:57 -07:00

fmc

…

gpio

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2015-07-01 15:19:35 -07:00

gpu

Merge tag 'topic/drm-fixes-2015-07-04' of git://anongit.freedesktop.org/drm-intel

2015-07-03 16:09:29 -07:00

hid

Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4.2/rmi', 'for-4.2/sensor-hub', 'for-4.2/sjoy', 'for-4.2/sony' and 'for-4.2/wacom' into for-linus

2015-06-22 16:23:43 +02:00

hsi

Merge tag 'module-implicit-v4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2015-07-02 10:25:22 -07:00

hv

…

hwmon

hwmon: (w83627ehf) Use swap() in w82627ehf_swap_tempreg()

2015-07-03 14:39:06 +02:00

hwspinlock

hwspinlock: qcom: Correct msb in regmap_field

2015-07-01 16:15:05 +03:00

hwtracing/coresight

…

i2c

Merge tag 'char-misc-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2015-06-26 14:51:15 -07:00

ide

Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2015-07-01 10:49:25 -07:00

idle

…

iio

…

infiniband

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2015-07-04 19:36:06 -07:00

input

Input: max77693: Prepare for adding support for Maxim 77843

2015-08-07 14:57:25 +01:00

iommu

Merge tag 'iommu-fixes-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

2015-07-01 14:44:22 -07:00

ipack

…

irqchip

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2015-07-04 09:22:51 -07:00

isdn

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2015-06-24 16:49:49 -07:00

leds

drivers: max77693: Move state container to common header

2015-07-16 21:39:30 +01:00

lguest

Merge branch 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2015-06-22 17:59:09 -07:00

macintosh

…

mailbox

Merge tag 'module_init-alternate_initcall-v4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2015-07-02 10:36:29 -07:00

mcb

…

md

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2015-07-04 19:36:06 -07:00

media

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds

2015-07-01 19:09:11 -07:00

memory

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2015-06-26 11:54:29 -07:00

memstick

memstick: remove deprecated use of pci api

2015-06-30 19:44:57 -07:00

message

…

mfd

drivers: max77843: Switch to common max77693 state container

2015-07-16 21:39:30 +01:00

misc

Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2015-07-01 10:49:25 -07:00

mmc

Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2015-07-02 14:40:49 -07:00

mtd

Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2015-07-01 10:49:25 -07:00

net

Merge tag 'ntb-4.2' of git://github.com/jonmason/ntb

2015-07-04 14:07:47 -07:00

nfc

Merge tag 'char-misc-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2015-06-26 14:51:15 -07:00

ntb

NTB: Add split BAR output for debugfs stats

2015-07-04 14:09:32 -04:00

nubus

…

nvdimm

arch, x86: pmem api for ensuring durability of persistent memory updates

2015-06-26 11:23:38 -04:00

of

Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux

2015-07-01 19:40:18 -07:00

oprofile

…

parisc

…

parport

…

pci

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2015-07-01 15:19:35 -07:00

pcmcia

Merge tag 'module-implicit-v4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2015-07-02 10:25:22 -07:00

phy

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2015-06-27 12:44:34 -07:00

pinctrl

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2015-07-01 15:19:35 -07:00

platform

Merge tag 'platform-drivers-x86-v4.2-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86

2015-07-05 10:54:09 -07:00

pnp

Merge branches 'pnp' and 'pm-tools'

2015-06-19 01:18:43 +02:00

power

drivers: max77693: Move state container to common header

2015-07-16 21:39:30 +01:00

powercap

…

pps

…

ps3

…

ptp

…

pwm

Merge tag 'pwm/for-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm

2015-06-23 13:32:38 -07:00

rapidio

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2015-06-23 14:08:54 -07:00

ras

…

regulator

regulator: Remove the max77843 driver

2015-07-16 21:39:30 +01:00

remoteproc

remoteproc: fix !CONFIG_OF build breakage

2015-06-18 11:44:41 +03:00

reset

…

rpmsg

…

rtc

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2015-06-27 12:44:34 -07:00

s390

KVM: s390: virtio-ccw: don't overwrite config space values

2015-07-03 18:55:18 +02:00

sbus

…

scsi

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2015-07-04 14:13:43 -07:00

sfi

…

sh

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2015-07-01 15:19:35 -07:00

sn

…

soc

Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2015-07-02 14:40:49 -07:00

spi

Merge remote-tracking branches 'spi/topic/sirf', 'spi/topic/spidev' and 'spi/topic/zynq' into spi-next

2015-06-18 00:19:56 +01:00

spmi

…

ssb

…

staging

Merge tag 'staging-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

2015-06-26 15:46:08 -07:00

target

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2015-07-04 14:13:43 -07:00

tc

…

thermal

Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2015-07-01 10:49:25 -07:00

thunderbolt

…

tty

Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2015-07-02 14:40:49 -07:00

uio

…

usb

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2015-07-04 19:36:06 -07:00

uwb

…

vfio

Merge tag 'vfio-v4.2-rc1' of git://github.com/awilliam/linux-vfio

2015-06-28 12:32:13 -07:00

vhost

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2015-07-04 14:13:43 -07:00

video

Merge tag 'fbdev-fixes-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

2015-07-03 12:11:17 -07:00

virt

…

virtio

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

2015-07-03 16:02:25 -07:00

vlynq

…

vme

…

w1

…

watchdog

Merge git://www.linux-watchdog.org/linux-watchdog

2015-07-01 19:33:16 -07:00

xen

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2015-07-04 14:13:43 -07:00

zorro

…

Kconfig

libnvdimm, nfit: initial libnvdimm infrastructure and NFIT support

2015-06-24 21:24:10 -04:00

Makefile

Merge tag 'libnvdimm-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/nvdimm

2015-06-29 10:34:42 -07:00