Changeset 3639

Timestamp:

06/12/02 04:29:54 (11 years ago)

Author:

mds

Message:

all but the export-objs part

On Fri, Jun 07, 2002 at 09:36:06AM -0400, Mark Studebaker wrote:

would you please respond to ticket 906 about the 8xx driver not compiling?
thanks

Okay. There's two problems. The attached patch deals with all of the
warnings and adds i2c-algo-8xx.o to the export-objs list. The second
one is that include/asm-ppc/commproc.h needs a small patch which I will
try and get into 2.4.19.

This is very lightly tested at the moment, but it seems OK.

--
Tom Rini (TR1265)
 http://gate.crashing.org/~trini/

Location:

i2c/trunk

Files:

• CHANGES (modified) (1 diff)
• kernel/i2c-algo-8xx.c (modified) (8 diffs)
• kernel/i2c-algo-8xx.h (modified) (1 diff)
• kernel/i2c-rpx.c (modified) (6 diffs)

i2c/trunk/CHANGES

@@ -21 +21 @@
   i2c.h: Add defines for SMBus 2.0
   i2c-core.c: Beginnings of PEC; change back to 'old' CONFIG names
-  i2c-algo-8xx.[ch]: Add GPL
+  i2c-algo-8xx.[ch]: Compile updates, Add GPL
   i2c-id.h: Add driver ID for Savage 4, smbus-arp, smbus-alert, DS1307,
             SA-1110.
   i2c-proc.c: Check kmalloc() return code (sync with kernel 2.4.18)
+  i2c-rpx.c: Compile updates
   mkpatch: Change back to 'old' CONFIG names
   Makefiles: For 2.4+ kernels, modules now install in

i2c/trunk/kernel/i2c-algo-8xx.c

@@ -39 +39 @@
 
 #include <asm/mpc8xx.h>
-#include "../../arch/ppc/8xx_io/commproc.h"
+#include <asm/commproc.h>
 
 #include <linux/i2c.h>
@@ -49 +49 @@
 static ushort r_tbase, r_rbase;
 
-int cpm_scan = 0;
+int cpm_scan = 1;
 int cpm_debug = 0;
 
 static void
-cpm_iic_interrupt(void *dev_id)
+cpm_iic_interrupt(void *dev_id, void *regs)
 {
         volatile i2c8xx_t *i2c = (i2c8xx_t *)dev_id;
@@ -170 +170 @@
         iip->iic_rstate = 0;
         iip->iic_rdp = 0;
-        iip->iic_rbptr = 0;
+        iip->iic_rbptr = r_rbase;
         iip->iic_rbc = 0;
         iip->iic_rxtmp = 0;
         iip->iic_tstate = 0;
         iip->iic_tdp = 0;
-        iip->iic_tbptr = 0;
+        iip->iic_tbptr = r_tbase;
         iip->iic_tbc = 0;
         iip->iic_txtmp = 0;
@@ -233 +233 @@
         tb[0] = abyte;          /* Device address byte w/rw flag */
 
-        flush_dcache_range(tb, tb+1);
+        flush_dcache_range((unsigned long) tb, (unsigned long) (tb+1));
 
         if (cpm_debug) printk("cpm_iic_read(abyte=0x%x)\n", abyte);
@@ -247 +247 @@
         rbdf->cbd_sc = BD_SC_EMPTY | BD_SC_WRAP;
 
-        invalidate_dcache_range(buf, buf+count);
+        invalidate_dcache_range((unsigned long) buf, (unsigned long) (buf+count));
 
         /* Chip bug, set enable here */
@@ -288 +288 @@
 
 
-        invalidate_dcache_range(buf, buf+count);
+        invalidate_dcache_range((unsigned long) buf, (unsigned long) (buf+count));
 
         return count;
@@ -314 +314 @@
         *tb = abyte;            /* Device address byte w/rw flag */
 
-        flush_dcache_range(tb, tb+1);
-        flush_dcache_range(buf, buf+count);
+        flush_dcache_range((unsigned long) tb, (unsigned long) (tb+1));
+        flush_dcache_range((unsigned long) buf, (unsigned long) (buf+count));
 
         if (cpm_debug) printk("cpm_iic_write(abyte=0x%x)\n", abyte);
@@ -397 +397 @@
         len = 2;
 
-        flush_dcache_range(tb, tb+1);
+        flush_dcache_range((unsigned long) tb, (unsigned long) (tb+1));
 
         tbdf->cbd_bufaddr = __pa(tb);

i2c/trunk/kernel/i2c-algo-8xx.h

@@ -32 +32 @@
 
         int     (*setisr) (int irq,
-                           void (*func)(int, void (*)(void *), void *),
+                           void (*func)(void *, void *),
                            void *data);
 

i2c/trunk/kernel/i2c-rpx.c

@@ -7 +7 @@
  *
  * RPX lite specific parts of the i2c interface
+ * Update:  There actually isn't anything RPXLite-specific about this module.
+ * This should work for most any 8xx board.  The console messages have been 
+ * changed to eliminate RPXLite references.
  */
 
@@ -17 +20 @@
 
 #include <asm/mpc8xx.h>
-#include "../../arch/ppc/8xx_io/commproc.h"
+#include <asm/commproc.h>
 
 #include <linux/i2c.h>
@@ -56 +59 @@
 }
 
-static int rpx_install_isr(int irq, void (*func)(void *), void *data)
+static int rpx_install_isr(int irq, void (*func)(void *, void *), void *data)
 {
         /* install interrupt handler */
-        cpm_install_handler(irq, func, data);
+        cpm_install_handler(irq, (void (*)(void *, struct pt_regs *)) func, data);
 
         return 0;
@@ -94 +97 @@
 
 static struct i2c_adapter rpx_ops = {
-        "rpx",
+        "m8xx",
         I2C_HW_MPC8XX_EPON,
         NULL,
@@ -106 +109 @@
 int __init i2c_rpx_init(void)
 {
-        printk("i2c-rpx.o: i2c RPX Lite module version %s (%s)\n", I2C_VERSION, I2C_DATE);
+        printk("i2c-rpx.o: i2c MPC8xx module version %s (%s)\n", I2C_VERSION, I2C_DATE);
 
         /* reset hardware to sane state */
@@ -126 +129 @@
 #ifdef MODULE
 MODULE_AUTHOR("Dan Malek <dmalek@jlc.net>");
-MODULE_DESCRIPTION("I2C-Bus adapter routines for EP RPX Lite");
+MODULE_DESCRIPTION("I2C-Bus adapter routines for MPC8xx boards");
 
 module_init(i2c_rpx_init);