mfd: wm5110: Add registers for headphone short circuit control
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Thu, 9 Jan 2014 14:29:24 +0000 (14:29 +0000)
committerMark Brown <broonie@linaro.org>
Fri, 10 Jan 2014 11:52:17 +0000 (11:52 +0000)
Add the registers necessary to enable/disable the headphone short
circuit protection.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
drivers/mfd/wm5110-tables.c
include/linux/mfd/arizona/registers.h

Simple merge
Simple merge