aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-orion/common.c
diff options
context:
space:
mode:
authorHerbert Valerio Riedel <hvr@gnu.org>2007-11-12 02:51:36 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-01-26 10:04:02 -0500
commit144aa3db1e8faa34bb33c61131494ac879a6d978 (patch)
tree886cb38c489f31fa4c525dc84ae0d1ecccba39af /arch/arm/mach-orion/common.c
parent2f0a8df40ff008822e5570b3323c56622cd92c95 (diff)
[ARM] Orion: I2C support
The Orion I2C controller is the same one used in the Discovery family (MV643XX). This patch include the common platform_device stuff according to the existing i2c_mv64xxx.c conventions. Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org> Signed-off-by: Tzachi Perelstein <tzachi@marvell.com>
Diffstat (limited to 'arch/arm/mach-orion/common.c')
-rw-r--r--arch/arm/mach-orion/common.c38
1 files changed, 38 insertions, 0 deletions
diff --git a/arch/arm/mach-orion/common.c b/arch/arm/mach-orion/common.c
index ff34827f82a5..5e20b6b32508 100644
--- a/arch/arm/mach-orion/common.c
+++ b/arch/arm/mach-orion/common.c
@@ -15,6 +15,7 @@
15#include <linux/platform_device.h> 15#include <linux/platform_device.h>
16#include <linux/serial_8250.h> 16#include <linux/serial_8250.h>
17#include <linux/mv643xx_eth.h> 17#include <linux/mv643xx_eth.h>
18#include <linux/mv643xx_i2c.h>
18#include <asm/page.h> 19#include <asm/page.h>
19#include <asm/timex.h> 20#include <asm/timex.h>
20#include <asm/mach/map.h> 21#include <asm/mach/map.h>
@@ -213,6 +214,42 @@ void __init orion_eth_init(struct mv643xx_eth_platform_data *eth_data)
213} 214}
214 215
215/***************************************************************************** 216/*****************************************************************************
217 * I2C controller
218 * (The Orion and Discovery (MV643xx) families share the same I2C controller)
219 ****************************************************************************/
220
221static struct mv64xxx_i2c_pdata orion_i2c_pdata = {
222 .freq_m = 8, /* assumes 166 MHz TCLK */
223 .freq_n = 3,
224 .timeout = 1000, /* Default timeout of 1 second */
225};
226
227static struct resource orion_i2c_resources[] = {
228 {
229 .name = "i2c base",
230 .start = I2C_BASE,
231 .end = I2C_BASE + 0x20 -1,
232 .flags = IORESOURCE_MEM,
233 },
234 {
235 .name = "i2c irq",
236 .start = IRQ_ORION_I2C,
237 .end = IRQ_ORION_I2C,
238 .flags = IORESOURCE_IRQ,
239 },
240};
241
242static struct platform_device orion_i2c = {
243 .name = MV64XXX_I2C_CTLR_NAME,
244 .id = 0,
245 .num_resources = ARRAY_SIZE(orion_i2c_resources),
246 .resource = orion_i2c_resources,
247 .dev = {
248 .platform_data = &orion_i2c_pdata,
249 },
250};
251
252/*****************************************************************************
216 * General 253 * General
217 ****************************************************************************/ 254 ****************************************************************************/
218 255
@@ -274,4 +311,5 @@ void __init orion_init(void)
274 platform_device_register(&orion_ehci0); 311 platform_device_register(&orion_ehci0);
275 if (dev == MV88F5182_DEV_ID) 312 if (dev == MV88F5182_DEV_ID)
276 platform_device_register(&orion_ehci1); 313 platform_device_register(&orion_ehci1);
314 platform_device_register(&orion_i2c);
277} 315}