From: w.sang@pengutronix.de (Wolfram Sang)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 11/10] arm: mxs: mx28evk: add fixed regulators for audio
Date: Mon, 18 Jul 2011 18:04:21 +0200 [thread overview]
Message-ID: <1311005061-20650-1-git-send-email-w.sang@pengutronix.de> (raw)
In-Reply-To: <1310731780-1645-1-git-send-email-b29396@freescale.com>
Add fixed regulator to enable basic audio-support until full regulator
support is done.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: Dong Aisheng <b29396@freescale.com>
---
Aisheng: This is the other patch (together with [1]) making the sgtl-hack
obsolete. Needs fixed regulators, of course.
[1] http://mailman.alsa-project.org/pipermail/alsa-devel/2011-July/041974.html
arch/arm/mach-mxs/mach-mx28evk.c | 42 ++++++++++++++++++++++++++++++++++++++
1 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-mxs/mach-mx28evk.c b/arch/arm/mach-mxs/mach-mx28evk.c
index f99fc6b..edab588 100644
--- a/arch/arm/mach-mxs/mach-mx28evk.c
+++ b/arch/arm/mach-mxs/mach-mx28evk.c
@@ -19,6 +19,8 @@
#include <linux/irq.h>
#include <linux/clk.h>
#include <linux/i2c.h>
+#include <linux/regulator/machine.h>
+#include <linux/regulator/fixed.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@ -379,6 +381,44 @@ static struct i2c_board_info mxs_i2c0_board_info[] __initdata = {
},
};
+#if defined(CONFIG_REGULATOR_FIXED_VOLTAGE) || defined(CONFIG_REGULATOR_FIXED_VOLTAGE_MODULE)
+static struct regulator_consumer_supply mx28evk_audio_consumer_supplies[] = {
+ REGULATOR_SUPPLY("VDDA", "0-000a"),
+ REGULATOR_SUPPLY("VDDIO", "0-000a"),
+};
+
+static struct regulator_init_data mx28evk_vdd_reg_init_data = {
+ .constraints = {
+ .name = "3V3",
+ .always_on = 1,
+ },
+ .consumer_supplies = mx28evk_audio_consumer_supplies,
+ .num_consumer_supplies = ARRAY_SIZE(mx28evk_audio_consumer_supplies),
+};
+
+static struct fixed_voltage_config mx28evk_vdd_pdata = {
+ .supply_name = "board-3V3",
+ .microvolts = 3300000,
+ .gpio = -EINVAL,
+ .enabled_at_boot = 1,
+ .init_data = &mx28evk_vdd_reg_init_data,
+};
+static struct platform_device mx28evk_voltage_regulator = {
+ .name = "reg-fixed-voltage",
+ .id = -1,
+ .num_resources = 0,
+ .dev = {
+ .platform_data = &mx28evk_vdd_pdata,
+ },
+};
+static void __init mx28evk_add_regulators(void)
+{
+ platform_device_register(&mx28evk_voltage_regulator);
+}
+#else
+static void __init mx28evk_add_regulators(void) {}
+#endif
+
static void __init mx28evk_init(void)
{
int ret;
@@ -426,6 +466,8 @@ static void __init mx28evk_init(void)
i2c_register_board_info(0, mxs_i2c0_board_info,
ARRAY_SIZE(mxs_i2c0_board_info));
+ mx28evk_add_regulators();
+
mxs_add_platform_device("mxs-sgtl5000", 0, NULL, 0,
NULL, 0);
--
1.7.5.4
next prev parent reply other threads:[~2011-07-18 16:04 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-15 12:09 [PATCH v3 00/10] ARM: mxs: add audio support Dong Aisheng
2011-07-15 12:09 ` [PATCH v3 01/10] ASoc: mxs: add mxs-pcm driver Dong Aisheng
2011-07-15 12:09 ` [PATCH v3 02/10] ASoc: mxs: add mxs-saif driver Dong Aisheng
2011-07-15 12:09 ` [PATCH v3 03/10] ASoc: mxs: add mxs-sgtl5000 machine driver Dong Aisheng
2011-07-15 12:09 ` [PATCH v3 04/10] ASoc: mxs: add asoc configuration files Dong Aisheng
2011-07-15 12:09 ` [PATCH v3 05/10] ARM: mxs: add saif clock Dong Aisheng
2011-07-15 12:09 ` [PATCH v3 06/10] ARM: mxs: add saif device Dong Aisheng
2011-07-19 4:34 ` [PATCH v4 " Dong Aisheng
2011-07-19 14:57 ` Mark Brown
2011-07-20 2:43 ` [alsa-devel] " Dong Aisheng
2011-07-15 12:09 ` [PATCH v3 07/10] ARM: mxs: add sgtl5000 i2c device Dong Aisheng
2011-07-19 4:35 ` [PATCH v4 " Dong Aisheng
2011-07-15 12:09 ` [PATCH v3 08/10] ARM: mxs: add mxs-sgtl5000 device Dong Aisheng
2011-07-19 4:36 ` [PATCH v4 " Dong Aisheng
2011-07-15 12:09 ` [PATCH v3 09/10] ARM: mxs: correct the using of frac div for saif Dong Aisheng
2011-07-15 12:09 ` [PATCH v3 10/10] ARM: mxs-dma: include <linux/dmaengine.h> Dong Aisheng
2011-07-15 20:39 ` [PATCH v3 00/10] ARM: mxs: add audio support Wolfram Sang
2011-07-17 3:44 ` [alsa-devel] " Dong Aisheng
2011-07-18 16:04 ` Wolfram Sang [this message]
2011-07-18 20:38 ` Wolfram Sang
2011-07-19 1:49 ` [alsa-devel] " Shawn Guo
2011-07-19 2:58 ` Dong Aisheng
2011-07-19 12:48 ` Dong Aisheng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1311005061-20650-1-git-send-email-w.sang@pengutronix.de \
--to=w.sang@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).