Hi Linus, Lee,
these are various fixes I found while testing the ux500 ASoC driver on HREF
with device-tree.
First two patches are typos in DT files, while the others are
specifically to support ux500 ASoC driver with DT enabled.
The last patch can go in the mfd tree, while the others may safely go
through arm-soc, as there are no build dependencies or regression issues
in general.
Thanks,
Fabio
Fabio Baltieri (5):
ARM: ux500: Fix trivial typo in v-anamic1 comment
ARM: ux500: Correct anamic2 typo in DT files
ARM: ux500: Add DT regulators for ab8500-codec
ARM: ux500: Provide auxdata to ux500 ASoC driver
mfd: ab8500-core: Add of_compatible property for ab8500-codec
arch/arm/boot/dts/dbx5x0.dtsi | 11 ++++++++---
arch/arm/boot/dts/href.dtsi | 2 +-
arch/arm/boot/dts/hrefv60plus.dts | 2 +-
arch/arm/boot/dts/snowball.dts | 2 +-
arch/arm/mach-ux500/cpu-db8500.c | 2 ++
drivers/mfd/ab8500-core.c | 1 +
drivers/regulator/ab8500.c | 8 ++++----
7 files changed, 18 insertions(+), 10 deletions(-)
--
1.8.2
Fix VAMIC1 LDO comment in DT files to be make it coherent with the
others.
Signed-off-by: Fabio Baltieri <[email protected]>
---
arch/arm/boot/dts/dbx5x0.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi
index b6bc4ff..e6ea7ba 100644
--- a/arch/arm/boot/dts/dbx5x0.dtsi
+++ b/arch/arm/boot/dts/dbx5x0.dtsi
@@ -460,7 +460,7 @@
regulator-compatible = "ab8500_ldo_audio";
};
- // supply for v-anamic1 VAMic1-LDO
+ // supply for v-anamic1 VAMIC1 LDO
ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 {
regulator-compatible = "ab8500_ldo_anamic1";
};
--
1.8.2
Add regulator DT bindings for the ab8500-codec driver.
Signed-off-by: Fabio Baltieri <[email protected]>
---
arch/arm/boot/dts/dbx5x0.dtsi | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi
index d0b6e32..8e14042 100644
--- a/arch/arm/boot/dts/dbx5x0.dtsi
+++ b/arch/arm/boot/dts/dbx5x0.dtsi
@@ -410,6 +410,11 @@
codec: ab8500-codec {
compatible = "stericsson,ab8500-codec";
+ V-AUD-supply = <&ab8500_ldo_audio_reg>;
+ V-AMIC1-supply = <&ab8500_ldo_anamic1_reg>;
+ V-AMIC2-supply = <&ab8500_ldo_anamic2_reg>;
+ V-DMIC-supply = <&ab8500_ldo_dmic_reg>;
+
stericsson,earpeice-cmv = <950>; /* Units in mV. */
};
--
1.8.2
Add of_compatible string to the ab8500-codec cell to allow the driver to
grab handlers such as regulators from device-tree when available.
Signed-off-by: Fabio Baltieri <[email protected]>
---
drivers/mfd/ab8500-core.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c
index 1863985..3efb356 100644
--- a/drivers/mfd/ab8500-core.c
+++ b/drivers/mfd/ab8500-core.c
@@ -1120,6 +1120,7 @@ static struct mfd_cell ab8500_devs[] = {
},
{
.name = "ab8500-codec",
+ .of_compatible = "stericsson,ab8500-codec",
},
};
--
1.8.2
Ux500 ASoC driver is expected to have a specific device name to get
clock resources correctly. This patch provides the necessary
OF_DEV_AUXDATA to match the name in DT and non-DT cases.
Signed-off-by: Fabio Baltieri <[email protected]>
---
arch/arm/mach-ux500/cpu-db8500.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 46cca52..fb3d5a2 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -277,6 +277,8 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu",
&db8500_prcmu_pdata),
OF_DEV_AUXDATA("smsc,lan9115", 0x50000000, "smsc911x.0", NULL),
+ OF_DEV_AUXDATA("stericsson,snd-soc-mop500", 0, "snd-soc-mop500.0",
+ NULL),
/* Requires device name bindings. */
OF_DEV_AUXDATA("stericsson,nmk-pinctrl", U8500_PRCMU_BASE,
"pinctrl-db8500", NULL),
--
1.8.2
Fix typo of VAMIC2 LDO regulator name in some DT-related files. This
patch replaces all occurrences with the right name.
Signed-off-by: Fabio Baltieri <[email protected]>
---
arch/arm/boot/dts/dbx5x0.dtsi | 4 ++--
arch/arm/boot/dts/href.dtsi | 2 +-
arch/arm/boot/dts/hrefv60plus.dts | 2 +-
arch/arm/boot/dts/snowball.dts | 2 +-
drivers/regulator/ab8500.c | 8 ++++----
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi
index e6ea7ba..d0b6e32 100644
--- a/arch/arm/boot/dts/dbx5x0.dtsi
+++ b/arch/arm/boot/dts/dbx5x0.dtsi
@@ -466,8 +466,8 @@
};
// supply for v-amic2; VAMIC2 LDO; reuse constants for AMIC1
- ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 {
- regulator-compatible = "ab8500_ldo_amamic2";
+ ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 {
+ regulator-compatible = "ab8500_ldo_anamic2";
};
// supply for v-dmic; VDMIC LDO
diff --git a/arch/arm/boot/dts/href.dtsi b/arch/arm/boot/dts/href.dtsi
index c0bc426..4a53c48 100644
--- a/arch/arm/boot/dts/href.dtsi
+++ b/arch/arm/boot/dts/href.dtsi
@@ -256,7 +256,7 @@
regulator-name = "V-AMIC1";
};
- ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 {
+ ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 {
regulator-name = "V-AMIC2";
};
diff --git a/arch/arm/boot/dts/hrefv60plus.dts b/arch/arm/boot/dts/hrefv60plus.dts
index 2b587a7..4f04af8 100644
--- a/arch/arm/boot/dts/hrefv60plus.dts
+++ b/arch/arm/boot/dts/hrefv60plus.dts
@@ -192,7 +192,7 @@
regulator-name = "V-AMIC1";
};
- ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 {
+ ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 {
regulator-name = "V-AMIC2";
};
diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts
index db5db24..557d75e 100644
--- a/arch/arm/boot/dts/snowball.dts
+++ b/arch/arm/boot/dts/snowball.dts
@@ -336,7 +336,7 @@
regulator-name = "V-AMIC1";
};
- ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 {
+ ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 {
regulator-name = "V-AMIC2";
};
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index f6656b8..a19045e 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -2901,7 +2901,7 @@ static struct of_regulator_match ab8500_regulator_match[] = {
{ .name = "ab8500_ldo_tvout", .driver_data = (void *) AB8500_LDO_TVOUT, },
{ .name = "ab8500_ldo_audio", .driver_data = (void *) AB8500_LDO_AUDIO, },
{ .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB8500_LDO_ANAMIC1, },
- { .name = "ab8500_ldo_amamic2", .driver_data = (void *) AB8500_LDO_ANAMIC2, },
+ { .name = "ab8500_ldo_anamic2", .driver_data = (void *) AB8500_LDO_ANAMIC2, },
{ .name = "ab8500_ldo_dmic", .driver_data = (void *) AB8500_LDO_DMIC, },
{ .name = "ab8500_ldo_ana", .driver_data = (void *) AB8500_LDO_ANA, },
};
@@ -2917,7 +2917,7 @@ static struct of_regulator_match ab8505_regulator_match[] = {
{ .name = "ab8500_ldo_adc", .driver_data = (void *) AB8505_LDO_ADC, },
{ .name = "ab8500_ldo_audio", .driver_data = (void *) AB8505_LDO_AUDIO, },
{ .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB8505_LDO_ANAMIC1, },
- { .name = "ab8500_ldo_amamic2", .driver_data = (void *) AB8505_LDO_ANAMIC2, },
+ { .name = "ab8500_ldo_anamic2", .driver_data = (void *) AB8505_LDO_ANAMIC2, },
{ .name = "ab8500_ldo_aux8", .driver_data = (void *) AB8505_LDO_AUX8, },
{ .name = "ab8500_ldo_ana", .driver_data = (void *) AB8505_LDO_ANA, },
};
@@ -2933,7 +2933,7 @@ static struct of_regulator_match ab8540_regulator_match[] = {
{ .name = "ab8500_ldo_tvout", .driver_data = (void *) AB8540_LDO_TVOUT, },
{ .name = "ab8500_ldo_audio", .driver_data = (void *) AB8540_LDO_AUDIO, },
{ .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB8540_LDO_ANAMIC1, },
- { .name = "ab8500_ldo_amamic2", .driver_data = (void *) AB8540_LDO_ANAMIC2, },
+ { .name = "ab8500_ldo_anamic2", .driver_data = (void *) AB8540_LDO_ANAMIC2, },
{ .name = "ab8500_ldo_dmic", .driver_data = (void *) AB8540_LDO_DMIC, },
{ .name = "ab8500_ldo_ana", .driver_data = (void *) AB8540_LDO_ANA, },
{ .name = "ab8500_ldo_sdio", .driver_data = (void *) AB8540_LDO_SDIO, },
@@ -2948,7 +2948,7 @@ static struct of_regulator_match ab9540_regulator_match[] = {
{ .name = "ab8500_ldo_tvout", .driver_data = (void *) AB9540_LDO_TVOUT, },
{ .name = "ab8500_ldo_audio", .driver_data = (void *) AB9540_LDO_AUDIO, },
{ .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB9540_LDO_ANAMIC1, },
- { .name = "ab8500_ldo_amamic2", .driver_data = (void *) AB9540_LDO_ANAMIC2, },
+ { .name = "ab8500_ldo_anamic2", .driver_data = (void *) AB9540_LDO_ANAMIC2, },
{ .name = "ab8500_ldo_dmic", .driver_data = (void *) AB9540_LDO_DMIC, },
{ .name = "ab8500_ldo_ana", .driver_data = (void *) AB9540_LDO_ANA, },
};
--
1.8.2
On Thu, 30 May 2013, Fabio Baltieri wrote:
> Hi Linus, Lee,
>
> these are various fixes I found while testing the ux500 ASoC driver on HREF
> with device-tree.
>
> First two patches are typos in DT files, while the others are
> specifically to support ux500 ASoC driver with DT enabled.
>
> The last patch can go in the mfd tree, while the others may safely go
> through arm-soc, as there are no build dependencies or regression issues
> in general.
>
> Thanks,
> Fabio
>
>
> Fabio Baltieri (5):
> ARM: ux500: Fix trivial typo in v-anamic1 comment
> ARM: ux500: Correct anamic2 typo in DT files
> ARM: ux500: Add DT regulators for ab8500-codec
> ARM: ux500: Provide auxdata to ux500 ASoC driver
> mfd: ab8500-core: Add of_compatible property for ab8500-codec
>
> arch/arm/boot/dts/dbx5x0.dtsi | 11 ++++++++---
> arch/arm/boot/dts/href.dtsi | 2 +-
> arch/arm/boot/dts/hrefv60plus.dts | 2 +-
> arch/arm/boot/dts/snowball.dts | 2 +-
> arch/arm/mach-ux500/cpu-db8500.c | 2 ++
> drivers/mfd/ab8500-core.c | 1 +
> drivers/regulator/ab8500.c | 8 ++++----
> 7 files changed, 18 insertions(+), 10 deletions(-)
All look good to me.
For patches 1-4:
Acked-by: Lee Jones <[email protected]>
For patch 5:
Applied thanks.
--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
On Thu, May 30, 2013 at 3:27 PM, Fabio Baltieri
<[email protected]> wrote:
> Fix VAMIC1 LDO comment in DT files to be make it coherent with the
> others.
>
> Signed-off-by: Fabio Baltieri <[email protected]>
Patch applied to my ux500-devicetree branch.
Yours,
Linus Walleij
On Thu, May 30, 2013 at 3:27 PM, Fabio Baltieri
<[email protected]> wrote:
> Fix typo of VAMIC2 LDO regulator name in some DT-related files. This
> patch replaces all occurrences with the right name.
>
> Signed-off-by: Fabio Baltieri <[email protected]>
Patch applied to my ux500-devicetree branch.
Yours,
Linus Walleij
On Thu, May 30, 2013 at 3:27 PM, Fabio Baltieri
<[email protected]> wrote:
> Add regulator DT bindings for the ab8500-codec driver.
>
> Signed-off-by: Fabio Baltieri <[email protected]>
Patch applied to my ux500-devicetree branch.
Yours,
Linus Walleij
On Thu, May 30, 2013 at 3:27 PM, Fabio Baltieri
<[email protected]> wrote:
> Ux500 ASoC driver is expected to have a specific device name to get
> clock resources correctly. This patch provides the necessary
> OF_DEV_AUXDATA to match the name in DT and non-DT cases.
>
> Signed-off-by: Fabio Baltieri <[email protected]>
Patch applied to my ux500-devicetree branch after some rebasing.
Yours,
Linus Walleij
On Thu, May 30, 2013 at 3:27 PM, Fabio Baltieri
<[email protected]> wrote:
> Add of_compatible string to the ab8500-codec cell to allow the driver to
> grab handlers such as regulators from device-tree when available.
>
> Signed-off-by: Fabio Baltieri <[email protected]>
Acked-by: Linus Walleij <[email protected]>
I think Lee is queueing ab8500 patches for Sam these days
to smoothen things, so letting him pick this up.
Yours,
Linus Walleij
On Thu, May 30, 2013 at 4:53 PM, Lee Jones <[email protected]> wrote:
> All look good to me.
>
> For patches 1-4:
>
> Acked-by: Lee Jones <[email protected]>
OK added this.
> For patch 5:
> Applied thanks.
Thanks!
Yours,
Linus Walleij
On Tue, Jun 04, 2013 at 11:03:41AM +0200, Linus Walleij wrote:
> On Thu, May 30, 2013 at 3:27 PM, Fabio Baltieri
> <[email protected]> wrote:
>
> > Ux500 ASoC driver is expected to have a specific device name to get
> > clock resources correctly. This patch provides the necessary
> > OF_DEV_AUXDATA to match the name in DT and non-DT cases.
> >
> > Signed-off-by: Fabio Baltieri <[email protected]>
>
> Patch applied to my ux500-devicetree branch after some rebasing.
Thanks! I saw that a lot patches are stacking up in the tree, do you
plan to send an intermediate pull request to get these on
arm-soc/for-next (and linux-next)?
Thanks,
Fabio
>
> Yours,
> Linus Walleij
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
Fabio Baltieri
On Tue, Jun 4, 2013 at 11:56 AM, Fabio Baltieri
<[email protected]> wrote:
> On Tue, Jun 04, 2013 at 11:03:41AM +0200, Linus Walleij wrote:
>>
>> Patch applied to my ux500-devicetree branch after some rebasing.
>
> Thanks! I saw that a lot patches are stacking up in the tree, do you
> plan to send an intermediate pull request to get these on
> arm-soc/for-next (and linux-next)?
Yes it's just that new things come in all the time.
I might just draw a line at some point and say any more
changes need to go into v3.12.
Yours,
Linus Walleij