aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>2013-08-06 11:42:27 -0400
committerLee Jones <lee.jones@linaro.org>2013-08-14 13:53:06 -0400
commitc78d20350d682267ed48c2f907d18f2b413f3c66 (patch)
tree59491b831d2d2689945262ae345268ae3f4264f4
parent45491ada9830cd22e386499cbeb7cab2f24a1136 (diff)
mfd: wm5110: Mark register containing FLL gains as readable
The FLL gains are present on all devices and controlled from common code shared between them. This patch adds these registers into defaults list for wm5110 and marks them as readable. Reported-by: D.J. Barrow <dbarrow@wolfsonmicro.com> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r--drivers/mfd/wm5110-tables.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/mfd/wm5110-tables.c b/drivers/mfd/wm5110-tables.c
index 2a7972349159..c04324d18426 100644
--- a/drivers/mfd/wm5110-tables.c
+++ b/drivers/mfd/wm5110-tables.c
@@ -468,12 +468,14 @@ static const struct reg_default wm5110_reg_default[] = {
468 { 0x00000176, 0x0000 }, /* R374 - FLL1 Control 6 */ 468 { 0x00000176, 0x0000 }, /* R374 - FLL1 Control 6 */
469 { 0x00000177, 0x0281 }, /* R375 - FLL1 Loop Filter Test 1 */ 469 { 0x00000177, 0x0281 }, /* R375 - FLL1 Loop Filter Test 1 */
470 { 0x00000178, 0x0000 }, /* R376 - FLL1 NCO Test 0 */ 470 { 0x00000178, 0x0000 }, /* R376 - FLL1 NCO Test 0 */
471 { 0x00000179, 0x0000 }, /* R376 - FLL1 Control 7 */
471 { 0x00000181, 0x0000 }, /* R385 - FLL1 Synchroniser 1 */ 472 { 0x00000181, 0x0000 }, /* R385 - FLL1 Synchroniser 1 */
472 { 0x00000182, 0x0000 }, /* R386 - FLL1 Synchroniser 2 */ 473 { 0x00000182, 0x0000 }, /* R386 - FLL1 Synchroniser 2 */
473 { 0x00000183, 0x0000 }, /* R387 - FLL1 Synchroniser 3 */ 474 { 0x00000183, 0x0000 }, /* R387 - FLL1 Synchroniser 3 */
474 { 0x00000184, 0x0000 }, /* R388 - FLL1 Synchroniser 4 */ 475 { 0x00000184, 0x0000 }, /* R388 - FLL1 Synchroniser 4 */
475 { 0x00000185, 0x0000 }, /* R389 - FLL1 Synchroniser 5 */ 476 { 0x00000185, 0x0000 }, /* R389 - FLL1 Synchroniser 5 */
476 { 0x00000186, 0x0000 }, /* R390 - FLL1 Synchroniser 6 */ 477 { 0x00000186, 0x0000 }, /* R390 - FLL1 Synchroniser 6 */
478 { 0x00000187, 0x0001 }, /* R390 - FLL1 Synchroniser 7 */
477 { 0x00000189, 0x0000 }, /* R393 - FLL1 Spread Spectrum */ 479 { 0x00000189, 0x0000 }, /* R393 - FLL1 Spread Spectrum */
478 { 0x0000018A, 0x0004 }, /* R394 - FLL1 GPIO Clock */ 480 { 0x0000018A, 0x0004 }, /* R394 - FLL1 GPIO Clock */
479 { 0x00000191, 0x0000 }, /* R401 - FLL2 Control 1 */ 481 { 0x00000191, 0x0000 }, /* R401 - FLL2 Control 1 */
@@ -484,12 +486,14 @@ static const struct reg_default wm5110_reg_default[] = {
484 { 0x00000196, 0x0000 }, /* R406 - FLL2 Control 6 */ 486 { 0x00000196, 0x0000 }, /* R406 - FLL2 Control 6 */
485 { 0x00000197, 0x0000 }, /* R407 - FLL2 Loop Filter Test 1 */ 487 { 0x00000197, 0x0000 }, /* R407 - FLL2 Loop Filter Test 1 */
486 { 0x00000198, 0x0000 }, /* R408 - FLL2 NCO Test 0 */ 488 { 0x00000198, 0x0000 }, /* R408 - FLL2 NCO Test 0 */
489 { 0x00000199, 0x0000 }, /* R408 - FLL2 Control 7 */
487 { 0x000001A1, 0x0000 }, /* R417 - FLL2 Synchroniser 1 */ 490 { 0x000001A1, 0x0000 }, /* R417 - FLL2 Synchroniser 1 */
488 { 0x000001A2, 0x0000 }, /* R418 - FLL2 Synchroniser 2 */ 491 { 0x000001A2, 0x0000 }, /* R418 - FLL2 Synchroniser 2 */
489 { 0x000001A3, 0x0000 }, /* R419 - FLL2 Synchroniser 3 */ 492 { 0x000001A3, 0x0000 }, /* R419 - FLL2 Synchroniser 3 */
490 { 0x000001A4, 0x0000 }, /* R420 - FLL2 Synchroniser 4 */ 493 { 0x000001A4, 0x0000 }, /* R420 - FLL2 Synchroniser 4 */
491 { 0x000001A5, 0x0000 }, /* R421 - FLL2 Synchroniser 5 */ 494 { 0x000001A5, 0x0000 }, /* R421 - FLL2 Synchroniser 5 */
492 { 0x000001A6, 0x0000 }, /* R422 - FLL2 Synchroniser 6 */ 495 { 0x000001A6, 0x0000 }, /* R422 - FLL2 Synchroniser 6 */
496 { 0x000001A7, 0x0001 }, /* R422 - FLL2 Synchroniser 7 */
493 { 0x000001A9, 0x0000 }, /* R425 - FLL2 Spread Spectrum */ 497 { 0x000001A9, 0x0000 }, /* R425 - FLL2 Spread Spectrum */
494 { 0x000001AA, 0x0004 }, /* R426 - FLL2 GPIO Clock */ 498 { 0x000001AA, 0x0004 }, /* R426 - FLL2 GPIO Clock */
495 { 0x00000200, 0x0006 }, /* R512 - Mic Charge Pump 1 */ 499 { 0x00000200, 0x0006 }, /* R512 - Mic Charge Pump 1 */
@@ -1392,6 +1396,7 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg)
1392 case ARIZONA_FLL1_CONTROL_4: 1396 case ARIZONA_FLL1_CONTROL_4:
1393 case ARIZONA_FLL1_CONTROL_5: 1397 case ARIZONA_FLL1_CONTROL_5:
1394 case ARIZONA_FLL1_CONTROL_6: 1398 case ARIZONA_FLL1_CONTROL_6:
1399 case ARIZONA_FLL1_CONTROL_7:
1395 case ARIZONA_FLL1_LOOP_FILTER_TEST_1: 1400 case ARIZONA_FLL1_LOOP_FILTER_TEST_1:
1396 case ARIZONA_FLL1_NCO_TEST_0: 1401 case ARIZONA_FLL1_NCO_TEST_0:
1397 case ARIZONA_FLL1_SYNCHRONISER_1: 1402 case ARIZONA_FLL1_SYNCHRONISER_1:
@@ -1400,6 +1405,7 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg)
1400 case ARIZONA_FLL1_SYNCHRONISER_4: 1405 case ARIZONA_FLL1_SYNCHRONISER_4:
1401 case ARIZONA_FLL1_SYNCHRONISER_5: 1406 case ARIZONA_FLL1_SYNCHRONISER_5:
1402 case ARIZONA_FLL1_SYNCHRONISER_6: 1407 case ARIZONA_FLL1_SYNCHRONISER_6:
1408 case ARIZONA_FLL1_SYNCHRONISER_7:
1403 case ARIZONA_FLL1_SPREAD_SPECTRUM: 1409 case ARIZONA_FLL1_SPREAD_SPECTRUM:
1404 case ARIZONA_FLL1_GPIO_CLOCK: 1410 case ARIZONA_FLL1_GPIO_CLOCK:
1405 case ARIZONA_FLL2_CONTROL_1: 1411 case ARIZONA_FLL2_CONTROL_1:
@@ -1408,6 +1414,7 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg)
1408 case ARIZONA_FLL2_CONTROL_4: 1414 case ARIZONA_FLL2_CONTROL_4:
1409 case ARIZONA_FLL2_CONTROL_5: 1415 case ARIZONA_FLL2_CONTROL_5:
1410 case ARIZONA_FLL2_CONTROL_6: 1416 case ARIZONA_FLL2_CONTROL_6:
1417 case ARIZONA_FLL2_CONTROL_7:
1411 case ARIZONA_FLL2_LOOP_FILTER_TEST_1: 1418 case ARIZONA_FLL2_LOOP_FILTER_TEST_1:
1412 case ARIZONA_FLL2_NCO_TEST_0: 1419 case ARIZONA_FLL2_NCO_TEST_0:
1413 case ARIZONA_FLL2_SYNCHRONISER_1: 1420 case ARIZONA_FLL2_SYNCHRONISER_1:
@@ -1416,6 +1423,7 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg)
1416 case ARIZONA_FLL2_SYNCHRONISER_4: 1423 case ARIZONA_FLL2_SYNCHRONISER_4:
1417 case ARIZONA_FLL2_SYNCHRONISER_5: 1424 case ARIZONA_FLL2_SYNCHRONISER_5:
1418 case ARIZONA_FLL2_SYNCHRONISER_6: 1425 case ARIZONA_FLL2_SYNCHRONISER_6:
1426 case ARIZONA_FLL2_SYNCHRONISER_7:
1419 case ARIZONA_FLL2_SPREAD_SPECTRUM: 1427 case ARIZONA_FLL2_SPREAD_SPECTRUM:
1420 case ARIZONA_FLL2_GPIO_CLOCK: 1428 case ARIZONA_FLL2_GPIO_CLOCK:
1421 case ARIZONA_MIC_CHARGE_PUMP_1: 1429 case ARIZONA_MIC_CHARGE_PUMP_1: