Skip to contentSkip to conversation

mfd: arizona: Add MICVDD to mapped regulators

PATCH RESEND Applied Charles Keepax 2 participants 6 messages May 19, 2014

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

Charles Keepax

author
#0 lore raw

PATCH RESEND 1/3 mfd: arizona: Add MICVDD to mapped regulators

Currently, MICVDD only binds because it is both the regulator name and the consumer name and we will always match against the regulator name regardless of the consumer device. If the regulator was renamed using the init_data ASoC will no longer be able to locate the supply, as it will be looking on the CODEC device where as the MICVDD consumer is on the Arizona device. Add a mapping as we do for the other regulators.

Signed-off-by Charles Keepax <[email protected]>
---
 drivers/mfd/arizona-core.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/mfd/arizona-core.c +1 -0
index a45aab9..a068748 100644
@@ -575,6 +575,7 @@ static const char *wm5102_supplies[] = {
 	"CPVDD",
 	"SPKVDDL",
 	"SPKVDDR",
+	"MICVDD",
 };
 
 static const struct mfd_cell wm5102_devs[] = {
Signature · 1 line
1.7.2.5
author
#1 lore raw

PATCH RESEND 2/3 mfd: wm8997: Add registers for high power mode

Some output configurations can require a 50Mhz SYSCLK which requires DCVDD to be 1.8V. This patch adds the registers necessary for supporting this operational mode.

Signed-off-by Charles Keepax <[email protected]>
---
 drivers/mfd/wm8997-tables.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/mfd/wm8997-tables.c +2 -0
index 5aa8076..c9c6519 100644
@@ -846,6 +846,7 @@ static bool wm8997_readable_register(struct device *dev, unsigned int reg)
 	case ARIZONA_RATE_ESTIMATOR_3:
 	case ARIZONA_RATE_ESTIMATOR_4:
 	case ARIZONA_RATE_ESTIMATOR_5:
+	case ARIZONA_DYNAMIC_FREQUENCY_SCALING_1:
 	case ARIZONA_FLL1_CONTROL_1:
 	case ARIZONA_FLL1_CONTROL_2:
 	case ARIZONA_FLL1_CONTROL_3:

@@ -880,6 +881,7 @@ static bool wm8997_readable_register(struct device *dev, unsigned int reg)
 	case ARIZONA_FLL2_GPIO_CLOCK:
 	case ARIZONA_MIC_CHARGE_PUMP_1:
 	case ARIZONA_LDO1_CONTROL_1:
+	case ARIZONA_LDO1_CONTROL_2:
 	case ARIZONA_LDO2_CONTROL_1:
 	case ARIZONA_MIC_BIAS_CTRL_1:
 	case ARIZONA_MIC_BIAS_CTRL_2:
Signature · 1 line
1.7.2.5
Applied
#2 lore raw

Re: [PATCH RESEND 2/3] mfd: wm8997: Add registers for high power mode

Quoted 8 lines

Some output configurations can require a 50Mhz SYSCLK which requires DCVDD to be 1.8V. This patch adds the registers necessary for supporting this operational mode.

Signed-off-by Charles Keepax <[email protected]>
---
 drivers/mfd/wm8997-tables.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

Applied, thanks.

Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
author
#3 lore raw

PATCH RESEND 3/3 mfd: arizona: Correct error message for addition of main IRQ chip

In reply to Charles Keepax
Signed-off-by Charles Keepax <[email protected]>
---
 drivers/mfd/arizona-irq.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/mfd/arizona-irq.c +1 -1
index 88758ab..17102f5 100644
@@ -285,7 +285,7 @@ int arizona_irq_init(struct arizona *arizona)
 				  IRQF_ONESHOT, -1, irq,
 				  &arizona->irq_chip);
 	if (ret != 0) {
-		dev_err(arizona->dev, "Failed to add AOD IRQs: %d\n", ret);
+		dev_err(arizona->dev, "Failed to add main IRQs: %d\n", ret);
 		goto err_aod;
 	}
Signature · 1 line
1.7.2.5
Applied
#4 lore raw

Re: [PATCH RESEND 3/3] mfd: arizona: Correct error message for addition of main IRQ chip

Quoted 4 lines
Signed-off-by Charles Keepax <[email protected]>
---
 drivers/mfd/arizona-irq.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Applied, thanks.

Quoted 13 lines
drivers/mfd/arizona-irq.c +1 -1
index 88758ab..17102f5 100644
@@ -285,7 +285,7 @@ int arizona_irq_init(struct arizona *arizona)
 				  IRQF_ONESHOT, -1, irq,
 				  &arizona->irq_chip);
 	if (ret != 0) {
-		dev_err(arizona->dev, "Failed to add AOD IRQs: %d\n", ret);
+		dev_err(arizona->dev, "Failed to add main IRQs: %d\n", ret);
 		goto err_aod;
 	}
Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
Applied
#5 lore raw
In reply to Charles Keepax
Quoted 11 lines

Currently, MICVDD only binds because it is both the regulator name and the consumer name and we will always match against the regulator name regardless of the consumer device. If the regulator was renamed using the init_data ASoC will no longer be able to locate the supply, as it will be looking on the CODEC device where as the MICVDD consumer is on the Arizona device. Add a mapping as we do for the other regulators.

Signed-off-by Charles Keepax <[email protected]>
---
 drivers/mfd/arizona-core.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Applied, thanks.

Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog