From b89285fff8f6fed2818c4219179d7cdd828822fd Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Thu, 10 Jan 2013 15:38:48 +0000 Subject: [PATCH] --- yaml --- r: 371791 b: refs/heads/master c: 4f1b07581613bf076b0dacdd9a3fb290d3caa227 h: refs/heads/master i: 371789: 491452b8e6930c4ad89cbab1a21dcfdffcf0cf49 371787: 3a518d8befeeb0e3aeeea5b6dab5a4bcc9233397 371783: daf42c944ce00b44ae1622c87543823fef961594 371775: a5f5b5110f98cce1a28748d668d9b8793bdbd41b v: v3 --- [refs] | 2 +- trunk/drivers/mfd/wm5102-tables.c | 2 ++ trunk/include/linux/mfd/arizona/registers.h | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 19db2c6d1566..31a5b509f163 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76bf969e6f86e5de788dd943ff2d4340bac71822 +refs/heads/master: 4f1b07581613bf076b0dacdd9a3fb290d3caa227 diff --git a/trunk/drivers/mfd/wm5102-tables.c b/trunk/drivers/mfd/wm5102-tables.c index 8a6ce8c12505..7d01069c09db 100644 --- a/trunk/drivers/mfd/wm5102-tables.c +++ b/trunk/drivers/mfd/wm5102-tables.c @@ -1169,6 +1169,8 @@ static bool wm5102_readable_register(struct device *dev, unsigned int reg) case ARIZONA_NOISE_GATE_CONTROL: case ARIZONA_PDM_SPK1_CTRL_1: case ARIZONA_PDM_SPK1_CTRL_2: + case ARIZONA_SPK_CTRL_2: + case ARIZONA_SPK_CTRL_3: case ARIZONA_DAC_COMP_1: case ARIZONA_DAC_COMP_2: case ARIZONA_DAC_COMP_3: diff --git a/trunk/include/linux/mfd/arizona/registers.h b/trunk/include/linux/mfd/arizona/registers.h index a61ce90ecd3f..a47fd358016f 100644 --- a/trunk/include/linux/mfd/arizona/registers.h +++ b/trunk/include/linux/mfd/arizona/registers.h @@ -217,6 +217,8 @@ #define ARIZONA_PDM_SPK1_CTRL_2 0x491 #define ARIZONA_PDM_SPK2_CTRL_1 0x492 #define ARIZONA_PDM_SPK2_CTRL_2 0x493 +#define ARIZONA_SPK_CTRL_2 0x4B5 +#define ARIZONA_SPK_CTRL_3 0x4B6 #define ARIZONA_DAC_COMP_1 0x4DC #define ARIZONA_DAC_COMP_2 0x4DD #define ARIZONA_DAC_COMP_3 0x4DE