Commit d82973d1 authored by Tony Lindgren's avatar Tony Lindgren Committed by Russell King

ARM: OMAP: Mostly cosmetic to sync up with linux-omap tree

Mostly cosmetic to sync up with linux-omap tree
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 39b8e698
...@@ -46,7 +46,7 @@ config MACH_OMAP_H3 ...@@ -46,7 +46,7 @@ config MACH_OMAP_H3
config MACH_OMAP_OSK config MACH_OMAP_OSK
bool "TI OSK Support" bool "TI OSK Support"
depends on ARCH_OMAP1 && ARCH_OMAP16XX depends on ARCH_OMAP1 && ARCH_OMAP16XX
select TPS65010 select OMAP_MCBSP
help help
TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here
if you have such a board. if you have such a board.
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <asm/arch/mux.h> #include <asm/arch/mux.h>
#include <asm/arch/gpio.h> #include <asm/arch/gpio.h>
#if defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE) #if defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE)
#define OMAP2_I2C_BASE2 0x48072000 #define OMAP2_I2C_BASE2 0x48072000
#define OMAP2_I2C_INT2 57 #define OMAP2_I2C_INT2 57
...@@ -42,8 +42,8 @@ static struct resource i2c_resources2[] = { ...@@ -42,8 +42,8 @@ static struct resource i2c_resources2[] = {
}; };
static struct platform_device omap_i2c_device2 = { static struct platform_device omap_i2c_device2 = {
.name = "i2c_omap", .name = "i2c_omap",
.id = 2, .id = 2,
.num_resources = ARRAY_SIZE(i2c_resources2), .num_resources = ARRAY_SIZE(i2c_resources2),
.resource = i2c_resources2, .resource = i2c_resources2,
}; };
......
...@@ -112,8 +112,8 @@ static struct resource i2c_resources1[] = { ...@@ -112,8 +112,8 @@ static struct resource i2c_resources1[] = {
/* DMA not used; works around erratum writing to non-empty i2c fifo */ /* DMA not used; works around erratum writing to non-empty i2c fifo */
static struct platform_device omap_i2c_device1 = { static struct platform_device omap_i2c_device1 = {
.name = "i2c_omap", .name = "i2c_omap",
.id = 1, .id = 1,
.num_resources = ARRAY_SIZE(i2c_resources1), .num_resources = ARRAY_SIZE(i2c_resources1),
.resource = i2c_resources1, .resource = i2c_resources1,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment