mfd: wm5102: Mark register write sequencer control 3 readable
Subsystems (2)
PATCH v2 1/2 mfd: wm5102: Mark register write sequencer control 3 readable
From: Mark Brown <[email protected]>
During init the core checks if the wm5102 has finished starting by reading register 0x19 and looking at the value. This read always fails since this is not a readable register, mark it as being one. While we're at it provide a constant for the register name (as supplied by Charles Keepax).
---
Just added the sign-off I forgot on the last version.
Thanks,
Charles
drivers/mfd/arizona-core.c | 3 ++- drivers/mfd/wm5102-tables.c | 1 + include/linux/mfd/arizona/registers.h | 1 + 3 files changed, 4 insertions(+), 1 deletions(-)
drivers/mfd/arizona-core.c +2 -1
@@ -784,7 +784,8 @@ int arizona_dev_init(struct arizona *arizona)/* Ensure device startup is complete */ switch (arizona->type) {case WM5102 : - ret =regmap_read (arizona->regmap,0x19 , &val); + ret =regmap_read (arizona->regmap, +ARIZONA_WRITE_SEQUENCER_CTRL_3 , &val);if (ret !=0 ) dev_err(dev, "Failed to check write sequencer state: %d\n",
drivers/mfd/wm5102-tables.c +1 -0
@@ -1016,6 +1016,7 @@ static bool wm5102_readable_register(struct device *dev, unsigned int reg)case ARIZONA_WRITE_SEQUENCER_CTRL_0 :case ARIZONA_WRITE_SEQUENCER_CTRL_1 :case ARIZONA_WRITE_SEQUENCER_CTRL_2 : +case ARIZONA_WRITE_SEQUENCER_CTRL_3 :case ARIZONA_WRITE_SEQUENCER_PROM :case ARIZONA_TONE_GENERATOR_1 :case ARIZONA_TONE_GENERATOR_2 :
include/linux/mfd/arizona/registers.h +1 -0
@@ -27,6 +27,7 @@#define ARIZONA_WRITE_SEQUENCER_CTRL_0 0x16#define ARIZONA_WRITE_SEQUENCER_CTRL_1 0x17#define ARIZONA_WRITE_SEQUENCER_CTRL_2 0x18 +#define ARIZONA_WRITE_SEQUENCER_CTRL_3 0x19#define ARIZONA_WRITE_SEQUENCER_PROM 0x1A#define ARIZONA_TONE_GENERATOR_1 0x20#define ARIZONA_TONE_GENERATOR_2 0x21
Signature · 1 line
1.7.2.5
PATCH v2 2/2 mfd: arizona: Mark additional registers as volatile
Mark some additional registers as volatile. The write sequencer control registers should not be cached, as we don't ever want their value synchronised as this might cause a write sequence to be accidentally initiated.
Additionally, the DAC_COMP registers require special preconditions to write so there values wouldn't be updated accurately during a register sync.
--- drivers/mfd/wm5102-tables.c | 11 ++++++++--- drivers/mfd/wm5110-tables.c | 6 +++--- 2 files changed, 11 insertions(+), 6 deletions(-)
drivers/mfd/wm5102-tables.c +8 -3
@@ -245,9 +245,6 @@ const struct regmap_irq_chip wm5102_irq = {static const struct reg_default wm5102_reg_default[] = { {0x00000008 ,0x0019 },/* R8 - Ctrl IF SPI CFG 1 */ {0x00000009 ,0x0001 },/* R9 - Ctrl IF I2C1 CFG 1 */ - {0x00000016 ,0x0000 },/* R22 - Write Sequencer Ctrl 0 */ - {0x00000017 ,0x0000 },/* R23 - Write Sequencer Ctrl 1 */ - {0x00000018 ,0x0000 },/* R24 - Write Sequencer Ctrl 2 */ {0x00000020 ,0x0000 },/* R32 - Tone Generator 1 */ {0x00000021 ,0x1000 },/* R33 - Tone Generator 2 */ {0x00000022 ,0x0000 },/* R34 - Tone Generator 3 */
@@ -1881,6 +1878,10 @@ static bool wm5102_volatile_register(struct device *dev, unsigned int reg)switch (reg) {case ARIZONA_SOFTWARE_RESET :case ARIZONA_DEVICE_REVISION : +case ARIZONA_WRITE_SEQUENCER_CTRL_0 : +case ARIZONA_WRITE_SEQUENCER_CTRL_1 : +case ARIZONA_WRITE_SEQUENCER_CTRL_2 : +case ARIZONA_WRITE_SEQUENCER_CTRL_3 :case ARIZONA_OUTPUT_STATUS_1 :case ARIZONA_RAW_OUTPUT_STATUS_1 :case ARIZONA_SLIMBUS_RX_PORT_STATUS :
@@ -1892,6 +1893,10 @@ static bool wm5102_volatile_register(struct device *dev, unsigned int reg)case ARIZONA_ASYNC_SAMPLE_RATE_1_STATUS :case ARIZONA_FLL1_NCO_TEST_0 :case ARIZONA_FLL2_NCO_TEST_0 : +case ARIZONA_DAC_COMP_1 : +case ARIZONA_DAC_COMP_2 : +case ARIZONA_DAC_COMP_3 : +case ARIZONA_DAC_COMP_4 :case ARIZONA_FX_CTRL2 :case ARIZONA_INTERRUPT_STATUS_1 :case ARIZONA_INTERRUPT_STATUS_2 :
drivers/mfd/wm5110-tables.c +3 -3
@@ -666,9 +666,6 @@ static const struct reg_default wm5110_reg_default[] = { { 0x0000000A, 0x0001 }, /* R10 - Ctrl IF I2C2 CFG 1 */ { 0x0000000B, 0x0036 }, /* R11 - Ctrl IF I2C1 CFG 2 */ { 0x0000000C, 0x0036 }, /* R12 - Ctrl IF I2C2 CFG 2 */ - { 0x00000016, 0x0000 }, /* R22 - Write Sequencer Ctrl 0 */ - { 0x00000017, 0x0000 }, /* R23 - Write Sequencer Ctrl 1 */ - { 0x00000018, 0x0000 }, /* R24 - Write Sequencer Ctrl 2 */ { 0x00000020, 0x0000 }, /* R32 - Tone Generator 1 */ { 0x00000021, 0x1000 }, /* R33 - Tone Generator 2 */ { 0x00000022, 0x0000 }, /* R34 - Tone Generator 3 */
@@ -2815,6 +2812,9 @@ static bool wm5110_volatile_register(struct device *dev, unsigned int reg)switch (reg) {case ARIZONA_SOFTWARE_RESET :case ARIZONA_DEVICE_REVISION : +case ARIZONA_WRITE_SEQUENCER_CTRL_0 : +case ARIZONA_WRITE_SEQUENCER_CTRL_1 : +case ARIZONA_WRITE_SEQUENCER_CTRL_2 :case ARIZONA_HAPTICS_STATUS :case ARIZONA_SAMPLE_RATE_1_STATUS :case ARIZONA_SAMPLE_RATE_2_STATUS :
Signature · 1 line
1.7.2.5
Lee Jones
AppliedRe: [PATCH 2/2 v2] mfd: arizona: Mark additional registers as volatile
Quoted 9 lines · Charles Keepax
Mark some additional registers as volatile. The write sequencer control registers should not be cached, as we don't ever want their value synchronised as this might cause a write sequence to be accidentally initiated.
Additionally, the
DAC_COMPregisters require special preconditions to write so there values wouldn't be updated accurately during a register sync.
Quoted 5 lines
Signed-off-by Charles Keepax <[email protected]>--- drivers/mfd/wm5102-tables.c | 11 ++++++++--- drivers/mfd/wm5110-tables.c | 6 +++--- 2 files changed, 11 insertions(+), 6 deletions(-)
Applied, thanks.
Quoted 60 lines
drivers/mfd/wm5102-tables.c +8
-3@@ -245,9 +245,6 @@ const struct regmap_irq_chip wm5102_irq = {static const struct reg_default wm5102_reg_default[] = { {0x00000008 ,0x0019 },/* R8 - Ctrl IF SPI CFG 1 */ {0x00000009 ,0x0001 },/* R9 - Ctrl IF I2C1 CFG 1 */ - {0x00000016 ,0x0000 },/* R22 - Write Sequencer Ctrl 0 */ - {0x00000017 ,0x0000 },/* R23 - Write Sequencer Ctrl 1 */ - {0x00000018 ,0x0000 },/* R24 - Write Sequencer Ctrl 2 */ {0x00000020 ,0x0000 },/* R32 - Tone Generator 1 */ {0x00000021 ,0x1000 },/* R33 - Tone Generator 2 */ {0x00000022 ,0x0000 },/* R34 - Tone Generator 3 */ @@ -1881,6 +1878,10 @@ static bool wm5102_volatile_register(struct device *dev, unsigned int reg)switch (reg) {case ARIZONA_SOFTWARE_RESET :case ARIZONA_DEVICE_REVISION : +case ARIZONA_WRITE_SEQUENCER_CTRL_0 : +case ARIZONA_WRITE_SEQUENCER_CTRL_1 : +case ARIZONA_WRITE_SEQUENCER_CTRL_2 : +case ARIZONA_WRITE_SEQUENCER_CTRL_3 :case ARIZONA_OUTPUT_STATUS_1 :case ARIZONA_RAW_OUTPUT_STATUS_1 :case ARIZONA_SLIMBUS_RX_PORT_STATUS :@@ -1892,6 +1893,10 @@ static bool wm5102_volatile_register(struct device *dev, unsigned int reg)case ARIZONA_ASYNC_SAMPLE_RATE_1_STATUS :case ARIZONA_FLL1_NCO_TEST_0 :case ARIZONA_FLL2_NCO_TEST_0 : +case ARIZONA_DAC_COMP_1 : +case ARIZONA_DAC_COMP_2 : +case ARIZONA_DAC_COMP_3 : +case ARIZONA_DAC_COMP_4 :case ARIZONA_FX_CTRL2 :case ARIZONA_INTERRUPT_STATUS_1 :case ARIZONA_INTERRUPT_STATUS_2 :drivers/mfd/wm5110-tables.c +3
-3@@ -666,9 +666,6 @@ static const struct reg_default wm5110_reg_default[] = { { 0x0000000A, 0x0001 }, /* R10 - Ctrl IF I2C2 CFG 1 */ { 0x0000000B, 0x0036 }, /* R11 - Ctrl IF I2C1 CFG 2 */ { 0x0000000C, 0x0036 }, /* R12 - Ctrl IF I2C2 CFG 2 */ - { 0x00000016, 0x0000 }, /* R22 - Write Sequencer Ctrl 0 */ - { 0x00000017, 0x0000 }, /* R23 - Write Sequencer Ctrl 1 */ - { 0x00000018, 0x0000 }, /* R24 - Write Sequencer Ctrl 2 */ { 0x00000020, 0x0000 }, /* R32 - Tone Generator 1 */ { 0x00000021, 0x1000 }, /* R33 - Tone Generator 2 */ { 0x00000022, 0x0000 }, /* R34 - Tone Generator 3 */@@ -2815,6 +2812,9 @@ static bool wm5110_volatile_register(struct device *dev, unsigned int reg)switch (reg) {case ARIZONA_SOFTWARE_RESET :case ARIZONA_DEVICE_REVISION : +case ARIZONA_WRITE_SEQUENCER_CTRL_0 : +case ARIZONA_WRITE_SEQUENCER_CTRL_1 : +case ARIZONA_WRITE_SEQUENCER_CTRL_2 :case ARIZONA_HAPTICS_STATUS :case ARIZONA_SAMPLE_RATE_1_STATUS :case ARIZONA_SAMPLE_RATE_2_STATUS :
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Lee Jones
AppliedQuoted 13 lines · Charles Keepax
From: Mark Brown <[email protected]>
During init the core checks if the wm5102 has finished starting by reading register
0x19and looking at the value. This read always fails since this is not a readable register, mark it as being one. While we're at it provide a constant for the register name (as supplied by Charles Keepax).Signed-off-by Mark Brown <[email protected]>Signed-off-by Charles Keepax <[email protected]>---
Just added the sign-off I forgot on the last version.
Quoted 7 lines
Thanks,
Charlesdrivers/mfd/arizona-core.c | 3 ++- drivers/mfd/wm5102-tables.c | 1 + include/linux/mfd/arizona/registers.h | 1 + 3 files changed, 4 insertions(+), 1 deletions(-)
Applied, thanks.
Quoted 38 lines
drivers/mfd/arizona-core.c +2
-1@@ -784,7 +784,8 @@ int arizona_dev_init(struct arizona *arizona)/* Ensure device startup is complete */ switch (arizona->type) {case WM5102 : - ret =regmap_read (arizona->regmap,0x19 , &val); + ret =regmap_read (arizona->regmap, +ARIZONA_WRITE_SEQUENCER_CTRL_3 , &val);if (ret !=0 ) dev_err(dev, "Failed to check write sequencer state: %d\n",drivers/mfd/wm5102-tables.c +1
-0@@ -1016,6 +1016,7 @@ static bool wm5102_readable_register(struct device *dev, unsigned int reg)case ARIZONA_WRITE_SEQUENCER_CTRL_0 :case ARIZONA_WRITE_SEQUENCER_CTRL_1 :case ARIZONA_WRITE_SEQUENCER_CTRL_2 : +case ARIZONA_WRITE_SEQUENCER_CTRL_3 :case ARIZONA_WRITE_SEQUENCER_PROM :case ARIZONA_TONE_GENERATOR_1 :case ARIZONA_TONE_GENERATOR_2 :include/linux/mfd/arizona/registers.h +1
-0@@ -27,6 +27,7 @@#define ARIZONA_WRITE_SEQUENCER_CTRL_0 0x16#define ARIZONA_WRITE_SEQUENCER_CTRL_1 0x17#define ARIZONA_WRITE_SEQUENCER_CTRL_2 0x18 +#define ARIZONA_WRITE_SEQUENCER_CTRL_3 0x19#define ARIZONA_WRITE_SEQUENCER_PROM 0x1A#define ARIZONA_TONE_GENERATOR_1 0x20#define ARIZONA_TONE_GENERATOR_2 0x21
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog