Skip to contentSkip to conversation

mfd: arizona: Defer patch initialistation until after first device boot

PATCH Applied Mark Brown 2 participants 4 messages Dec 2, 2012

Subsystems (2)
Multifunction devices (MFD) Wolfson microelectronics drivers
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/2 mfd: arizona: Defer patch initialistation until after first device boot

Make sure that we don't race with the initial device boot by only doing the initialisation after we've waited for the boot to complete.

The runtime PM code already waits for the boot to complete before it syncs the register patches so in most systems if a race does occur we will power down very soon afterwards and recover anyway.

Reported-by Charles Keepax <[email protected]>
Signed-off-by Mark Brown <[email protected]>
---
 drivers/mfd/arizona-core.c |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/mfd/arizona-core.c +12 -5
index c784f46..bc8a3ed 100644
@@ -292,6 +292,7 @@ int arizona_dev_init(struct arizona *arizona)
 	struct device *dev = arizona->dev;
 	const char *type_name;
 	unsigned int reg, val;
+	int (*apply_patch)(struct arizona *) = NULL;
 	int ret, i;
 
 	dev_set_drvdata(arizona->dev, arizona);

@@ -391,7 +392,7 @@ int arizona_dev_init(struct arizona *arizona)
 				arizona->type);
 			arizona->type = WM5102;
 		}
-		ret = wm5102_patch(arizona);
+		apply_patch = wm5102_patch;
 		break;
 #endif
 #ifdef CONFIG_MFD_WM5110

@@ -402,7 +403,7 @@ int arizona_dev_init(struct arizona *arizona)
 				arizona->type);
 			arizona->type = WM5110;
 		}
-		ret = wm5110_patch(arizona);
+		apply_patch = wm5110_patch;
 		break;
 #endif
 	default:

@@ -412,9 +413,6 @@ int arizona_dev_init(struct arizona *arizona)
 
 	dev_info(dev, "%s revision %c\n", type_name, arizona->rev + 'A');
 
-	if (ret != 0)
-		dev_err(arizona->dev, "Failed to apply patch: %d\n", ret);
-
 	/* If we have a /RESET GPIO we'll already be reset */
 	if (!arizona->pdata.reset) {
 		regcache_mark_dirty(arizona->regmap);

@@ -438,6 +436,15 @@ int arizona_dev_init(struct arizona *arizona)
 		goto err_reset;
 	}
 
+	if (apply_patch) {
+		ret = apply_patch(arizona);
+		if (ret != 0) {
+			dev_err(arizona->dev, "Failed to apply patch: %d\n",
+				ret);
+			goto err_reset;
+		}
+	}
+
 	for (i = 0; i < ARRAY_SIZE(arizona->pdata.gpio_defaults); i++) {
 		if (!arizona->pdata.gpio_defaults[i])
 			continue;
Signature · 1 line
1.7.10.4
author
#1 lore raw

PATCH 2/2 mfd: wm5102: Add tuning for revision B

Evaluation of revision B of WM5102 suggests updates to the register patch for optimal performance, and make this the default behaviour for new devices.

Signed-off-by Mark Brown <[email protected]>
---
 drivers/mfd/wm5102-tables.c |   16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)
drivers/mfd/wm5102-tables.c +15 -1
index 8bd0504..36708b0 100644
@@ -56,6 +56,18 @@ static const struct reg_default wm5102_reva_patch[] = {
 	{ 0x80, 0x0000 },
 };
 
+static const struct reg_default wm5102_revb_patch[] = {
+	{ 0x80, 0x0003 },
+	{ 0x081, 0xE022 },
+	{ 0x410, 0x6080 },
+	{ 0x418, 0x6080 },
+	{ 0x420, 0x6080 },
+	{ 0x428, 0xC000 },
+	{ 0x441, 0x8014 },
+	{ 0x458, 0x000b },
+	{ 0x80, 0x0000 },
+};
+
 /* We use a function so we can use ARRAY_SIZE() */
 int wm5102_patch(struct arizona *arizona)
 {

@@ -65,7 +77,9 @@ int wm5102_patch(struct arizona *arizona)
 					     wm5102_reva_patch,
 					     ARRAY_SIZE(wm5102_reva_patch));
 	default:
-		return 0;
+		return regmap_register_patch(arizona->regmap,
+					     wm5102_revb_patch,
+					     ARRAY_SIZE(wm5102_revb_patch));
 	}
 }
Signature · 1 line
1.7.10.4
Applied
#2 lore raw

Re: [PATCH 2/2] mfd: wm5102: Add tuning for revision B

Hi Mark,

Quoted 8 lines · Mark Brown

Evaluation of revision B of WM5102 suggests updates to the register patch for optimal performance, and make this the default behaviour for new devices.

Signed-off-by Mark Brown <[email protected]>
---
 drivers/mfd/wm5102-tables.c |   16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

Applied as well, probably the last patch I'll apply to my for-next branch for 3.8.

Cheers,
Samuel.

Signature · 2 lines
Intel Open Source Technology Centre
http://oss.intel.com/
Applied
#3 lore raw
In reply to Mark Brown

Hi Mark,

Quoted 7 lines · Mark Brown

Make sure that we don't race with the initial device boot by only doing the initialisation after we've waited for the boot to complete.

The runtime PM code already waits for the boot to complete before it syncs the register patches so in most systems if a race does occur we will power down very soon afterwards and recover anyway.

Quoted 5 lines
Reported-by Charles Keepax <[email protected]>
Signed-off-by Mark Brown <[email protected]>
---
 drivers/mfd/arizona-core.c |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

Applied, thanks.

Cheers,
Samuel.

Signature · 2 lines
Intel Open Source Technology Centre
http://oss.intel.com/