Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 273414
b: refs/heads/master
c: b7ddac5
h: refs/heads/master
v: v3
  • Loading branch information
Mattias Wallin authored and Samuel Ortiz committed Oct 24, 2011
1 parent 9b637b3 commit 7ffb32e
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3d5e2cabf11a65685e5067382ba4c4a76f18fcb7
refs/heads/master: b7ddac53df5097e8437ca40316caf79885d31946
29 changes: 28 additions & 1 deletion trunk/arch/arm/mach-ux500/board-u5500.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <linux/gpio.h>
#include <linux/irq.h>
#include <linux/i2c.h>
#include <linux/mfd/ab5500/ab5500.h>

#include <asm/mach/arch.h>
#include <asm/mach-types.h>
Expand Down Expand Up @@ -87,7 +88,6 @@ static struct lm3530_platform_data u5500_als_platform_data = {
.brt_val = 0x7F, /* Max brightness */
};


static struct i2c_board_info __initdata u5500_i2c2_devices[] = {
{
/* Backlight */
Expand All @@ -101,6 +101,30 @@ static void __init u5500_i2c_init(void)
db5500_add_i2c2(&u5500_i2c2_data);
i2c_register_board_info(2, ARRAY_AND_SIZE(u5500_i2c2_devices));
}

static struct ab5500_platform_data ab5500_plf_data = {
.irq = {
.base = 0,
.count = 0,
},
.init_settings = NULL,
.init_settings_sz = 0,
.pm_power_off = false,
};

static struct platform_device ab5500_device = {
.name = "ab5500-core",
.id = 0,
.dev = {
.platform_data = &ab5500_plf_data,
},
.num_resources = 0,
};

static struct platform_device *u5500_platform_devices[] __initdata = {
&ab5500_device,
};

static void __init u5500_uart_init(void)
{
db5500_add_uart0(NULL);
Expand All @@ -115,6 +139,9 @@ static void __init u5500_init_machine(void)
u5500_i2c_init();
u5500_sdi_init();
u5500_uart_init();

platform_add_devices(u5500_platform_devices,
ARRAY_SIZE(u5500_platform_devices));
}

MACHINE_START(U5500, "ST-Ericsson U5500 Platform")
Expand Down

0 comments on commit 7ffb32e

Please sign in to comment.