* [PATCH] mfd: arizona: correct addresses of always-on trigger registers
@ 2014-05-20 12:48 Richard Fitzgerald
2014-05-20 17:29 ` Lee Jones
0 siblings, 1 reply; 2+ messages in thread
From: Richard Fitzgerald @ 2014-05-20 12:48 UTC (permalink / raw)
To: sameo, lee.jones; +Cc: ckeepax, broonie, linux-kernel, patches
Update the addresses and names to match current silicon.
The WM8997 regmap tables have been adjusted to match the new
names.
Missing registers have been added to WM5110 default value table.
Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
---
drivers/mfd/wm5102-tables.c | 2 ++
drivers/mfd/wm5110-tables.c | 12 ++++++++----
drivers/mfd/wm8997-tables.c | 12 ++++++------
include/linux/mfd/arizona/registers.h | 14 ++++++++------
4 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/drivers/mfd/wm5102-tables.c b/drivers/mfd/wm5102-tables.c
index 9b9923c..641aed7 100644
--- a/drivers/mfd/wm5102-tables.c
+++ b/drivers/mfd/wm5102-tables.c
@@ -1037,6 +1037,8 @@ static bool wm5102_readable_register(struct device *dev, unsigned int reg)
case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_4:
case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_5:
case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_6:
+ case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_7:
+ case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_8:
case ARIZONA_COMFORT_NOISE_GENERATOR:
case ARIZONA_HAPTICS_CONTROL_1:
case ARIZONA_HAPTICS_CONTROL_2:
diff --git a/drivers/mfd/wm5110-tables.c b/drivers/mfd/wm5110-tables.c
index d10fc44..9b98ee5 100644
--- a/drivers/mfd/wm5110-tables.c
+++ b/drivers/mfd/wm5110-tables.c
@@ -683,10 +683,12 @@ static const struct reg_default wm5110_reg_default[] = {
{ 0x00000062, 0x01FF }, /* R98 - Sample Rate Sequence Select 2 */
{ 0x00000063, 0x01FF }, /* R99 - Sample Rate Sequence Select 3 */
{ 0x00000064, 0x01FF }, /* R100 - Sample Rate Sequence Select 4 */
- { 0x00000068, 0x01FF }, /* R104 - Always On Triggers Sequence Select 1 */
- { 0x00000069, 0x01FF }, /* R105 - Always On Triggers Sequence Select 2 */
- { 0x0000006A, 0x01FF }, /* R106 - Always On Triggers Sequence Select 3 */
- { 0x0000006B, 0x01FF }, /* R107 - Always On Triggers Sequence Select 4 */
+ { 0x00000066, 0x01FF }, /* R102 - Always On Triggers Sequence Select 1 */
+ { 0x00000067, 0x01FF }, /* R103 - Always On Triggers Sequence Select 2 */
+ { 0x00000068, 0x01FF }, /* R104 - Always On Triggers Sequence Select 3 */
+ { 0x00000069, 0x01FF }, /* R105 - Always On Triggers Sequence Select 4 */
+ { 0x0000006A, 0x01FF }, /* R106 - Always On Triggers Sequence Select 5 */
+ { 0x0000006B, 0x01FF }, /* R107 - Always On Triggers Sequence Select 6 */
{ 0x00000070, 0x0000 }, /* R112 - Comfort Noise Generator */
{ 0x00000090, 0x0000 }, /* R144 - Haptics Control 1 */
{ 0x00000091, 0x7FFF }, /* R145 - Haptics Control 2 */
@@ -1716,6 +1718,8 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg)
case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_2:
case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_3:
case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_4:
+ case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_5:
+ case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_6:
case ARIZONA_COMFORT_NOISE_GENERATOR:
case ARIZONA_HAPTICS_CONTROL_1:
case ARIZONA_HAPTICS_CONTROL_2:
diff --git a/drivers/mfd/wm8997-tables.c b/drivers/mfd/wm8997-tables.c
index 529adc1..d641474 100644
--- a/drivers/mfd/wm8997-tables.c
+++ b/drivers/mfd/wm8997-tables.c
@@ -174,10 +174,10 @@ static const struct reg_default wm8997_reg_default[] = {
{ 0x00000062, 0x01FF }, /* R98 - Sample Rate Sequence Select 2 */
{ 0x00000063, 0x01FF }, /* R99 - Sample Rate Sequence Select 3 */
{ 0x00000064, 0x01FF }, /* R100 - Sample Rate Sequence Select 4 */
- { 0x00000068, 0x01FF }, /* R104 - Always On Triggers Sequence Select 1 */
- { 0x00000069, 0x01FF }, /* R105 - Always On Triggers Sequence Select 2 */
- { 0x0000006A, 0x01FF }, /* R106 - Always On Triggers Sequence Select 3 */
- { 0x0000006B, 0x01FF }, /* R107 - Always On Triggers Sequence Select 4 */
+ { 0x00000068, 0x01FF }, /* R104 - Always On Triggers Sequence Select 3 */
+ { 0x00000069, 0x01FF }, /* R105 - Always On Triggers Sequence Select 4 */
+ { 0x0000006A, 0x01FF }, /* R106 - Always On Triggers Sequence Select 5 */
+ { 0x0000006B, 0x01FF }, /* R107 - Always On Triggers Sequence Select 6 */
{ 0x00000070, 0x0000 }, /* R112 - Comfort Noise Generator */
{ 0x00000090, 0x0000 }, /* R144 - Haptics Control 1 */
{ 0x00000091, 0x7FFF }, /* R145 - Haptics Control 2 */
@@ -814,10 +814,10 @@ static bool wm8997_readable_register(struct device *dev, unsigned int reg)
case ARIZONA_SAMPLE_RATE_SEQUENCE_SELECT_2:
case ARIZONA_SAMPLE_RATE_SEQUENCE_SELECT_3:
case ARIZONA_SAMPLE_RATE_SEQUENCE_SELECT_4:
- case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_1:
- case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_2:
case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_3:
case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_4:
+ case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_5:
+ case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_6:
case ARIZONA_COMFORT_NOISE_GENERATOR:
case ARIZONA_HAPTICS_CONTROL_1:
case ARIZONA_HAPTICS_CONTROL_2:
diff --git a/include/linux/mfd/arizona/registers.h b/include/linux/mfd/arizona/registers.h
index c445bf0..dbd23c3 100644
--- a/include/linux/mfd/arizona/registers.h
+++ b/include/linux/mfd/arizona/registers.h
@@ -42,12 +42,14 @@
#define ARIZONA_SAMPLE_RATE_SEQUENCE_SELECT_2 0x62
#define ARIZONA_SAMPLE_RATE_SEQUENCE_SELECT_3 0x63
#define ARIZONA_SAMPLE_RATE_SEQUENCE_SELECT_4 0x64
-#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_1 0x68
-#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_2 0x69
-#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_3 0x6A
-#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_4 0x6B
-#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_5 0x6C
-#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_6 0x6D
+#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_1 0x66
+#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_2 0x67
+#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_3 0x68
+#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_4 0x69
+#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_5 0x6A
+#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_6 0x6B
+#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_7 0x6C
+#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_8 0x6D
#define ARIZONA_COMFORT_NOISE_GENERATOR 0x70
#define ARIZONA_HAPTICS_CONTROL_1 0x90
#define ARIZONA_HAPTICS_CONTROL_2 0x91
--
1.7.2.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mfd: arizona: correct addresses of always-on trigger registers
2014-05-20 12:48 [PATCH] mfd: arizona: correct addresses of always-on trigger registers Richard Fitzgerald
@ 2014-05-20 17:29 ` Lee Jones
0 siblings, 0 replies; 2+ messages in thread
From: Lee Jones @ 2014-05-20 17:29 UTC (permalink / raw)
To: Richard Fitzgerald; +Cc: sameo, ckeepax, broonie, linux-kernel, patches
> Update the addresses and names to match current silicon.
> The WM8997 regmap tables have been adjusted to match the new
> names.
> Missing registers have been added to WM5110 default value table.
>
> Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
> ---
> drivers/mfd/wm5102-tables.c | 2 ++
> drivers/mfd/wm5110-tables.c | 12 ++++++++----
> drivers/mfd/wm8997-tables.c | 12 ++++++------
> include/linux/mfd/arizona/registers.h | 14 ++++++++------
> 4 files changed, 24 insertions(+), 16 deletions(-)
Applied, thanks.
> diff --git a/drivers/mfd/wm5102-tables.c b/drivers/mfd/wm5102-tables.c
> index 9b9923c..641aed7 100644
> --- a/drivers/mfd/wm5102-tables.c
> +++ b/drivers/mfd/wm5102-tables.c
> @@ -1037,6 +1037,8 @@ static bool wm5102_readable_register(struct device *dev, unsigned int reg)
> case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_4:
> case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_5:
> case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_6:
> + case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_7:
> + case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_8:
> case ARIZONA_COMFORT_NOISE_GENERATOR:
> case ARIZONA_HAPTICS_CONTROL_1:
> case ARIZONA_HAPTICS_CONTROL_2:
> diff --git a/drivers/mfd/wm5110-tables.c b/drivers/mfd/wm5110-tables.c
> index d10fc44..9b98ee5 100644
> --- a/drivers/mfd/wm5110-tables.c
> +++ b/drivers/mfd/wm5110-tables.c
> @@ -683,10 +683,12 @@ static const struct reg_default wm5110_reg_default[] = {
> { 0x00000062, 0x01FF }, /* R98 - Sample Rate Sequence Select 2 */
> { 0x00000063, 0x01FF }, /* R99 - Sample Rate Sequence Select 3 */
> { 0x00000064, 0x01FF }, /* R100 - Sample Rate Sequence Select 4 */
> - { 0x00000068, 0x01FF }, /* R104 - Always On Triggers Sequence Select 1 */
> - { 0x00000069, 0x01FF }, /* R105 - Always On Triggers Sequence Select 2 */
> - { 0x0000006A, 0x01FF }, /* R106 - Always On Triggers Sequence Select 3 */
> - { 0x0000006B, 0x01FF }, /* R107 - Always On Triggers Sequence Select 4 */
> + { 0x00000066, 0x01FF }, /* R102 - Always On Triggers Sequence Select 1 */
> + { 0x00000067, 0x01FF }, /* R103 - Always On Triggers Sequence Select 2 */
> + { 0x00000068, 0x01FF }, /* R104 - Always On Triggers Sequence Select 3 */
> + { 0x00000069, 0x01FF }, /* R105 - Always On Triggers Sequence Select 4 */
> + { 0x0000006A, 0x01FF }, /* R106 - Always On Triggers Sequence Select 5 */
> + { 0x0000006B, 0x01FF }, /* R107 - Always On Triggers Sequence Select 6 */
> { 0x00000070, 0x0000 }, /* R112 - Comfort Noise Generator */
> { 0x00000090, 0x0000 }, /* R144 - Haptics Control 1 */
> { 0x00000091, 0x7FFF }, /* R145 - Haptics Control 2 */
> @@ -1716,6 +1718,8 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg)
> case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_2:
> case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_3:
> case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_4:
> + case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_5:
> + case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_6:
> case ARIZONA_COMFORT_NOISE_GENERATOR:
> case ARIZONA_HAPTICS_CONTROL_1:
> case ARIZONA_HAPTICS_CONTROL_2:
> diff --git a/drivers/mfd/wm8997-tables.c b/drivers/mfd/wm8997-tables.c
> index 529adc1..d641474 100644
> --- a/drivers/mfd/wm8997-tables.c
> +++ b/drivers/mfd/wm8997-tables.c
> @@ -174,10 +174,10 @@ static const struct reg_default wm8997_reg_default[] = {
> { 0x00000062, 0x01FF }, /* R98 - Sample Rate Sequence Select 2 */
> { 0x00000063, 0x01FF }, /* R99 - Sample Rate Sequence Select 3 */
> { 0x00000064, 0x01FF }, /* R100 - Sample Rate Sequence Select 4 */
> - { 0x00000068, 0x01FF }, /* R104 - Always On Triggers Sequence Select 1 */
> - { 0x00000069, 0x01FF }, /* R105 - Always On Triggers Sequence Select 2 */
> - { 0x0000006A, 0x01FF }, /* R106 - Always On Triggers Sequence Select 3 */
> - { 0x0000006B, 0x01FF }, /* R107 - Always On Triggers Sequence Select 4 */
> + { 0x00000068, 0x01FF }, /* R104 - Always On Triggers Sequence Select 3 */
> + { 0x00000069, 0x01FF }, /* R105 - Always On Triggers Sequence Select 4 */
> + { 0x0000006A, 0x01FF }, /* R106 - Always On Triggers Sequence Select 5 */
> + { 0x0000006B, 0x01FF }, /* R107 - Always On Triggers Sequence Select 6 */
> { 0x00000070, 0x0000 }, /* R112 - Comfort Noise Generator */
> { 0x00000090, 0x0000 }, /* R144 - Haptics Control 1 */
> { 0x00000091, 0x7FFF }, /* R145 - Haptics Control 2 */
> @@ -814,10 +814,10 @@ static bool wm8997_readable_register(struct device *dev, unsigned int reg)
> case ARIZONA_SAMPLE_RATE_SEQUENCE_SELECT_2:
> case ARIZONA_SAMPLE_RATE_SEQUENCE_SELECT_3:
> case ARIZONA_SAMPLE_RATE_SEQUENCE_SELECT_4:
> - case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_1:
> - case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_2:
> case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_3:
> case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_4:
> + case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_5:
> + case ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_6:
> case ARIZONA_COMFORT_NOISE_GENERATOR:
> case ARIZONA_HAPTICS_CONTROL_1:
> case ARIZONA_HAPTICS_CONTROL_2:
> diff --git a/include/linux/mfd/arizona/registers.h b/include/linux/mfd/arizona/registers.h
> index c445bf0..dbd23c3 100644
> --- a/include/linux/mfd/arizona/registers.h
> +++ b/include/linux/mfd/arizona/registers.h
> @@ -42,12 +42,14 @@
> #define ARIZONA_SAMPLE_RATE_SEQUENCE_SELECT_2 0x62
> #define ARIZONA_SAMPLE_RATE_SEQUENCE_SELECT_3 0x63
> #define ARIZONA_SAMPLE_RATE_SEQUENCE_SELECT_4 0x64
> -#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_1 0x68
> -#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_2 0x69
> -#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_3 0x6A
> -#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_4 0x6B
> -#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_5 0x6C
> -#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_6 0x6D
> +#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_1 0x66
> +#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_2 0x67
> +#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_3 0x68
> +#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_4 0x69
> +#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_5 0x6A
> +#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_6 0x6B
> +#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_7 0x6C
> +#define ARIZONA_ALWAYS_ON_TRIGGERS_SEQUENCE_SELECT_8 0x6D
> #define ARIZONA_COMFORT_NOISE_GENERATOR 0x70
> #define ARIZONA_HAPTICS_CONTROL_1 0x90
> #define ARIZONA_HAPTICS_CONTROL_2 0x91
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-05-20 17:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-05-20 12:48 [PATCH] mfd: arizona: correct addresses of always-on trigger registers Richard Fitzgerald
2014-05-20 17:29 ` Lee Jones
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.