From c72e542ff5484f49533d1a3937e8b9fbf7135cd5 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 20 Nov 2012 13:33:18 +0900 Subject: [PATCH] --- yaml --- r: 344997 b: refs/heads/master c: a3e2a76e9efac6bf5963800d2a3d88aac614ccf5 h: refs/heads/master i: 344995: a2a91bf86070368900e052dc4e62ad020d4c3c54 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/wm5102-tables.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c8924018359c..d1116a527524 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b73df6986bdf0186deeb30b272a9b890065ca223 +refs/heads/master: a3e2a76e9efac6bf5963800d2a3d88aac614ccf5 diff --git a/trunk/drivers/mfd/wm5102-tables.c b/trunk/drivers/mfd/wm5102-tables.c index 01b9255ed631..ffeba98c4500 100644 --- a/trunk/drivers/mfd/wm5102-tables.c +++ b/trunk/drivers/mfd/wm5102-tables.c @@ -2369,12 +2369,14 @@ static bool wm5102_volatile_register(struct device *dev, unsigned int reg) } } +#define WM5102_MAX_REGISTER 0x1a8fff + const struct regmap_config wm5102_spi_regmap = { .reg_bits = 32, .pad_bits = 16, .val_bits = 16, - .max_register = ARIZONA_DSP1_STATUS_2, + .max_register = WM5102_MAX_REGISTER, .readable_reg = wm5102_readable_register, .volatile_reg = wm5102_volatile_register, @@ -2388,7 +2390,7 @@ const struct regmap_config wm5102_i2c_regmap = { .reg_bits = 32, .val_bits = 16, - .max_register = ARIZONA_DSP1_STATUS_2, + .max_register = WM5102_MAX_REGISTER, .readable_reg = wm5102_readable_register, .volatile_reg = wm5102_volatile_register,