>From 11262ea96e0fa73dd3470362b571a33b792bfb09 Mon Sep 17 00:00:00 2001
From: arun <arunedarath@xxxxxxxxxxxxxxxxxxxx>
Date: Wed, 11 Jun 2008 15:46:10 +0530
Subject: [PATCH] This patch completes the name change from 2430osk to OMAP2EVM
Also
a) Changed old style i2c registration
b) Changed the Maintainer
Signed-off-by: arun <arunedarath@xxxxxxxxxxxxxxxxxxxx>
---
arch/arm/mach-omap2/board-omap2evm.c | 111 ++++++----------------------
include/asm-arm/arch-omap/board-omap2evm.h | 14 ++--
2 files changed, 31 insertions(+), 94 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap2evm.c
b/arch/arm/mach-omap2/board-omap2evm.c
index 146dba3..d00e502 100644
--- a/arch/arm/mach-omap2/board-omap2evm.c
+++ b/arch/arm/mach-omap2/board-omap2evm.c
@@ -1,7 +1,7 @@
/*
- * linux/arch/arm/mach-omap2/board-2430osk.c
+ * linux/arch/arm/mach-omap2/board-omap2evm.c
*
- * Copyright (C) 2007 Mistral Software Pvt Ltd
+ * Copyright (C) 2008 Mistral Solutions Pvt Ltd
*
* Modified from mach-omap2/board-generic.c
*
@@ -16,6 +16,7 @@
#include <linux/delay.h>
#include <linux/err.h>
#include <linux/clk.h>
+#include <linux/io.h>
#include <asm/hardware.h>
#include <asm/mach-types.h>
@@ -26,118 +27,54 @@
#include <asm/arch/board.h>
#include <asm/arch/common.h>
-#include <asm/io.h>
-
-static void __init omap_2430osk_init_irq(void)
+static void __init omap2_evm_init_irq(void)
{
omap2_init_common_hw();
omap_init_irq();
omap_gpio_init();
}
-static struct omap_uart_config osk2430_uart_config __initdata = {
+static struct omap_uart_config omap2_evm_uart_config __initdata = {
.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
};
-static struct omap_board_config_kernel osk2430_config[] __initdata = {
-
- {OMAP_TAG_UART, &osk2430_uart_config},
-};
-
-#if defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE)
-
-#define OMAP2_I2C_BASE1 0x48070000
-#define OMAP2_I2C_BASE2 0x48072000
-#define OMAP2_I2C_INT1 56
-#define OMAP2_I2C_INT2 57
-
-static u32 omap2_i2c1_clkrate = 400;
-static u32 omap2_i2c2_clkrate = 2600;
-
-static struct resource i2c_resources1[] = {
- {
- .start = OMAP2_I2C_BASE1,
- .end = OMAP2_I2C_BASE1 + 0x3f,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = OMAP2_I2C_INT1,
- .flags = IORESOURCE_IRQ,
- },
-};
-
-static struct resource i2c_resources2[] = {
- {
- .start = OMAP2_I2C_BASE2,
- .end = OMAP2_I2C_BASE2 + 0x3f,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = OMAP2_I2C_INT2,
- .flags = IORESOURCE_IRQ,
- },
+static struct omap_board_config_kernel omap2_evm_config[] __initdata = {
+ {OMAP_TAG_UART, &omap2_evm_uart_config},
};
-static struct platform_device omap_i2c_device1 = {
- .name = "i2c_omap",
- .id = 1,
- .num_resources = ARRAY_SIZE(i2c_resources1),
- .resource = i2c_resources1,
- .dev = {
- .platform_data = &omap2_i2c1_clkrate,
- },
-};
-
-static struct platform_device omap_i2c_device2 = {
- .name = "i2c_omap",
- .id = 2,
- .num_resources = ARRAY_SIZE(i2c_resources2),
- .resource = i2c_resources2,
- .dev = {
- .platform_data = &omap2_i2c2_clkrate,
- },
-};
-
-static void omap_init_i2c(void)
-{
- (void) platform_device_register(&omap_i2c_device2);
- (void) platform_device_register(&omap_i2c_device1);
-}
-
-#else
-
-static void omap_init_i2c(void) {}
-
-#endif
-
-static int __init omap2430_i2c_init(void)
+static int __init omap2_evm_i2c_init(void)
{
- omap_init_i2c();
+ /*
+ * Registering bus 2 first to avoid twl4030 misbehaving as OMAP2EVM
+ * has twl4030 on bus 2
+ */
+ omap_register_i2c_bus(2, 2600, NULL, 0);
+ omap_register_i2c_bus(1, 400, NULL, 0);
return 0;
}
-static void __init omap_2430osk_init(void)
+static void __init omap2_evm_init(void)
{
- omap_board_config = osk2430_config;
- omap_board_config_size = ARRAY_SIZE(osk2430_config);
+ omap_board_config = omap2_evm_config;
+ omap_board_config_size = ARRAY_SIZE(omap2_evm_config);
omap_serial_init();
}
-static void __init omap_2430osk_map_io(void)
+static void __init omap2_evm_map_io(void)
{
omap2_set_globals_243x();
omap2_map_common_io();
}
-arch_initcall(omap2430_i2c_init);
+arch_initcall(omap2_evm_i2c_init);
-MACHINE_START(OMAP_2430OSK, "OMAP2430 2430OSK board")
- /* Maintainer: Syed Khasim */
+MACHINE_START(OMAP2EVM, "OMAP2EVM Board")
+ /* Maintainer: Arun KS <arunks@xxxxxxxxxxxxxxxxxxxx> */
.phys_io = 0x48000000,
.io_pg_offst = ((0xd8000000) >> 18) & 0xfffc,
.boot_params = 0x80000100,
- .map_io = omap_2430osk_map_io,
- .init_irq = omap_2430osk_init_irq,
- .init_machine = omap_2430osk_init,
+ .map_io = omap2_evm_map_io,
+ .init_irq = omap2_evm_init_irq,
+ .init_machine = omap2_evm_init,
.timer = &omap_timer,
MACHINE_END
diff --git a/include/asm-arm/arch-omap/board-omap2evm.h
b/include/asm-arm/arch-omap/board-omap2evm.h
index 3b61bc1..98273a9 100644
--- a/include/asm-arm/arch-omap/board-omap2evm.h
+++ b/include/asm-arm/arch-omap/board-omap2evm.h
@@ -1,9 +1,9 @@
/*
- * linux/include/asm-arm/arch-omap/board-2430osk.h
+ * linux/include/asm-arm/arch-omap/board-omap2evm.h
*
- * Hardware definitions for TI OMAP2430 OSK board.
+ * Hardware definitions for Mistral's OMAP2EVM board.
*
- * Based on board-2330sdp.h
+ * Based on board-2430sdp.h
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -26,11 +26,11 @@
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#ifndef __ASM_ARCH_OMAP_2430OSK_H
-#define __ASM_ARCH_OMAP_2430OSK_H
+#ifndef __ASM_ARCH_OMAP2_EVM_H
+#define __ASM_ARCH_OMAP2_EVM_H
-/* Placeholder for 2430OSK specific defines */
+/* Placeholder for OMAP2EVM specific defines */
#define OMAP24XX_ETHR_START 0x08000300
#define OMAP24XX_ETHR_GPIO_IRQ 149
-#endif /* __ASM_ARCH_OMAP_2430OSK_H */
+#endif /* __ASM_ARCH_OMAP2_EVM_H */
--
1.5.3.4
From 11262ea96e0fa73dd3470362b571a33b792bfb09 Mon Sep 17 00:00:00 2001
From: arun <arunedarath@xxxxxxxxxxxxxxxxxxxx>
Date: Wed, 11 Jun 2008 15:46:10 +0530
Subject: [PATCH] This patch completes the name change from 2430osk to OMAP2EVM
Also
a) Changed old style i2c registration
b) Changed the Maintainer
Signed-off-by: arun <arunedarath@xxxxxxxxxxxxxxxxxxxx>
---
arch/arm/mach-omap2/board-omap2evm.c | 111 ++++++----------------------
include/asm-arm/arch-omap/board-omap2evm.h | 14 ++--
2 files changed, 31 insertions(+), 94 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap2evm.c b/arch/arm/mach-omap2/board-omap2evm.c
index 146dba3..d00e502 100644
--- a/arch/arm/mach-omap2/board-omap2evm.c
+++ b/arch/arm/mach-omap2/board-omap2evm.c
@@ -1,7 +1,7 @@
/*
- * linux/arch/arm/mach-omap2/board-2430osk.c
+ * linux/arch/arm/mach-omap2/board-omap2evm.c
*
- * Copyright (C) 2007 Mistral Software Pvt Ltd
+ * Copyright (C) 2008 Mistral Solutions Pvt Ltd
*
* Modified from mach-omap2/board-generic.c
*
@@ -16,6 +16,7 @@
#include <linux/delay.h>
#include <linux/err.h>
#include <linux/clk.h>
+#include <linux/io.h>
#include <asm/hardware.h>
#include <asm/mach-types.h>
@@ -26,118 +27,54 @@
#include <asm/arch/board.h>
#include <asm/arch/common.h>
-#include <asm/io.h>
-
-static void __init omap_2430osk_init_irq(void)
+static void __init omap2_evm_init_irq(void)
{
omap2_init_common_hw();
omap_init_irq();
omap_gpio_init();
}
-static struct omap_uart_config osk2430_uart_config __initdata = {
+static struct omap_uart_config omap2_evm_uart_config __initdata = {
.enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
};
-static struct omap_board_config_kernel osk2430_config[] __initdata = {
-
- {OMAP_TAG_UART, &osk2430_uart_config},
-};
-
-#if defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE)
-
-#define OMAP2_I2C_BASE1 0x48070000
-#define OMAP2_I2C_BASE2 0x48072000
-#define OMAP2_I2C_INT1 56
-#define OMAP2_I2C_INT2 57
-
-static u32 omap2_i2c1_clkrate = 400;
-static u32 omap2_i2c2_clkrate = 2600;
-
-static struct resource i2c_resources1[] = {
- {
- .start = OMAP2_I2C_BASE1,
- .end = OMAP2_I2C_BASE1 + 0x3f,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = OMAP2_I2C_INT1,
- .flags = IORESOURCE_IRQ,
- },
-};
-
-static struct resource i2c_resources2[] = {
- {
- .start = OMAP2_I2C_BASE2,
- .end = OMAP2_I2C_BASE2 + 0x3f,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = OMAP2_I2C_INT2,
- .flags = IORESOURCE_IRQ,
- },
+static struct omap_board_config_kernel omap2_evm_config[] __initdata = {
+ {OMAP_TAG_UART, &omap2_evm_uart_config},
};
-static struct platform_device omap_i2c_device1 = {
- .name = "i2c_omap",
- .id = 1,
- .num_resources = ARRAY_SIZE(i2c_resources1),
- .resource = i2c_resources1,
- .dev = {
- .platform_data = &omap2_i2c1_clkrate,
- },
-};
-
-static struct platform_device omap_i2c_device2 = {
- .name = "i2c_omap",
- .id = 2,
- .num_resources = ARRAY_SIZE(i2c_resources2),
- .resource = i2c_resources2,
- .dev = {
- .platform_data = &omap2_i2c2_clkrate,
- },
-};
-
-static void omap_init_i2c(void)
-{
- (void) platform_device_register(&omap_i2c_device2);
- (void) platform_device_register(&omap_i2c_device1);
-}
-
-#else
-
-static void omap_init_i2c(void) {}
-
-#endif
-
-static int __init omap2430_i2c_init(void)
+static int __init omap2_evm_i2c_init(void)
{
- omap_init_i2c();
+ /*
+ * Registering bus 2 first to avoid twl4030 misbehaving as OMAP2EVM
+ * has twl4030 on bus 2
+ */
+ omap_register_i2c_bus(2, 2600, NULL, 0);
+ omap_register_i2c_bus(1, 400, NULL, 0);
return 0;
}
-static void __init omap_2430osk_init(void)
+static void __init omap2_evm_init(void)
{
- omap_board_config = osk2430_config;
- omap_board_config_size = ARRAY_SIZE(osk2430_config);
+ omap_board_config = omap2_evm_config;
+ omap_board_config_size = ARRAY_SIZE(omap2_evm_config);
omap_serial_init();
}
-static void __init omap_2430osk_map_io(void)
+static void __init omap2_evm_map_io(void)
{
omap2_set_globals_243x();
omap2_map_common_io();
}
-arch_initcall(omap2430_i2c_init);
+arch_initcall(omap2_evm_i2c_init);
-MACHINE_START(OMAP_2430OSK, "OMAP2430 2430OSK board")
- /* Maintainer: Syed Khasim */
+MACHINE_START(OMAP2EVM, "OMAP2EVM Board")
+ /* Maintainer: Arun KS <arunks@xxxxxxxxxxxxxxxxxxxx> */
.phys_io = 0x48000000,
.io_pg_offst = ((0xd8000000) >> 18) & 0xfffc,
.boot_params = 0x80000100,
- .map_io = omap_2430osk_map_io,
- .init_irq = omap_2430osk_init_irq,
- .init_machine = omap_2430osk_init,
+ .map_io = omap2_evm_map_io,
+ .init_irq = omap2_evm_init_irq,
+ .init_machine = omap2_evm_init,
.timer = &omap_timer,
MACHINE_END
diff --git a/include/asm-arm/arch-omap/board-omap2evm.h b/include/asm-arm/arch-omap/board-omap2evm.h
index 3b61bc1..98273a9 100644
--- a/include/asm-arm/arch-omap/board-omap2evm.h
+++ b/include/asm-arm/arch-omap/board-omap2evm.h
@@ -1,9 +1,9 @@
/*
- * linux/include/asm-arm/arch-omap/board-2430osk.h
+ * linux/include/asm-arm/arch-omap/board-omap2evm.h
*
- * Hardware definitions for TI OMAP2430 OSK board.
+ * Hardware definitions for Mistral's OMAP2EVM board.
*
- * Based on board-2330sdp.h
+ * Based on board-2430sdp.h
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -26,11 +26,11 @@
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#ifndef __ASM_ARCH_OMAP_2430OSK_H
-#define __ASM_ARCH_OMAP_2430OSK_H
+#ifndef __ASM_ARCH_OMAP2_EVM_H
+#define __ASM_ARCH_OMAP2_EVM_H
-/* Placeholder for 2430OSK specific defines */
+/* Placeholder for OMAP2EVM specific defines */
#define OMAP24XX_ETHR_START 0x08000300
#define OMAP24XX_ETHR_GPIO_IRQ 149
-#endif /* __ASM_ARCH_OMAP_2430OSK_H */
+#endif /* __ASM_ARCH_OMAP2_EVM_H */
--
1.5.3.4
