* [PATCH 1/2] omap: rx51: Use REGULATOR_SUPPLY macro when initializing regulator consumers
@ 2010-05-18 11:06 Jarkko Nikula
2010-05-18 11:06 ` [PATCH 2/2] omap: rx51: Add supplies and data for the tpa6130a2 headphone amplifier Jarkko Nikula
2010-05-18 12:09 ` [PATCH 1/2] omap: rx51: Use REGULATOR_SUPPLY macro when initializing regulator consumers Eduardo Valentin
0 siblings, 2 replies; 6+ messages in thread
From: Jarkko Nikula @ 2010-05-18 11:06 UTC (permalink / raw)
To: linux-omap; +Cc: Tony Lindgren, Eduardo Valentin, Jarkko Nikula
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
---
arch/arm/mach-omap2/board-rx51-peripherals.c | 43 ++++++-------------------
1 files changed, 11 insertions(+), 32 deletions(-)
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index 8179d55..ead7ee1 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -272,48 +272,27 @@ static struct omap2_hsmmc_info mmc[] __initdata = {
{} /* Terminator */
};
-static struct regulator_consumer_supply rx51_vmmc1_supply = {
- .supply = "vmmc",
- .dev_name = "mmci-omap-hs.0",
-};
+static struct regulator_consumer_supply rx51_vmmc1_supply =
+ REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.0");
-static struct regulator_consumer_supply rx51_vaux3_supply = {
- .supply = "vmmc",
- .dev_name = "mmci-omap-hs.1",
-};
+static struct regulator_consumer_supply rx51_vaux3_supply =
+ REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.1");
-static struct regulator_consumer_supply rx51_vsim_supply = {
- .supply = "vmmc_aux",
- .dev_name = "mmci-omap-hs.1",
-};
+static struct regulator_consumer_supply rx51_vsim_supply =
+ REGULATOR_SUPPLY("vmmc_aux", "mmci-omap-hs.1");
static struct regulator_consumer_supply rx51_vmmc2_supplies[] = {
/* tlv320aic3x analog supplies */
- {
- .supply = "AVDD",
- .dev_name = "2-0018",
- },
- {
- .supply = "DRVDD",
- .dev_name = "2-0018",
- },
+ REGULATOR_SUPPLY("AVDD", "2-0018"),
+ REGULATOR_SUPPLY("DRVDD", "2-0018"),
/* Keep vmmc as last item. It is not iterated for newer boards */
- {
- .supply = "vmmc",
- .dev_name = "mmci-omap-hs.1",
- },
+ REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.1"),
};
static struct regulator_consumer_supply rx51_vio_supplies[] = {
/* tlv320aic3x digital supplies */
- {
- .supply = "IOVDD",
- .dev_name = "2-0018"
- },
- {
- .supply = "DVDD",
- .dev_name = "2-0018"
- },
+ REGULATOR_SUPPLY("IOVDD", "2-0018"),
+ REGULATOR_SUPPLY("DVDD", "2-0018"),
};
static struct regulator_init_data rx51_vaux1 = {
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] omap: rx51: Add supplies and data for the tpa6130a2 headphone amplifier
2010-05-18 11:06 [PATCH 1/2] omap: rx51: Use REGULATOR_SUPPLY macro when initializing regulator consumers Jarkko Nikula
@ 2010-05-18 11:06 ` Jarkko Nikula
2010-05-18 12:48 ` Eduardo Valentin
2010-05-18 12:09 ` [PATCH 1/2] omap: rx51: Use REGULATOR_SUPPLY macro when initializing regulator consumers Eduardo Valentin
1 sibling, 1 reply; 6+ messages in thread
From: Jarkko Nikula @ 2010-05-18 11:06 UTC (permalink / raw)
To: linux-omap; +Cc: Tony Lindgren, Eduardo Valentin, Jarkko Nikula
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
---
This is build and boot safe but required if wanting to add support for
headphones in upcoming sound/soc/omap/rx51.c.
---
arch/arm/mach-omap2/board-rx51-peripherals.c | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index ead7ee1..2376ef7 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -33,6 +33,8 @@
#include <plat/onenand.h>
#include <plat/gpmc-smc91x.h>
+#include <sound/tpa6130a2-plat.h>
+
#include "mux.h"
#include "hsmmc.h"
@@ -285,6 +287,9 @@ static struct regulator_consumer_supply rx51_vmmc2_supplies[] = {
/* tlv320aic3x analog supplies */
REGULATOR_SUPPLY("AVDD", "2-0018"),
REGULATOR_SUPPLY("DRVDD", "2-0018"),
+ /* tpa6130a2 */
+ REGULATOR_SUPPLY("CPVSS", "2-0060"),
+ REGULATOR_SUPPLY("Vdd", "2-0060"),
/* Keep vmmc as last item. It is not iterated for newer boards */
REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.1"),
};
@@ -652,10 +657,19 @@ static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_1[] = {
},
};
+static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata = {
+ .id = TPA6130A2,
+ .power_gpio = 98,
+};
+
static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_2[] = {
{
I2C_BOARD_INFO("tlv320aic3x", 0x18),
},
+ {
+ I2C_BOARD_INFO("tpa6130a2", 0x60),
+ .platform_data = &rx51_tpa6130a2_data,
+ }
};
static int __init rx51_i2c_init(void)
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] omap: rx51: Add supplies and data for the tpa6130a2 headphone amplifier
2010-05-18 11:06 ` [PATCH 2/2] omap: rx51: Add supplies and data for the tpa6130a2 headphone amplifier Jarkko Nikula
@ 2010-05-18 12:48 ` Eduardo Valentin
2010-05-18 17:51 ` Jarkko Nikula
0 siblings, 1 reply; 6+ messages in thread
From: Eduardo Valentin @ 2010-05-18 12:48 UTC (permalink / raw)
To: ext Jarkko Nikula
Cc: linux-omap@vger.kernel.org, Tony Lindgren,
Valentin Eduardo (Nokia-D/Helsinki)
Hei Jarkko,
On Tue, May 18, 2010 at 01:06:01PM +0200, Jarkko Nikula wrote:
> Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
> ---
> This is build and boot safe but required if wanting to add support for
> headphones in upcoming sound/soc/omap/rx51.c.
> ---
> arch/arm/mach-omap2/board-rx51-peripherals.c | 14 ++++++++++++++
> 1 files changed, 14 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
> index ead7ee1..2376ef7 100644
> --- a/arch/arm/mach-omap2/board-rx51-peripherals.c
> +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
> @@ -33,6 +33,8 @@
> #include <plat/onenand.h>
> #include <plat/gpmc-smc91x.h>
>
> +#include <sound/tpa6130a2-plat.h>
> +
> #include "mux.h"
> #include "hsmmc.h"
>
> @@ -285,6 +287,9 @@ static struct regulator_consumer_supply rx51_vmmc2_supplies[] = {
> /* tlv320aic3x analog supplies */
> REGULATOR_SUPPLY("AVDD", "2-0018"),
> REGULATOR_SUPPLY("DRVDD", "2-0018"),
> + /* tpa6130a2 */
> + REGULATOR_SUPPLY("CPVSS", "2-0060"),
Isn't CPVSS grounded? Well that wouldn't hurt to put it here, but it doesnt belong to vmmc2 though.
> + REGULATOR_SUPPLY("Vdd", "2-0060"),
> /* Keep vmmc as last item. It is not iterated for newer boards */
> REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.1"),
> };
> @@ -652,10 +657,19 @@ static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_1[] = {
> },
> };
>
> +static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata = {
> + .id = TPA6130A2,
> + .power_gpio = 98,
> +};
> +
> static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_2[] = {
> {
> I2C_BOARD_INFO("tlv320aic3x", 0x18),
> },
> + {
> + I2C_BOARD_INFO("tpa6130a2", 0x60),
> + .platform_data = &rx51_tpa6130a2_data,
> + }
> };
>
> static int __init rx51_i2c_init(void)
> --
> 1.7.1
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] omap: rx51: Add supplies and data for the tpa6130a2 headphone amplifier
2010-05-18 12:48 ` Eduardo Valentin
@ 2010-05-18 17:51 ` Jarkko Nikula
2010-05-20 8:07 ` Eduardo Valentin
0 siblings, 1 reply; 6+ messages in thread
From: Jarkko Nikula @ 2010-05-18 17:51 UTC (permalink / raw)
To: eduardo.valentin; +Cc: linux-omap@vger.kernel.org, Tony Lindgren
On Tue, 18 May 2010 15:48:48 +0300
Eduardo Valentin <eduardo.valentin@nokia.com> wrote:
> > @@ -285,6 +287,9 @@ static struct regulator_consumer_supply rx51_vmmc2_supplies[] = {
> > /* tlv320aic3x analog supplies */
> > REGULATOR_SUPPLY("AVDD", "2-0018"),
> > REGULATOR_SUPPLY("DRVDD", "2-0018"),
> > + /* tpa6130a2 */
> > + REGULATOR_SUPPLY("CPVSS", "2-0060"),
>
> Isn't CPVSS grounded? Well that wouldn't hurt to put it here, but it doesnt belong to vmmc2 though.
>
Thanks Eduardo! For me it looks this CPVSS supply is miss-added to the
tpa6130a2 as spec says for this pin:
"Negative supply generated by the charge pump. Decouple to pin 19 on
the QFN or a CPVSS B2 15, 16 P GND plane. Use a 1 μF capacitor."
I'll send a fix first to the tpa6130a2 and repost this one after that.
--
Jarkko
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] omap: rx51: Add supplies and data for the tpa6130a2 headphone amplifier
2010-05-18 17:51 ` Jarkko Nikula
@ 2010-05-20 8:07 ` Eduardo Valentin
0 siblings, 0 replies; 6+ messages in thread
From: Eduardo Valentin @ 2010-05-20 8:07 UTC (permalink / raw)
To: ext Jarkko Nikula
Cc: Valentin Eduardo (Nokia-D/Helsinki), linux-omap@vger.kernel.org,
Tony Lindgren
On Tue, May 18, 2010 at 07:51:09PM +0200, Jarkko Nikula wrote:
> On Tue, 18 May 2010 15:48:48 +0300
> Eduardo Valentin <eduardo.valentin@nokia.com> wrote:
>
> > > @@ -285,6 +287,9 @@ static struct regulator_consumer_supply rx51_vmmc2_supplies[] = {
> > > /* tlv320aic3x analog supplies */
> > > REGULATOR_SUPPLY("AVDD", "2-0018"),
> > > REGULATOR_SUPPLY("DRVDD", "2-0018"),
> > > + /* tpa6130a2 */
> > > + REGULATOR_SUPPLY("CPVSS", "2-0060"),
> >
> > Isn't CPVSS grounded? Well that wouldn't hurt to put it here, but it doesnt belong to vmmc2 though.
> >
> Thanks Eduardo! For me it looks this CPVSS supply is miss-added to the
> tpa6130a2 as spec says for this pin:
>
> "Negative supply generated by the charge pump. Decouple to pin 19 on
> the QFN or a CPVSS B2 15, 16 P GND plane. Use a 1 μF capacitor."
right.
>
> I'll send a fix first to the tpa6130a2 and repost this one after that.
OK. good.
>
>
> --
> Jarkko
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] omap: rx51: Use REGULATOR_SUPPLY macro when initializing regulator consumers
2010-05-18 11:06 [PATCH 1/2] omap: rx51: Use REGULATOR_SUPPLY macro when initializing regulator consumers Jarkko Nikula
2010-05-18 11:06 ` [PATCH 2/2] omap: rx51: Add supplies and data for the tpa6130a2 headphone amplifier Jarkko Nikula
@ 2010-05-18 12:09 ` Eduardo Valentin
1 sibling, 0 replies; 6+ messages in thread
From: Eduardo Valentin @ 2010-05-18 12:09 UTC (permalink / raw)
To: ext Jarkko Nikula
Cc: linux-omap@vger.kernel.org, Tony Lindgren,
Valentin Eduardo (Nokia-D/Helsinki)
Moi Jarkko,
On Tue, May 18, 2010 at 01:06:00PM +0200, Jarkko Nikula wrote:
> Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
I don't have any major objections on this one. I'd just add a patch description though.
Other than that:
Acked-by: Eduardo Valentin <eduardo.valentin@nokia.com>
> ---
> arch/arm/mach-omap2/board-rx51-peripherals.c | 43 ++++++-------------------
> 1 files changed, 11 insertions(+), 32 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
> index 8179d55..ead7ee1 100644
> --- a/arch/arm/mach-omap2/board-rx51-peripherals.c
> +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
> @@ -272,48 +272,27 @@ static struct omap2_hsmmc_info mmc[] __initdata = {
> {} /* Terminator */
> };
>
> -static struct regulator_consumer_supply rx51_vmmc1_supply = {
> - .supply = "vmmc",
> - .dev_name = "mmci-omap-hs.0",
> -};
> +static struct regulator_consumer_supply rx51_vmmc1_supply =
> + REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.0");
>
> -static struct regulator_consumer_supply rx51_vaux3_supply = {
> - .supply = "vmmc",
> - .dev_name = "mmci-omap-hs.1",
> -};
> +static struct regulator_consumer_supply rx51_vaux3_supply =
> + REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.1");
>
> -static struct regulator_consumer_supply rx51_vsim_supply = {
> - .supply = "vmmc_aux",
> - .dev_name = "mmci-omap-hs.1",
> -};
> +static struct regulator_consumer_supply rx51_vsim_supply =
> + REGULATOR_SUPPLY("vmmc_aux", "mmci-omap-hs.1");
>
> static struct regulator_consumer_supply rx51_vmmc2_supplies[] = {
> /* tlv320aic3x analog supplies */
> - {
> - .supply = "AVDD",
> - .dev_name = "2-0018",
> - },
> - {
> - .supply = "DRVDD",
> - .dev_name = "2-0018",
> - },
> + REGULATOR_SUPPLY("AVDD", "2-0018"),
> + REGULATOR_SUPPLY("DRVDD", "2-0018"),
> /* Keep vmmc as last item. It is not iterated for newer boards */
> - {
> - .supply = "vmmc",
> - .dev_name = "mmci-omap-hs.1",
> - },
> + REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.1"),
> };
>
> static struct regulator_consumer_supply rx51_vio_supplies[] = {
> /* tlv320aic3x digital supplies */
> - {
> - .supply = "IOVDD",
> - .dev_name = "2-0018"
> - },
> - {
> - .supply = "DVDD",
> - .dev_name = "2-0018"
> - },
> + REGULATOR_SUPPLY("IOVDD", "2-0018"),
> + REGULATOR_SUPPLY("DVDD", "2-0018"),
> };
>
> static struct regulator_init_data rx51_vaux1 = {
> --
> 1.7.1
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-05-20 8:02 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-18 11:06 [PATCH 1/2] omap: rx51: Use REGULATOR_SUPPLY macro when initializing regulator consumers Jarkko Nikula
2010-05-18 11:06 ` [PATCH 2/2] omap: rx51: Add supplies and data for the tpa6130a2 headphone amplifier Jarkko Nikula
2010-05-18 12:48 ` Eduardo Valentin
2010-05-18 17:51 ` Jarkko Nikula
2010-05-20 8:07 ` Eduardo Valentin
2010-05-18 12:09 ` [PATCH 1/2] omap: rx51: Use REGULATOR_SUPPLY macro when initializing regulator consumers Eduardo Valentin
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.