ASoC: wcd9335: fix address map representation

slimbus addresses are 16 bit wide, masking page numbers
to wcd register at offset of 12 will limit the number for pages.
So it becomes impossible to write to page 0x10 registers.
Remove masking 0x800 (slimbus address range) from register address
and making use of window parameters in regmap config should fix it
and also will represent the registers exactly inline with Datasheet.

Remove this unnessary masking and make the registers be inline
with datasheet.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20200306152633.25836-1-srinivas.kandagatla@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/wcd9335.c b/sound/soc/codecs/wcd9335.c
index f11ffa28683b11b77f53715b89542bed79739eff..700cc12127705d61204886d7f7af10afb591efbc 100644 (file)
--- a/sound/soc/codecs/wcd9335.c
+++ b/sound/soc/codecs/wcd9335.c
@@ -4926,11 +4926,11 @@ static const struct regmap_range_cfg wcd9335_ranges[] = {
                .name = "WCD9335",
                .range_min =  0x0,
                .range_max =  WCD9335_MAX_REGISTER,
-               .selector_reg = WCD9335_REG(0x0, 0),
+               .selector_reg = WCD9335_SEL_REGISTER,
                .selector_mask = 0xff,
                .selector_shift = 0,
-               .window_start = 0x0,
-               .window_len = 0x1000,
+               .window_start = 0x800,
+               .window_len = 0x100,
        },
 };
 
@@ -4968,12 +4968,12 @@ static const struct regmap_range_cfg wcd9335_ifc_ranges[] = {
        {
                .name = "WCD9335-IFC-DEV",
                .range_min =  0x0,
-               .range_max = WCD9335_REG(0, 0x7ff),
-               .selector_reg = WCD9335_REG(0, 0x0),
-               .selector_mask = 0xff,
+               .range_max = WCD9335_MAX_REGISTER,
+               .selector_reg = WCD9335_SEL_REGISTER,
+               .selector_mask = 0xfff,
                .selector_shift = 0,
-               .window_start = 0x0,
-               .window_len = 0x1000,
+               .window_start = 0x800,
+               .window_len = 0x400,
        },
 };
 
@@ -4981,7 +4981,7 @@ static struct regmap_config wcd9335_ifc_regmap_config = {
        .reg_bits = 16,
        .val_bits = 8,
        .can_multi_write = true,
-       .max_register = WCD9335_REG(0, 0x7FF),
+       .max_register = WCD9335_MAX_REGISTER,
        .ranges = wcd9335_ifc_ranges,
        .num_ranges = ARRAY_SIZE(wcd9335_ifc_ranges),
 };

diff --git a/sound/soc/codecs/wcd9335.h b/sound/soc/codecs/wcd9335.h
index 4d9be2496c305079376483dd9410f602a1ff2551..72060824c7436f95672156dd948e05167aa270f8 100644 (file)
--- a/sound/soc/codecs/wcd9335.h
+++ b/sound/soc/codecs/wcd9335.h
@@ -8,9 +8,9 @@
  * in slimbus mode the reg base starts from 0x800
  * in i2s/i2c mode the reg base is 0x0
  */
-#define WCD9335_REG(pg, r)     ((pg << 12) | (r) | 0x800)
+#define WCD9335_REG(pg, r)     ((pg << 8) | (r))
 #define WCD9335_REG_OFFSET(r)  (r & 0xFF)
-#define WCD9335_PAGE_OFFSET(r) ((r >> 12) & 0xFF)
+#define WCD9335_PAGE_OFFSET(r) ((r >> 8) & 0xFF)
 
 /* Page-0 Registers */
 #define WCD9335_PAGE0_PAGE_REGISTER            WCD9335_REG(0x00, 0x000)
@@ -600,7 +600,8 @@
 #define WCD9335_CDC_CLK_RST_CTRL_FS_CNT_ENABLE BIT(0)
 #define WCD9335_CDC_CLK_RST_CTRL_FS_CNT_DISABLE        0
 #define WCD9335_CDC_TOP_TOP_CFG1       WCD9335_REG(0x0d, 0x082)
-#define WCD9335_MAX_REGISTER   WCD9335_REG(0x80, 0x0FF)
+#define WCD9335_MAX_REGISTER   0xffff
+#define WCD9335_SEL_REGISTER   0x800
 
 /* SLIMBUS Slave Registers */
 #define WCD9335_SLIM_PGD_PORT_INT_EN0  WCD9335_REG(0, 0x30)