DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OMAP4: SDP4430: Fix merge issue with new MFD driver

Browse Source 
Fix merge issue with upstream MFD driver

Signed-off-by: Sebastien Guiriec <s-guiriec@ti.com>
This commit is contained in:
Sebastien Guiriec
2011-07-03 22:29:47 +02:00
parent 71e450b8ee
commit 10d224bb67
1 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
arch/arm/mach-omap2/board-4430sdp.c
View File

@@ -457,27 +457,6 @@ static struct twl4030_audio_data twl6040_audio = {
.irq_base = TWL6040_CODEC_IRQ_BASE,
};
static struct twl4030_codec_audio_data twl6040_audio = {
/* single-step ramp for headset and handsfree */
.hs_left_step = 0x0f,
.hs_right_step = 0x0f,
.hf_left_step = 0x1d,
.hf_right_step = 0x1d,
};
static struct twl4030_codec_vibra_data twl6040_vibra = {
.max_timeout = 15000,
.initial_vibrate = 0,
};
static struct twl4030_codec_data twl6040_codec = {
.audio = &twl6040_audio,
.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 = {
.audio = &twl6040_audio,
/* Regulators */