Merge tag 'nfs-for-3.16-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[sfrench/cifs-2.6.git] / drivers / mfd / wm5102-tables.c

diff --git a/drivers/mfd/wm5102-tables.c b/drivers/mfd/wm5102-tables.c
index 070f8cfbbd7aa7c5f7d043178948fda4cea852b8..c8a993bd17ae75fe2d634a93dfc3ea1acebec588 100644 (file)
--- a/drivers/mfd/wm5102-tables.c
+++ b/drivers/mfd/wm5102-tables.c
@@ -333,7 +333,7 @@ static const struct reg_default wm5102_reg_default[] = {
        { 0x000001AA, 0x0004 },   /* R426   - FLL2 GPIO Clock */ 
        { 0x00000200, 0x0006 },   /* R512   - Mic Charge Pump 1 */ 
        { 0x00000210, 0x00D4 },   /* R528   - LDO1 Control 1 */ 
-       { 0x00000212, 0x0001 },   /* R530   - LDO1 Control 2 */
+       { 0x00000212, 0x0000 },   /* R530   - LDO1 Control 2 */
        { 0x00000213, 0x0344 },   /* R531   - LDO2 Control 1 */ 
        { 0x00000218, 0x01A6 },   /* R536   - Mic Bias Ctrl 1 */ 
        { 0x00000219, 0x01A6 },   /* R537   - Mic Bias Ctrl 2 */ 
@@ -1037,6 +1037,8 @@ static bool wm5102_readable_register(struct device *dev, unsigned int reg)
        case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_4:
        case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_5:
        case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_6:
+       case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_7:
+       case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_8:
        case ARIZONA_COMFORT_NOISE_GENERATOR:
        case ARIZONA_HAPTICS_CONTROL_1:
        case ARIZONA_HAPTICS_CONTROL_2: