From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: Liam Girdwood <lrg@ti.com>, Tony Lindgren <tony@atomide.com>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Samuel Ortiz <sameo@linux.intel.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-input@vger.kernel.org, linux-omap@vger.kernel.org,
linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org,
Peter Ujfalusi <peter.ujfalusi@ti.com>
Subject: [PATCH 8/8] OMAP4: SDP4430: Add twl6040 vibrator platform support
Date: Wed, 1 Jun 2011 14:17:31 +0300 [thread overview]
Message-ID: <1306927051-8937-9-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1306927051-8937-1-git-send-email-peter.ujfalusi@ti.com>
Add twl4030_vibra platform data, and the needed regulators
for twl6040 vibrator.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
arch/arm/mach-omap2/board-4430sdp.c | 50 ++++++++++++++++++++++++++++++++++-
1 files changed, 49 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index b324605..6c4c1a3 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -22,6 +22,7 @@
#include <linux/i2c/twl.h>
#include <linux/gpio_keys.h>
#include <linux/regulator/machine.h>
+#include <linux/regulator/fixed.h>
#include <linux/leds.h>
#include <linux/leds_pwm.h>
@@ -276,11 +277,40 @@ static struct platform_device sdp4430_lcd_device = {
.id = -1,
};
+static struct regulator_consumer_supply sdp4430_vbat_supply[] = {
+ REGULATOR_SUPPLY("vddvibl", "twl6040-vibra"),
+ REGULATOR_SUPPLY("vddvibr", "twl6040-vibra"),
+};
+
+static struct regulator_init_data sdp4430_vbat_data = {
+ .constraints = {
+ .always_on = 1,
+ },
+ .num_consumer_supplies = ARRAY_SIZE(sdp4430_vbat_supply),
+ .consumer_supplies = sdp4430_vbat_supply,
+};
+
+static struct fixed_voltage_config sdp4430_vbat_pdata = {
+ .supply_name = "VBAT",
+ .microvolts = 3750000,
+ .init_data = &sdp4430_vbat_data,
+ .gpio = -EINVAL,
+};
+
+static struct platform_device sdp4430_vbat = {
+ .name = "reg-fixed-voltage",
+ .id = -1,
+ .dev = {
+ .platform_data = &sdp4430_vbat_pdata,
+ },
+};
+
static struct platform_device *sdp4430_devices[] __initdata = {
&sdp4430_lcd_device,
&sdp4430_gpio_keys_device,
&sdp4430_leds_gpio,
&sdp4430_leds_pwm,
+ &sdp4430_vbat,
};
static struct omap_lcd_config sdp4430_lcd_config __initdata = {
@@ -522,6 +552,23 @@ static struct regulator_init_data sdp4430_clk32kg = {
},
};
+static struct twl4030_vibra_data twl6040_vibra = {
+ .vibldrv_res = 8,
+ .vibrdrv_res = 3,
+ .viblmotor_res = 10,
+ .vibrmotor_res = 10,
+ .vddvibl_uV = 0, /* fixed volt supply - VBAT */
+ .vddvibr_uV = 0, /* fixed volt supply - VBAT */
+};
+
+static struct twl4030_audio_data twl6040_audio = {
+ .codec = NULL,
+ .vibra = &twl6040_vibra,
+ .audpwron_gpio = 127,
+ .naudint_irq = OMAP44XX_IRQ_SYS_2N,
+ .irq_base = TWL6040_CODEC_IRQ_BASE,
+};
+
static struct twl4030_platform_data sdp4430_twldata = {
.irq_base = TWL6030_IRQ_BASE,
.irq_end = TWL6030_IRQ_END,
@@ -538,7 +585,8 @@ static struct twl4030_platform_data sdp4430_twldata = {
.vaux2 = &sdp4430_vaux2,
.vaux3 = &sdp4430_vaux3,
.clk32kg = &sdp4430_clk32kg,
- .usb = &omap4_usbphy_data
+ .usb = &omap4_usbphy_data,
+ .audio = &twl6040_audio,
};
static struct i2c_board_info __initdata sdp4430_i2c_3_boardinfo[] = {
--
1.7.5.3
next prev parent reply other threads:[~2011-06-01 11:19 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-01 11:17 [PATCH 0/8] MFD/ASoC: TWL4030/TWL6040 changes Peter Ujfalusi
2011-06-01 11:17 ` [PATCH 1/8] MFD: twl4030-codec: Rename internals from codec to audio Peter Ujfalusi
2011-06-01 11:17 ` [PATCH 2/8] MFD: twl4030-codec -> twl4030-audio: Rename the driver Peter Ujfalusi
2011-06-01 11:17 ` [PATCH 3/8] MFD: twl4030-audio: Rename platform data Peter Ujfalusi
2011-06-01 12:07 ` Tony Lindgren
2011-06-01 12:54 ` Peter Ujfalusi
2011-06-01 13:00 ` Tony Lindgren
2011-06-01 13:17 ` Peter Ujfalusi
2011-06-01 13:38 ` Tony Lindgren
2011-06-02 6:15 ` Peter Ujfalusi
2011-06-03 8:08 ` Tony Lindgren
2011-06-03 13:38 ` Peter Ujfalusi
2011-06-06 9:55 ` Tony Lindgren
2011-06-01 11:17 ` [PATCH 4/8] mfd: twl6040: Add initial support Peter Ujfalusi
2011-06-01 13:47 ` T Krishnamoorthy, Balaji
2011-06-03 16:44 ` Peter Ujfalusi
2011-06-01 11:17 ` [PATCH 5/8] ASoC: twl6040: Convert into TWL6040 MFD child Peter Ujfalusi
2011-06-01 11:17 ` [PATCH 6/8] MFD: twl6040: Change platform data for soc codec driver Peter Ujfalusi
2011-06-01 11:17 ` [PATCH 7/8] input: Add initial support for TWL6040 vibrator Peter Ujfalusi
2011-06-01 11:17 ` Peter Ujfalusi [this message]
2011-06-02 8:29 ` [PATCH 0/8] MFD/ASoC: TWL4030/TWL6040 changes Mark Brown
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=1306927051-8937-9-git-send-email-peter.ujfalusi@ti.com \
--to=peter.ujfalusi@ti.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=lrg@ti.com \
--cc=sameo@linux.intel.com \
--cc=tony@atomide.com \
/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
all inboxes | Powered by JetHome®