Re: [PATCH 08/10] mfd: wm5102: Refresh register defaults
Hi Mark, On Sun, Jan 27, 2013 at 12:07:30PM +0800, Mark Brown wrote: > The WM5102 register defaults are not up to date with the current register > map, synchronise them with those for current devices. > > Signed-off-by: Mark Brown > --- > drivers/mfd/wm5102-tables.c | 95 > +++ > 1 file changed, 33 insertions(+), 62 deletions(-) Applied to my for-next branch, thanks. Cheers, Samuel. -- Intel Open Source Technology Centre http://oss.intel.com/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 08/10] mfd: wm5102: Refresh register defaults
Hi Mark, On Sun, Jan 27, 2013 at 12:07:30PM +0800, Mark Brown wrote: The WM5102 register defaults are not up to date with the current register map, synchronise them with those for current devices. Signed-off-by: Mark Brown broo...@opensource.wolfsonmicro.com --- drivers/mfd/wm5102-tables.c | 95 +++ 1 file changed, 33 insertions(+), 62 deletions(-) Applied to my for-next branch, thanks. Cheers, Samuel. -- Intel Open Source Technology Centre http://oss.intel.com/ -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 08/10] mfd: wm5102: Refresh register defaults
The WM5102 register defaults are not up to date with the current register
map, synchronise them with those for current devices.
Signed-off-by: Mark Brown
---
drivers/mfd/wm5102-tables.c | 95 +++
1 file changed, 33 insertions(+), 62 deletions(-)
diff --git a/drivers/mfd/wm5102-tables.c b/drivers/mfd/wm5102-tables.c
index 167e6c4..edee1da 100644
--- a/drivers/mfd/wm5102-tables.c
+++ b/drivers/mfd/wm5102-tables.c
@@ -224,11 +224,9 @@ const struct regmap_irq_chip wm5102_irq = {
static const struct reg_default wm5102_reg_default[] = {
{ 0x0008, 0x0019 }, /* R8 - Ctrl IF SPI CFG 1 */
{ 0x0009, 0x0001 }, /* R9 - Ctrl IF I2C1 CFG 1 */
- { 0x000D, 0x }, /* R13- Ctrl IF Status 1 */
{ 0x0016, 0x }, /* R22- Write Sequencer Ctrl 0 */
{ 0x0017, 0x }, /* R23- Write Sequencer Ctrl 1 */
{ 0x0018, 0x }, /* R24- Write Sequencer Ctrl 2 */
- { 0x001A, 0x }, /* R26- Write Sequencer PROM */
{ 0x0020, 0x }, /* R32- Tone Generator 1 */
{ 0x0021, 0x1000 }, /* R33- Tone Generator 2 */
{ 0x0022, 0x }, /* R34- Tone Generator 3 */
@@ -243,12 +241,14 @@ static const struct reg_default wm5102_reg_default[] = {
{ 0x0062, 0x01FF }, /* R98- Sample Rate Sequence Select 2 */
{ 0x0063, 0x01FF }, /* R99- Sample Rate Sequence Select 3 */
{ 0x0064, 0x01FF }, /* R100 - Sample Rate Sequence Select 4 */
- { 0x0068, 0x01FF }, /* R104 - Always On Triggers Sequence
Select 1 */
- { 0x0069, 0x01FF }, /* R105 - Always On Triggers Sequence
Select 2 */
- { 0x006A, 0x01FF }, /* R106 - Always On Triggers Sequence
Select 3 */
- { 0x006B, 0x01FF }, /* R107 - Always On Triggers Sequence
Select 4 */
- { 0x006C, 0x01FF }, /* R108 - Always On Triggers Sequence
Select 5 */
- { 0x006D, 0x01FF }, /* R109 - Always On Triggers Sequence
Select 6 */
+ { 0x0066, 0x01FF }, /* R102 - Always On Triggers Sequence
Select 1 */
+ { 0x0067, 0x01FF }, /* R103 - Always On Triggers Sequence
Select 2 */
+ { 0x0068, 0x01FF }, /* R104 - Always On Triggers Sequence
Select 3 */
+ { 0x0069, 0x01FF }, /* R105 - Always On Triggers Sequence
Select 4 */
+ { 0x006A, 0x01FF }, /* R106 - Always On Triggers Sequence
Select 5 */
+ { 0x006B, 0x01FF }, /* R107 - Always On Triggers Sequence
Select 6 */
+ { 0x006E, 0x01FF }, /* R110 - Trigger Sequence Select 32 */
+ { 0x006F, 0x01FF }, /* R111 - Trigger Sequence Select 33 */
{ 0x0070, 0x }, /* R112 - Comfort Noise Generator */
{ 0x0090, 0x }, /* R144 - Haptics Control 1 */
{ 0x0091, 0x7FFF }, /* R145 - Haptics Control 2 */
@@ -258,13 +258,14 @@ static const struct reg_default wm5102_reg_default[] = {
{ 0x0095, 0x }, /* R149 - Haptics phase 2 duration */
{ 0x0096, 0x }, /* R150 - Haptics phase 3 intensity */
{ 0x0097, 0x }, /* R151 - Haptics phase 3 duration */
- { 0x0100, 0x0001 }, /* R256 - Clock 32k 1 */
+ { 0x0100, 0x0002 }, /* R256 - Clock 32k 1 */
{ 0x0101, 0x0304 }, /* R257 - System Clock 1 */
{ 0x0102, 0x0011 }, /* R258 - Sample rate 1 */
{ 0x0103, 0x0011 }, /* R259 - Sample rate 2 */
{ 0x0104, 0x0011 }, /* R260 - Sample rate 3 */
{ 0x0112, 0x0305 }, /* R274 - Async clock 1 */
{ 0x0113, 0x0011 }, /* R275 - Async sample rate 1 */
+ { 0x0114, 0x0011 }, /* R276 - Async sample rate 2 */
{ 0x0149, 0x }, /* R329 - Output system clock */
{ 0x014A, 0x }, /* R330 - Output async clock */
{ 0x0152, 0x }, /* R338 - Rate Estimator 1 */
@@ -273,13 +274,14 @@ static const struct reg_default wm5102_reg_default[] = {
{ 0x0155, 0x }, /* R341 - Rate Estimator 4 */
{ 0x0156, 0x }, /* R342 - Rate Estimator 5 */
{ 0x0161, 0x }, /* R353 - Dynamic Frequency Scaling 1 */
- { 0x0171, 0x }, /* R369 - FLL1 Control 1 */
+ { 0x0171, 0x0002 }, /* R369 - FLL1 Control 1 */
{ 0x0172, 0x0008 }, /* R370 - FLL1 Control 2 */
{ 0x0173, 0x0018 }, /* R371 - FLL1 Control 3 */
{ 0x0174, 0x007D }, /* R372 - FLL1 Control 4 */
{ 0x0175, 0x0004 }, /* R373 - FLL1 Control 5 */
{ 0x0176, 0x }, /* R374 - FLL1 Control 6 */
{ 0x0177, 0x0181 }, /* R375 - FLL1 Loop Filter Test 1 */
+ { 0x0178, 0x }, /* R376 - FLL1 NCO Test 0 */
{
[PATCH 08/10] mfd: wm5102: Refresh register defaults
The WM5102 register defaults are not up to date with the current register
map, synchronise them with those for current devices.
Signed-off-by: Mark Brown broo...@opensource.wolfsonmicro.com
---
drivers/mfd/wm5102-tables.c | 95 +++
1 file changed, 33 insertions(+), 62 deletions(-)
diff --git a/drivers/mfd/wm5102-tables.c b/drivers/mfd/wm5102-tables.c
index 167e6c4..edee1da 100644
--- a/drivers/mfd/wm5102-tables.c
+++ b/drivers/mfd/wm5102-tables.c
@@ -224,11 +224,9 @@ const struct regmap_irq_chip wm5102_irq = {
static const struct reg_default wm5102_reg_default[] = {
{ 0x0008, 0x0019 }, /* R8 - Ctrl IF SPI CFG 1 */
{ 0x0009, 0x0001 }, /* R9 - Ctrl IF I2C1 CFG 1 */
- { 0x000D, 0x }, /* R13- Ctrl IF Status 1 */
{ 0x0016, 0x }, /* R22- Write Sequencer Ctrl 0 */
{ 0x0017, 0x }, /* R23- Write Sequencer Ctrl 1 */
{ 0x0018, 0x }, /* R24- Write Sequencer Ctrl 2 */
- { 0x001A, 0x }, /* R26- Write Sequencer PROM */
{ 0x0020, 0x }, /* R32- Tone Generator 1 */
{ 0x0021, 0x1000 }, /* R33- Tone Generator 2 */
{ 0x0022, 0x }, /* R34- Tone Generator 3 */
@@ -243,12 +241,14 @@ static const struct reg_default wm5102_reg_default[] = {
{ 0x0062, 0x01FF }, /* R98- Sample Rate Sequence Select 2 */
{ 0x0063, 0x01FF }, /* R99- Sample Rate Sequence Select 3 */
{ 0x0064, 0x01FF }, /* R100 - Sample Rate Sequence Select 4 */
- { 0x0068, 0x01FF }, /* R104 - Always On Triggers Sequence
Select 1 */
- { 0x0069, 0x01FF }, /* R105 - Always On Triggers Sequence
Select 2 */
- { 0x006A, 0x01FF }, /* R106 - Always On Triggers Sequence
Select 3 */
- { 0x006B, 0x01FF }, /* R107 - Always On Triggers Sequence
Select 4 */
- { 0x006C, 0x01FF }, /* R108 - Always On Triggers Sequence
Select 5 */
- { 0x006D, 0x01FF }, /* R109 - Always On Triggers Sequence
Select 6 */
+ { 0x0066, 0x01FF }, /* R102 - Always On Triggers Sequence
Select 1 */
+ { 0x0067, 0x01FF }, /* R103 - Always On Triggers Sequence
Select 2 */
+ { 0x0068, 0x01FF }, /* R104 - Always On Triggers Sequence
Select 3 */
+ { 0x0069, 0x01FF }, /* R105 - Always On Triggers Sequence
Select 4 */
+ { 0x006A, 0x01FF }, /* R106 - Always On Triggers Sequence
Select 5 */
+ { 0x006B, 0x01FF }, /* R107 - Always On Triggers Sequence
Select 6 */
+ { 0x006E, 0x01FF }, /* R110 - Trigger Sequence Select 32 */
+ { 0x006F, 0x01FF }, /* R111 - Trigger Sequence Select 33 */
{ 0x0070, 0x }, /* R112 - Comfort Noise Generator */
{ 0x0090, 0x }, /* R144 - Haptics Control 1 */
{ 0x0091, 0x7FFF }, /* R145 - Haptics Control 2 */
@@ -258,13 +258,14 @@ static const struct reg_default wm5102_reg_default[] = {
{ 0x0095, 0x }, /* R149 - Haptics phase 2 duration */
{ 0x0096, 0x }, /* R150 - Haptics phase 3 intensity */
{ 0x0097, 0x }, /* R151 - Haptics phase 3 duration */
- { 0x0100, 0x0001 }, /* R256 - Clock 32k 1 */
+ { 0x0100, 0x0002 }, /* R256 - Clock 32k 1 */
{ 0x0101, 0x0304 }, /* R257 - System Clock 1 */
{ 0x0102, 0x0011 }, /* R258 - Sample rate 1 */
{ 0x0103, 0x0011 }, /* R259 - Sample rate 2 */
{ 0x0104, 0x0011 }, /* R260 - Sample rate 3 */
{ 0x0112, 0x0305 }, /* R274 - Async clock 1 */
{ 0x0113, 0x0011 }, /* R275 - Async sample rate 1 */
+ { 0x0114, 0x0011 }, /* R276 - Async sample rate 2 */
{ 0x0149, 0x }, /* R329 - Output system clock */
{ 0x014A, 0x }, /* R330 - Output async clock */
{ 0x0152, 0x }, /* R338 - Rate Estimator 1 */
@@ -273,13 +274,14 @@ static const struct reg_default wm5102_reg_default[] = {
{ 0x0155, 0x }, /* R341 - Rate Estimator 4 */
{ 0x0156, 0x }, /* R342 - Rate Estimator 5 */
{ 0x0161, 0x }, /* R353 - Dynamic Frequency Scaling 1 */
- { 0x0171, 0x }, /* R369 - FLL1 Control 1 */
+ { 0x0171, 0x0002 }, /* R369 - FLL1 Control 1 */
{ 0x0172, 0x0008 }, /* R370 - FLL1 Control 2 */
{ 0x0173, 0x0018 }, /* R371 - FLL1 Control 3 */
{ 0x0174, 0x007D }, /* R372 - FLL1 Control 4 */
{ 0x0175, 0x0004 }, /* R373 - FLL1 Control 5 */
{ 0x0176, 0x }, /* R374 - FLL1 Control 6 */
{ 0x0177, 0x0181 }, /* R375 - FLL1 Loop Filter Test 1 */
+ { 0x0178, 0x }, /*
