Merge tag 'mac80211-next-for-john-2014-11-04' of git://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / drivers / mfd / wm5102-tables.c

diff --git a/drivers/mfd/wm5102-tables.c b/drivers/mfd/wm5102-tables.c
index fb4d4bb..d6f35bb 100644 (file)
--- a/drivers/mfd/wm5102-tables.c
+++ b/drivers/mfd/wm5102-tables.c
@@ -87,6 +87,7 @@ int wm5102_patch(struct arizona *arizona)
        case 0:
                wm5102_patch = wm5102_reva_patch;
                patch_size = ARRAY_SIZE(wm5102_reva_patch);
+               break;
        default:
                wm5102_patch = wm5102_revb_patch;
                patch_size = ARRAY_SIZE(wm5102_revb_patch);
@@ -245,9 +246,6 @@ const struct regmap_irq_chip wm5102_irq = {
 static const struct reg_default wm5102_reg_default[] = {
        { 0x00000008, 0x0019 },   /* R8     - Ctrl IF SPI CFG 1 */ 
        { 0x00000009, 0x0001 },   /* R9     - Ctrl IF I2C1 CFG 1 */ 
-       { 0x00000016, 0x0000 },   /* R22    - Write Sequencer Ctrl 0 */ 
-       { 0x00000017, 0x0000 },   /* R23    - Write Sequencer Ctrl 1 */ 
-       { 0x00000018, 0x0000 },   /* R24    - Write Sequencer Ctrl 2 */ 
        { 0x00000020, 0x0000 },   /* R32    - Tone Generator 1 */ 
        { 0x00000021, 0x1000 },   /* R33    - Tone Generator 2 */ 
        { 0x00000022, 0x0000 },   /* R34    - Tone Generator 3 */ 
@@ -1016,6 +1014,7 @@ static bool wm5102_readable_register(struct device *dev, unsigned int reg)
        case ARIZONA_WRITE_SEQUENCER_CTRL_0:
        case ARIZONA_WRITE_SEQUENCER_CTRL_1:
        case ARIZONA_WRITE_SEQUENCER_CTRL_2:
+       case ARIZONA_WRITE_SEQUENCER_CTRL_3:
        case ARIZONA_WRITE_SEQUENCER_PROM:
        case ARIZONA_TONE_GENERATOR_1:
        case ARIZONA_TONE_GENERATOR_2:
@@ -1060,6 +1059,8 @@ static bool wm5102_readable_register(struct device *dev, unsigned int reg)
        case ARIZONA_ASYNC_CLOCK_1:
        case ARIZONA_ASYNC_SAMPLE_RATE_1:
        case ARIZONA_ASYNC_SAMPLE_RATE_1_STATUS:
+       case ARIZONA_ASYNC_SAMPLE_RATE_2:
+       case ARIZONA_ASYNC_SAMPLE_RATE_2_STATUS:
        case ARIZONA_OUTPUT_SYSTEM_CLOCK:
        case ARIZONA_OUTPUT_ASYNC_CLOCK:
        case ARIZONA_RATE_ESTIMATOR_1:
@@ -1880,6 +1881,10 @@ static bool wm5102_volatile_register(struct device *dev, unsigned int reg)
        switch (reg) {
        case ARIZONA_SOFTWARE_RESET:
        case ARIZONA_DEVICE_REVISION:
+       case ARIZONA_WRITE_SEQUENCER_CTRL_0:
+       case ARIZONA_WRITE_SEQUENCER_CTRL_1:
+       case ARIZONA_WRITE_SEQUENCER_CTRL_2:
+       case ARIZONA_WRITE_SEQUENCER_CTRL_3:
        case ARIZONA_OUTPUT_STATUS_1:
        case ARIZONA_RAW_OUTPUT_STATUS_1:
        case ARIZONA_SLIMBUS_RX_PORT_STATUS:
@@ -1889,8 +1894,13 @@ static bool wm5102_volatile_register(struct device *dev, unsigned int reg)
        case ARIZONA_SAMPLE_RATE_3_STATUS:
        case ARIZONA_HAPTICS_STATUS:
        case ARIZONA_ASYNC_SAMPLE_RATE_1_STATUS:
+       case ARIZONA_ASYNC_SAMPLE_RATE_2_STATUS:
        case ARIZONA_FLL1_NCO_TEST_0:
        case ARIZONA_FLL2_NCO_TEST_0:
+       case ARIZONA_DAC_COMP_1:
+       case ARIZONA_DAC_COMP_2:
+       case ARIZONA_DAC_COMP_3:
+       case ARIZONA_DAC_COMP_4:
        case ARIZONA_FX_CTRL2:
        case ARIZONA_INTERRUPT_STATUS_1:
        case ARIZONA_INTERRUPT_STATUS_2: