Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=144aa3db1e8faa34bb33c61131494ac879a6d978
Commit:     144aa3db1e8faa34bb33c61131494ac879a6d978
Parent:     2f0a8df40ff008822e5570b3323c56622cd92c95
Author:     Herbert Valerio Riedel <[EMAIL PROTECTED]>
AuthorDate: Mon Nov 12 09:51:36 2007 +0200
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Sat Jan 26 15:04:02 2008 +0000

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: Tzachi Perelstein <[EMAIL PROTECTED]>
---
 arch/arm/mach-orion/common.c |   38 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 38 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-orion/common.c b/arch/arm/mach-orion/common.c
index ff34827..5e20b6b 100644
--- a/arch/arm/mach-orion/common.c
+++ b/arch/arm/mach-orion/common.c
@@ -15,6 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/serial_8250.h>
 #include <linux/mv643xx_eth.h>
+#include <linux/mv643xx_i2c.h>
 #include <asm/page.h>
 #include <asm/timex.h>
 #include <asm/mach/map.h>
@@ -213,6 +214,42 @@ void __init orion_eth_init(struct 
mv643xx_eth_platform_data *eth_data)
 }
 
 /*****************************************************************************
+ * I2C controller
+ * (The Orion and Discovery (MV643xx) families share the same I2C controller)
+ ****************************************************************************/
+
+static struct mv64xxx_i2c_pdata orion_i2c_pdata = {
+       .freq_m         = 8, /* assumes 166 MHz TCLK */
+       .freq_n         = 3,
+       .timeout        = 1000, /* Default timeout of 1 second */
+};
+
+static struct resource orion_i2c_resources[] = {
+       {
+               .name   = "i2c base",
+               .start  = I2C_BASE,
+               .end    = I2C_BASE + 0x20 -1,
+               .flags  = IORESOURCE_MEM,
+       },
+       {
+               .name   = "i2c irq",
+               .start  = IRQ_ORION_I2C,
+               .end    = IRQ_ORION_I2C,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
+static struct platform_device orion_i2c = {
+       .name           = MV64XXX_I2C_CTLR_NAME,
+       .id             = 0,
+       .num_resources  = ARRAY_SIZE(orion_i2c_resources),
+       .resource       = orion_i2c_resources,
+       .dev            = {
+               .platform_data = &orion_i2c_pdata,
+       },
+};
+
+/*****************************************************************************
  * General
  ****************************************************************************/
 
@@ -274,4 +311,5 @@ void __init orion_init(void)
        platform_device_register(&orion_ehci0);
        if (dev == MV88F5182_DEV_ID)
                platform_device_register(&orion_ehci1);
+       platform_device_register(&orion_i2c);
 }
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to