mfd: twl6040: Use regmap for register cache
Subsystems (2)
PATCH 1/1 mfd: twl6040: Use regmap for register cache
From: Mark Brown <[email protected]>
Rather then open coding a cache of the vibra control registers use the regmap cache code. Also cache the interrupt mask register, providing a small performance improvement for the interrupt code.
---
I'm hoping to have some ASoC improvements to build on top of this (there is ASoC level register caching for the device) so it might make sense to apply this via ASoC.
drivers/mfd/twl6040.c | 43 ++++++++++++++++++++++++++++++------------- include/linux/mfd/twl6040.h | 1 - 2 files changed, 30 insertions(+), 14 deletions(-)
drivers/mfd/twl6040.c +30 -13
@@ -58,15 +58,9 @@ int twl6040_reg_read(struct twl6040 *twl6040, unsigned int reg)int ret;unsigned int val; -/* Vibra control registers from cache */ -if (unlikely (reg ==TWL6040_REG_VIBCTLL || - reg ==TWL6040_REG_VIBCTLR )) { - val = twl6040->vibra_ctrl_cache[VIBRACTRL_MEMBER (reg)]; - }else { - ret =regmap_read (twl6040->regmap, reg, &val); -if (ret <0 ) -return ret; - } + ret =regmap_read (twl6040->regmap, reg, &val); +if (ret <0 ) +return ret;return val; }
@@ -77,9 +71,6 @@ int twl6040_reg_write(struct twl6040 *twl6040, unsigned int reg, u8 val)int ret; ret =regmap_write (twl6040->regmap, reg, val); -/* Cache the vibra control registers */ -if (reg ==TWL6040_REG_VIBCTLL || reg ==TWL6040_REG_VIBCTLR ) - twl6040->vibra_ctrl_cache[VIBRACTRL_MEMBER (reg)] = val;return ret; }
@@ -456,9 +447,20 @@ EXPORT_SYMBOL(twl6040_get_sysclk);/* Get the combined status of the vibra control register */ int twl6040_get_vibralr_status (struct twl6040 *twl6040) { +unsigned int reg; +int ret;u8 status; - status = twl6040->vibra_ctrl_cache[0 ] | twl6040->vibra_ctrl_cache[1 ]; + ret =regmap_read (twl6040->regmap,TWL6040_REG_VIBCTLL , ®); +if (ret !=0 ) +return ret; + status = reg; + + ret =regmap_read (twl6040->regmap,TWL6040_REG_VIBCTLR , ®); +if (ret !=0 ) +return ret; + status |= reg; + status &= (TWL6040_VIBENA |TWL6040_VIBSEL );return status;
@@ -485,12 +487,27 @@ static bool twl6040_readable_reg(struct device *dev, unsigned int reg)return true; } +static bool twl6040_volatile_reg (struct device *dev,unsigned int reg) +{ +switch (reg) { +case TWL6040_REG_VIBCTLL : +case TWL6040_REG_VIBCTLR : +case TWL6040_REG_INTMR : +return false; +default : +return true; + } +} +static struct regmap_config twl6040_regmap_config = { .reg_bits =8 , .val_bits =8 , .max_register =TWL6040_REG_STATUS ,/* 0x2e */ .readable_reg = twl6040_readable_reg, + .volatile_reg = twl6040_volatile_reg, + + .cache_type =REGCACHE_RBTREE , };static const struct regmap_irq twl6040_irqs[] = {
include/linux/mfd/twl6040.h +0 -1
@@ -230,7 +230,6 @@ struct twl6040 {int audpwron;int power_count;int rev; -u8 vibra_ctrl_cache[2 ];/* PLL configuration */ int pll;
Signature · 1 line
1.8.4.rc3
Quoted 7 lines · Mark Brown
From: Mark Brown <[email protected]>
Rather then open coding a cache of the vibra control registers use the regmap cache code. Also cache the interrupt mask register, providing a small performance improvement for the interrupt code.
Signed-off-by Mark Brown <[email protected]>
Quoted 106 lines
---
I'm hoping to have some ASoC improvements to build on top of this (there is ASoC level register caching for the device) so it might make sense to apply this via ASoC.
drivers/mfd/twl6040.c | 43 ++++++++++++++++++++++++++++++------------- include/linux/mfd/twl6040.h | 1 - 2 files changed, 30 insertions(+), 14 deletions(-)drivers/mfd/twl6040.c +30
-13@@ -58,15 +58,9 @@ int twl6040_reg_read(struct twl6040 *twl6040, unsigned int reg)int ret;unsigned int val; -/* Vibra control registers from cache */ -if (unlikely (reg ==TWL6040_REG_VIBCTLL || - reg ==TWL6040_REG_VIBCTLR )) { - val = twl6040->vibra_ctrl_cache[VIBRACTRL_MEMBER (reg)]; - }else { - ret =regmap_read (twl6040->regmap, reg, &val); -if (ret <0 ) -return ret; - } + ret =regmap_read (twl6040->regmap, reg, &val); +if (ret <0 ) +return ret;return val; }@@ -77,9 +71,6 @@ int twl6040_reg_write(struct twl6040 *twl6040, unsigned int reg, u8 val)int ret; ret =regmap_write (twl6040->regmap, reg, val); -/* Cache the vibra control registers */ -if (reg ==TWL6040_REG_VIBCTLL || reg ==TWL6040_REG_VIBCTLR ) - twl6040->vibra_ctrl_cache[VIBRACTRL_MEMBER (reg)] = val;return ret; }@@ -456,9 +447,20 @@ EXPORT_SYMBOL(twl6040_get_sysclk);/* Get the combined status of the vibra control register */ int twl6040_get_vibralr_status (struct twl6040 *twl6040) { +unsigned int reg; +int ret;u8 status; - status = twl6040->vibra_ctrl_cache[0 ] | twl6040->vibra_ctrl_cache[1 ]; + ret =regmap_read (twl6040->regmap,TWL6040_REG_VIBCTLL , ®); +if (ret !=0 ) +return ret; + status = reg; + + ret =regmap_read (twl6040->regmap,TWL6040_REG_VIBCTLR , ®); +if (ret !=0 ) +return ret; + status |= reg; + status &= (TWL6040_VIBENA |TWL6040_VIBSEL );return status;@@ -485,12 +487,27 @@ static bool twl6040_readable_reg(struct device *dev, unsigned int reg)return true; } +static bool twl6040_volatile_reg (struct device *dev,unsigned int reg) +{ +switch (reg) { +case TWL6040_REG_VIBCTLL : +case TWL6040_REG_VIBCTLR : +case TWL6040_REG_INTMR : +return false; +default : +return true; + } +} +static struct regmap_config twl6040_regmap_config = { .reg_bits =8 , .val_bits =8 , .max_register =TWL6040_REG_STATUS ,/* 0x2e */ .readable_reg = twl6040_readable_reg, + .volatile_reg = twl6040_volatile_reg, + + .cache_type =REGCACHE_RBTREE , };static const struct regmap_irq twl6040_irqs[] = {include/linux/mfd/twl6040.h +0
-1@@ -230,7 +230,6 @@ struct twl6040 {int audpwron;int power_count;int rev; -u8 vibra_ctrl_cache[2 ];/* PLL configuration */ int pll;
Signature · 1 line
Péter
Quoted 9 lines · Mark Brown
From: Mark Brown <[email protected]>
Rather then open coding a cache of the vibra control registers use the regmap cache code. Also cache the interrupt mask register, providing a small performance improvement for the interrupt code.
Signed-off-by Mark Brown <[email protected]>---
Quoted 7 lines
I'm hoping to have some ASoC improvements to build on top of this (there is ASoC level register caching for the device) so it might make sense to apply this via ASoC.
drivers/mfd/twl6040.c | 43 ++++++++++++++++++++++++++++++------------- include/linux/mfd/twl6040.h | 1 - 2 files changed, 30 insertions(+), 14 deletions(-)
Applied with Peter's Ack, thanks.
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Hi Lee,
Quoted 15 lines · Lee Jones
Quoted 13 lines · Mark Brown
From: Mark Brown <[email protected]>
Rather then open coding a cache of the vibra control registers use the regmap cache code. Also cache the interrupt mask register, providing a small performance improvement for the interrupt code.
Signed-off-by Mark Brown <[email protected]>---
I'm hoping to have some ASoC improvements to build on top of this (there is ASoC level register caching for the device) so it might make sense to apply this via ASoC.
Quoted 5 lines
Quoted 3 lines
drivers/mfd/twl6040.c | 43 ++++++++++++++++++++++++++++++------------- include/linux/mfd/twl6040.h | 1 - 2 files changed, 30 insertions(+), 14 deletions(-)Applied with Peter's Ack, thanks.
Please hold on. I'm preparing a branch for Mark to pull from and it will contain that patch.
Cheers,
Samuel.
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/
Quoted 18 lines · Samuel Ortiz
Hi Lee,
Quoted 15 lines · Lee Jones
Quoted 13 lines · Mark Brown
From: Mark Brown <[email protected]>
Rather then open coding a cache of the vibra control registers use the regmap cache code. Also cache the interrupt mask register, providing a small performance improvement for the interrupt code.
Signed-off-by Mark Brown <[email protected]>---
I'm hoping to have some ASoC improvements to build on top of this (there is ASoC level register caching for the device) so it might make sense to apply this via ASoC.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
drivers/mfd/twl6040.c | 43 ++++++++++++++++++++++++++++++------------- include/linux/mfd/twl6040.h | 1 - 2 files changed, 30 insertions(+), 14 deletions(-)Applied with Peter's Ack, thanks.
Please hold on. I'm preparing a branch for Mark to pull from and it will contain that patch.
Ah, I thought that was another set.
No problem. I've removed it from my branch.
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog