* [PATCH 1/3] mx31ads: Convert 1133-EV1 to use dev_name to specify consumer devices
@ 2010-01-04 18:24 Mark Brown
2010-01-04 18:24 ` [PATCH 2/3] mx31ads: Allow enable/disable of switchable supplies Mark Brown
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Mark Brown @ 2010-01-04 18:24 UTC (permalink / raw)
To: linux-arm-kernel
This means we don't need to go running round working out struct
devices at runtime.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
arch/arm/mach-mx3/mx31ads.c | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/arch/arm/mach-mx3/mx31ads.c b/arch/arm/mach-mx3/mx31ads.c
index 0497c15..cda570b 100644
--- a/arch/arm/mach-mx3/mx31ads.c
+++ b/arch/arm/mach-mx3/mx31ads.c
@@ -307,12 +307,8 @@ static struct regulator_init_data ldo1_data = {
};
static struct regulator_consumer_supply ldo2_consumers[] = {
- {
- .supply = "AVDD",
- },
- {
- .supply = "HPVDD",
- },
+ { .supply = "AVDD", .dev_name = "1-001a" },
+ { .supply = "HPVDD", .dev_name = "1-001a" },
};
/* CODEC and SIM */
@@ -382,8 +378,6 @@ static struct wm8350_audio_platform_data imx32ads_wm8350_setup = {
static int mx31_wm8350_init(struct wm8350 *wm8350)
{
- int i;
-
wm8350_gpio_config(wm8350, 0, WM8350_GPIO_DIR_IN,
WM8350_GPIO0_PWR_ON_IN, WM8350_GPIO_ACTIVE_LOW,
WM8350_GPIO_PULL_UP, WM8350_GPIO_INVERT_OFF,
@@ -419,10 +413,6 @@ static int mx31_wm8350_init(struct wm8350 *wm8350)
WM8350_GPIO_PULL_NONE, WM8350_GPIO_INVERT_OFF,
WM8350_GPIO_DEBOUNCE_OFF);
- /* Fix up for our own supplies. */
- for (i = 0; i < ARRAY_SIZE(ldo2_consumers); i++)
- ldo2_consumers[i].dev = wm8350->dev;
-
wm8350_register_regulator(wm8350, WM8350_DCDC_1, &sw1a_data);
wm8350_register_regulator(wm8350, WM8350_DCDC_3, &viohi_data);
wm8350_register_regulator(wm8350, WM8350_DCDC_4, &violo_data);
--
1.6.5.7
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/3] mx31ads: Allow enable/disable of switchable supplies
2010-01-04 18:24 [PATCH 1/3] mx31ads: Convert 1133-EV1 to use dev_name to specify consumer devices Mark Brown
@ 2010-01-04 18:24 ` Mark Brown
2010-01-05 12:12 ` Sascha Hauer
2010-01-04 18:24 ` [PATCH 3/3] mx31ads: Provide an IRQ range to the WM835x on the 1133-EV1 module Mark Brown
2010-01-05 12:11 ` [PATCH 1/3] mx31ads: Convert 1133-EV1 to use dev_name to specify consumer devices Sascha Hauer
2 siblings, 1 reply; 8+ messages in thread
From: Mark Brown @ 2010-01-04 18:24 UTC (permalink / raw)
To: linux-arm-kernel
They will be automatically powered off at startup so users will
need to enable them for use.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
arch/arm/mach-mx3/mx31ads.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-mx3/mx31ads.c b/arch/arm/mach-mx3/mx31ads.c
index cda570b..718fbe6 100644
--- a/arch/arm/mach-mx3/mx31ads.c
+++ b/arch/arm/mach-mx3/mx31ads.c
@@ -302,6 +302,7 @@ static struct regulator_init_data ldo1_data = {
.min_uV = 2800000,
.max_uV = 2800000,
.valid_modes_mask = REGULATOR_MODE_NORMAL,
+ .valid_ops_mask = REGULATOR_CHANGE_STATUS,
.apply_uV = 1,
},
};
@@ -318,6 +319,7 @@ static struct regulator_init_data ldo2_data = {
.min_uV = 3300000,
.max_uV = 3300000,
.valid_modes_mask = REGULATOR_MODE_NORMAL,
+ .valid_ops_mask = REGULATOR_CHANGE_STATUS,
.apply_uV = 1,
},
.num_consumer_supplies = ARRAY_SIZE(ldo2_consumers),
--
1.6.5.7
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/3] mx31ads: Provide an IRQ range to the WM835x on the 1133-EV1 module
2010-01-04 18:24 [PATCH 1/3] mx31ads: Convert 1133-EV1 to use dev_name to specify consumer devices Mark Brown
2010-01-04 18:24 ` [PATCH 2/3] mx31ads: Allow enable/disable of switchable supplies Mark Brown
@ 2010-01-04 18:24 ` Mark Brown
2010-01-05 11:08 ` Mark Brown
2010-01-05 12:11 ` [PATCH 1/3] mx31ads: Convert 1133-EV1 to use dev_name to specify consumer devices Sascha Hauer
2 siblings, 1 reply; 8+ messages in thread
From: Mark Brown @ 2010-01-04 18:24 UTC (permalink / raw)
To: linux-arm-kernel
The WM8350 core won't actually use the range yet, but it will in
future and the platform data to configure it is there now.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
arch/arm/mach-mx3/mx31ads.c | 1 +
arch/arm/plat-mxc/include/mach/irqs.h | 7 +++++++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-mx3/mx31ads.c b/arch/arm/mach-mx3/mx31ads.c
index 718fbe6..030b187 100644
--- a/arch/arm/mach-mx3/mx31ads.c
+++ b/arch/arm/mach-mx3/mx31ads.c
@@ -451,6 +451,7 @@ static int mx31_wm8350_init(struct wm8350 *wm8350)
static struct wm8350_platform_data __initdata mx31_wm8350_pdata = {
.init = mx31_wm8350_init,
+ .irq_base = MXC_BOARD_IRQ_START,
};
#endif
diff --git a/arch/arm/plat-mxc/include/mach/irqs.h b/arch/arm/plat-mxc/include/mach/irqs.h
index ead9d59..5d22798 100644
--- a/arch/arm/plat-mxc/include/mach/irqs.h
+++ b/arch/arm/plat-mxc/include/mach/irqs.h
@@ -37,7 +37,14 @@
* within sensible limits.
*/
#define MXC_BOARD_IRQ_START (MXC_INTERNAL_IRQS + MXC_GPIO_IRQS)
+
+#if defined(CONFIG_MACH_MX31ADS_WM1133_EV1) && !defined(MXC_BOARD_IRQS)
+#define MXC_BOARD_IRQS 64
+#endif
+
+#ifndef MXC_BOARD_IRQS
#define MXC_BOARD_IRQS 16
+#endif
#define MXC_IPU_IRQ_START (MXC_BOARD_IRQ_START + MXC_BOARD_IRQS)
--
1.6.5.7
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/3] mx31ads: Provide an IRQ range to the WM835x on the 1133-EV1 module
2010-01-04 18:24 ` [PATCH 3/3] mx31ads: Provide an IRQ range to the WM835x on the 1133-EV1 module Mark Brown
@ 2010-01-05 11:08 ` Mark Brown
0 siblings, 0 replies; 8+ messages in thread
From: Mark Brown @ 2010-01-05 11:08 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jan 04, 2010 at 06:24:51PM +0000, Mark Brown wrote:
> The WM8350 core won't actually use the range yet, but it will in
> future and the platform data to configure it is there now.
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Please don't apply this one, there's already an IRQ expander on the
board. I'll send a revised patch later.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/3] mx31ads: Convert 1133-EV1 to use dev_name to specify consumer devices
2010-01-04 18:24 [PATCH 1/3] mx31ads: Convert 1133-EV1 to use dev_name to specify consumer devices Mark Brown
2010-01-04 18:24 ` [PATCH 2/3] mx31ads: Allow enable/disable of switchable supplies Mark Brown
2010-01-04 18:24 ` [PATCH 3/3] mx31ads: Provide an IRQ range to the WM835x on the 1133-EV1 module Mark Brown
@ 2010-01-05 12:11 ` Sascha Hauer
2 siblings, 0 replies; 8+ messages in thread
From: Sascha Hauer @ 2010-01-05 12:11 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jan 04, 2010 at 06:24:49PM +0000, Mark Brown wrote:
> This means we don't need to go running round working out struct
> devices at runtime.
Ok, scheduled for -next.
Sascha
>
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
> arch/arm/mach-mx3/mx31ads.c | 14 ++------------
> 1 files changed, 2 insertions(+), 12 deletions(-)
>
> diff --git a/arch/arm/mach-mx3/mx31ads.c b/arch/arm/mach-mx3/mx31ads.c
> index 0497c15..cda570b 100644
> --- a/arch/arm/mach-mx3/mx31ads.c
> +++ b/arch/arm/mach-mx3/mx31ads.c
> @@ -307,12 +307,8 @@ static struct regulator_init_data ldo1_data = {
> };
>
> static struct regulator_consumer_supply ldo2_consumers[] = {
> - {
> - .supply = "AVDD",
> - },
> - {
> - .supply = "HPVDD",
> - },
> + { .supply = "AVDD", .dev_name = "1-001a" },
> + { .supply = "HPVDD", .dev_name = "1-001a" },
> };
>
> /* CODEC and SIM */
> @@ -382,8 +378,6 @@ static struct wm8350_audio_platform_data imx32ads_wm8350_setup = {
>
> static int mx31_wm8350_init(struct wm8350 *wm8350)
> {
> - int i;
> -
> wm8350_gpio_config(wm8350, 0, WM8350_GPIO_DIR_IN,
> WM8350_GPIO0_PWR_ON_IN, WM8350_GPIO_ACTIVE_LOW,
> WM8350_GPIO_PULL_UP, WM8350_GPIO_INVERT_OFF,
> @@ -419,10 +413,6 @@ static int mx31_wm8350_init(struct wm8350 *wm8350)
> WM8350_GPIO_PULL_NONE, WM8350_GPIO_INVERT_OFF,
> WM8350_GPIO_DEBOUNCE_OFF);
>
> - /* Fix up for our own supplies. */
> - for (i = 0; i < ARRAY_SIZE(ldo2_consumers); i++)
> - ldo2_consumers[i].dev = wm8350->dev;
> -
> wm8350_register_regulator(wm8350, WM8350_DCDC_1, &sw1a_data);
> wm8350_register_regulator(wm8350, WM8350_DCDC_3, &viohi_data);
> wm8350_register_regulator(wm8350, WM8350_DCDC_4, &violo_data);
> --
> 1.6.5.7
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/3] mx31ads: Allow enable/disable of switchable supplies
2010-01-04 18:24 ` [PATCH 2/3] mx31ads: Allow enable/disable of switchable supplies Mark Brown
@ 2010-01-05 12:12 ` Sascha Hauer
2010-01-05 12:27 ` Mark Brown
0 siblings, 1 reply; 8+ messages in thread
From: Sascha Hauer @ 2010-01-05 12:12 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jan 04, 2010 at 06:24:50PM +0000, Mark Brown wrote:
> They will be automatically powered off at startup so users will
> need to enable them for use.
Ok, scheduled for -next. Or do you wish to have this earlier?
Sascha
>
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
> arch/arm/mach-mx3/mx31ads.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-mx3/mx31ads.c b/arch/arm/mach-mx3/mx31ads.c
> index cda570b..718fbe6 100644
> --- a/arch/arm/mach-mx3/mx31ads.c
> +++ b/arch/arm/mach-mx3/mx31ads.c
> @@ -302,6 +302,7 @@ static struct regulator_init_data ldo1_data = {
> .min_uV = 2800000,
> .max_uV = 2800000,
> .valid_modes_mask = REGULATOR_MODE_NORMAL,
> + .valid_ops_mask = REGULATOR_CHANGE_STATUS,
> .apply_uV = 1,
> },
> };
> @@ -318,6 +319,7 @@ static struct regulator_init_data ldo2_data = {
> .min_uV = 3300000,
> .max_uV = 3300000,
> .valid_modes_mask = REGULATOR_MODE_NORMAL,
> + .valid_ops_mask = REGULATOR_CHANGE_STATUS,
> .apply_uV = 1,
> },
> .num_consumer_supplies = ARRAY_SIZE(ldo2_consumers),
> --
> 1.6.5.7
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/3] mx31ads: Allow enable/disable of switchable supplies
2010-01-05 12:12 ` Sascha Hauer
@ 2010-01-05 12:27 ` Mark Brown
2010-01-05 12:30 ` Sascha Hauer
0 siblings, 1 reply; 8+ messages in thread
From: Mark Brown @ 2010-01-05 12:27 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jan 05, 2010 at 01:12:43PM +0100, Sascha Hauer wrote:
> On Mon, Jan 04, 2010 at 06:24:50PM +0000, Mark Brown wrote:
> > They will be automatically powered off at startup so users will
> > need to enable them for use.
>
> Ok, scheduled for -next. Or do you wish to have this earlier?
It'd be nice to have it earlier if possible.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/3] mx31ads: Allow enable/disable of switchable supplies
2010-01-05 12:27 ` Mark Brown
@ 2010-01-05 12:30 ` Sascha Hauer
0 siblings, 0 replies; 8+ messages in thread
From: Sascha Hauer @ 2010-01-05 12:30 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jan 05, 2010 at 12:27:07PM +0000, Mark Brown wrote:
> On Tue, Jan 05, 2010 at 01:12:43PM +0100, Sascha Hauer wrote:
> > On Mon, Jan 04, 2010 at 06:24:50PM +0000, Mark Brown wrote:
> > > They will be automatically powered off at startup so users will
> > > need to enable them for use.
> >
> > Ok, scheduled for -next. Or do you wish to have this earlier?
>
> It'd be nice to have it earlier if possible.
>
ok.
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2010-01-05 12:30 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-04 18:24 [PATCH 1/3] mx31ads: Convert 1133-EV1 to use dev_name to specify consumer devices Mark Brown
2010-01-04 18:24 ` [PATCH 2/3] mx31ads: Allow enable/disable of switchable supplies Mark Brown
2010-01-05 12:12 ` Sascha Hauer
2010-01-05 12:27 ` Mark Brown
2010-01-05 12:30 ` Sascha Hauer
2010-01-04 18:24 ` [PATCH 3/3] mx31ads: Provide an IRQ range to the WM835x on the 1133-EV1 module Mark Brown
2010-01-05 11:08 ` Mark Brown
2010-01-05 12:11 ` [PATCH 1/3] mx31ads: Convert 1133-EV1 to use dev_name to specify consumer devices Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).