evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Mostly cosmetic to sync up with linux-omap tree

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Tony Lindgren 2007-01-26 12:01:17 -08:00 • committed by Russell King
parent 39b8e69867
commit d82973d1cd
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mach-omap1/Kconfig
View file

@ -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.

6
arch/arm/mach-omap2/devices.c
View file

@ -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[] = {
}; };
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,
}; };

4
arch/arm/plat-omap/devices.c
View file

@ -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,
}; };