aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-omap4panda.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2/board-omap4panda.c')
-rw-r--r--arch/arm/mach-omap2/board-omap4panda.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index 3911c13a342a..45fe2d3f59b1 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -32,7 +32,6 @@
32#include <linux/wl12xx.h> 32#include <linux/wl12xx.h>
33#include <linux/platform_data/omap-abe-twl6040.h> 33#include <linux/platform_data/omap-abe-twl6040.h>
34 34
35#include <mach/hardware.h>
36#include <asm/hardware/gic.h> 35#include <asm/hardware/gic.h>
37#include <asm/mach-types.h> 36#include <asm/mach-types.h>
38#include <asm/mach/arch.h> 37#include <asm/mach/arch.h>
@@ -44,6 +43,7 @@
44#include <plat/mmc.h> 43#include <plat/mmc.h>
45#include <video/omap-panel-tfp410.h> 44#include <video/omap-panel-tfp410.h>
46 45
46#include "soc.h"
47#include "hsmmc.h" 47#include "hsmmc.h"
48#include "control.h" 48#include "control.h"
49#include "mux.h" 49#include "mux.h"
@@ -262,7 +262,6 @@ static struct twl6040_codec_data twl6040_codec = {
262static struct twl6040_platform_data twl6040_data = { 262static struct twl6040_platform_data twl6040_data = {
263 .codec = &twl6040_codec, 263 .codec = &twl6040_codec,
264 .audpwron_gpio = 127, 264 .audpwron_gpio = 127,
265 .irq_base = TWL6040_CODEC_IRQ_BASE,
266}; 265};
267 266
268/* Panda board uses the common PMIC configuration */ 267/* Panda board uses the common PMIC configuration */
@@ -293,7 +292,7 @@ static int __init omap4_panda_i2c_init(void)
293 TWL_COMMON_REGULATOR_V1V8 | 292 TWL_COMMON_REGULATOR_V1V8 |
294 TWL_COMMON_REGULATOR_V2V1); 293 TWL_COMMON_REGULATOR_V2V1);
295 omap4_pmic_init("twl6030", &omap4_panda_twldata, 294 omap4_pmic_init("twl6030", &omap4_panda_twldata,
296 &twl6040_data, OMAP44XX_IRQ_SYS_2N); 295 &twl6040_data, 119 + OMAP44XX_IRQ_GIC_START);
297 omap_register_i2c_bus(2, 400, NULL, 0); 296 omap_register_i2c_bus(2, 400, NULL, 0);
298 /* 297 /*
299 * Bus 3 is attached to the DVI port where devices like the pico DLP 298 * Bus 3 is attached to the DVI port where devices like the pico DLP