Changeset 3694

Timestamp:

09/09/02 02:41:18 (11 years ago)

Author:

mds

Message:

(mds)

add i2c-algo-8xx.[ch], i2c-adap-ibm_ocp.c,
i2c-algo-ibm_ocp.[ch], i2c-frodo, i2c-rpx to mkpatch.

These already went in kernel 2.5.32 in Albert's patch.

Location:

i2c/trunk

Files:

• CHANGES (modified) (2 diffs)
• mkpatch/Config.in (modified) (4 diffs)
• mkpatch/FILES (modified) (1 diff)
• mkpatch/INCLUDES (modified) (1 diff)
• mkpatch/mkpatch.pl (modified) (7 diffs)

i2c/trunk/CHANGES

@@ -19 +19 @@
 
 2.6.5 (2002????)
-  mkpatch: Remove i2c-algo-8xx.o target causing kernel to not compile;
-           add doc/i2c-old-porting, i2c-algo-8xx.[ch]
+  mkpatch: Fix i2c-algo-8xx.o target causing kernel to not compile;
+           add doc/i2c-old-porting, i2c-algo-8xx.[ch], i2c-adap-ibm_ocp.c,
+           i2c-algo-ibm_ocp.[ch], i2c-frodo, i2c-rpx
   i2c-core.c: Remove buffer size limit in i2cproc_bus_read()
   i2c-adap-ibm_ocp.c ,i2c-elektor.c ,i2c-pcf-epp.c : Replaced depreciated cli()
@@ -34 +35 @@
   i2c-id.h: Add driver IDs for MPC824X, SIS630, SIS645
 
-2.6.4 (20020719)
+2.6.4 (20020719)        (in kernel 2.5.32)
   doc/i2c-old-porting: New
   i2c.h: Add defines for SMBus 2.0

i2c/trunk/mkpatch/Config.in

@@ -14 +14 @@
       dep_tristate '  ELV adapter' CONFIG_I2C_ELV $CONFIG_I2C_ALGOBIT
       dep_tristate '  Velleman K9000 adapter' CONFIG_I2C_VELLEMAN $CONFIG_I2C_ALGOBIT
+      if [ "$CONFIG_ARCH_SA1100" = "y" ]; then
+         dep_tristate 'SA1100 I2C Adapter' CONFIG_I2C_FRODO $CONFIG_I2C_ALGOBIT
+      fi
    fi
 
@@ -21 +24 @@
    fi
 
+   if [ "$CONFIG_MIPS_ITE8172" = "y" ]; then
+      dep_tristate 'ITE I2C Algorithm' CONFIG_ITE_I2C_ALGO $CONFIG_I2C
+      if [ "$CONFIG_ITE_I2C_ALGO" != "n" ]; then
+         dep_tristate '  ITE I2C Adapter' CONFIG_ITE_I2C_ADAP $CONFIG_ITE_I2C_ALGO
+      fi
+   fi
    if [ "$CONFIG_8xx" = "y" ]; then
       dep_tristate 'MPC8xx CPM I2C interface' CONFIG_I2C_ALGO8XX $CONFIG_I2C
@@ -27 +36 @@
       fi
    fi
-
    if [ "$CONFIG_IBM_OCP" = "y" ]; then
       dep_tristate 'IBM on-chip I2C Algorithm' CONFIG_I2C_IBM_OCP_ALGO $CONFIG_I2C
@@ -35 +43 @@
    fi
 
-
 # This is needed for automatic patch generation: sensors code starts here
 # This is needed for automatic patch generation: sensors code ends here
 
    dep_tristate 'I2C device interface' CONFIG_I2C_CHARDEV $CONFIG_I2C
-
    dep_tristate 'I2C /proc interface (required for hardware sensors)' CONFIG_I2C_PROC $CONFIG_I2C $CONFIG_SYSCTL
 

i2c/trunk/mkpatch/FILES

@@ +1 @@
+kernel/i2c-adap-ibm_ocp.c       drivers/i2c/i2c-adap-ibm_ocp.c
+kernel/i2c-algo-8xx.c           drivers/i2c/i2c-algo-8xx.c
+kernel/i2c-algo-bit.c           drivers/i2c/i2c-algo-bit.c
+kernel/i2c-algo-ibm_ocp.c       drivers/i2c/i2c-algo-ibm_ocp.c
+kernel/i2c-algo-pcf.c           drivers/i2c/i2c-algo-pcf.c
 kernel/i2c-core.c               drivers/i2c/i2c-core.c
 kernel/i2c-dev.c                drivers/i2c/i2c-dev.c
-kernel/i2c-algo-bit.c           drivers/i2c/i2c-algo-bit.c
-kernel/i2c-algo-pcf.c           drivers/i2c/i2c-algo-pcf.c
 kernel/i2c-elektor.c            drivers/i2c/i2c-elektor.c
 kernel/i2c-elv.c                drivers/i2c/i2c-elv.c
+kernel/i2c-frodo.c              drivers/i2c/i2c-frodo.c
 kernel/i2c-philips-par.c        drivers/i2c/i2c-philips-par.c
+kernel/i2c-proc.c               drivers/i2c/i2c-proc.c
+kernel/i2c-rpx.c                drivers/i2c/i2c-rpx.c
 kernel/i2c-velleman.c           drivers/i2c/i2c-velleman.c
-kernel/i2c-proc.c               drivers/i2c/i2c-proc.c
-kernel/i2c-pcf8584.h            drivers/i2c/i2c-pcf8584.h
-kernel/i2c-adap-ibm_ocp.c       drivers/i2c/i2c-adap-ibm_ocp.c
-kernel/i2c-algo-ibm_ocp.c       drivers/i2c/i2c-algo-ibm_ocp.c
-kernel/i2c-algo-8xx.c           drivers/i2c/i2c-algo-8xx.c
 kernel/i2c.h                    include/linux/i2c.h
 kernel/i2c-dev.h                include/linux/i2c-dev.h
+kernel/i2c-algo-8xx.h           include/linux/i2c-algo-8xx.h
 kernel/i2c-algo-bit.h           include/linux/i2c-algo-bit.h
+kernel/i2c-algo-ibm_ocp.h       include/linux/i2c-algo-ibm_ocp.h
 kernel/i2c-algo-pcf.h           include/linux/i2c-algo-pcf.h
 kernel/i2c-elektor.h            include/linux/i2c-elektor.h
 kernel/i2c-id.h                 include/linux/i2c-id.h
+kernel/i2c-pcf8584.h            drivers/i2c/i2c-pcf8584.h
 kernel/i2c-proc.h               include/linux/i2c-proc.h
-kernel/i2c-algo-ibm_ocp.h       include/linux/i2c-algo-ibm_ocp.h
-kernel/i2c-algo-8xx.h           include/linux/i2c-algo-8xx.h
 mkpatch/Config.in               drivers/i2c/Config.in
 doc/dev-interface               Documentation/i2c/dev-interface

i2c/trunk/mkpatch/INCLUDES

@@ -6 +6 @@
 "i2c-id.h"              <linux/i2c-id.h>
 "i2c-proc.h"            <linux/i2c-proc.h>
+"i2c-algo-8xx.h"        <linux/i2c-algo-8xx.h>
+"i2c-algo-ibm_ocp.h"    <linux/i2c-algo-ibm_ocp.h>

i2c/trunk/mkpatch/mkpatch.pl

@@ -255 +255 @@
   The module will be called i2c-elektor.o.
 
+Motorola 8xx I2C algorithm
+CONFIG_I2C_ALGO8XX
+  This is the algorithm that allows you to use Motorola 8xx I2C adapters.
+
+  This driver is also available as a module.  If you want to compile
+  it as a module, say M here and read
+  <file:Documentation/modules.txt>.
+  The module will be called i2c-algo-8xx.o.
+
+Motorola 8xx I2C interface
+CONFIG_I2C_RPXLITE
+  This supports the Motorola 8xx I2C device.
+
+  This driver is also available as a module.  If you want to compile
+  it as a module, say M here and read
+  <file:Documentation/modules.txt>.
+  The module will be called i2c-rpx.o.
+
+IBM 405 I2C algorithm
+CONFIG_I2C_IBM_OCP_ALGO
+  This is the algorithm that allows you to use IBM 405 I2C adapters.
+
+  This driver is also available as a module.  If you want to compile
+  it as a module, say M here and read
+  <file:Documentation/modules.txt>.
+  The module will be called i2c-algo-ibm_ocp.o.
+
+IBM 405 I2C interface
+CONFIG_I2C_IBM_OCP_ADAP
+  This supports the IBM 405 I2C device.
+
+  This driver is also available as a module.  If you want to compile
+  it as a module, say M here and read
+  <file:Documentation/modules.txt>.
+  The module will be called i2c-adap-ibm_ocp.o.
+
+StrongARM SA-1110 interface
+CONFIG_I2C_FRODO
+  This supports the StrongARM SA-1110 Development Board.
+
+  This driver is also available as a module.  If you want to compile
+  it as a module, say M here and read
+  <file:Documentation/modules.txt>.
+  The module will be called i2c-frodo.o.
+
 I2C device interface
 CONFIG_I2C_CHARDEV
@@ -343 +388 @@
   close INPUT;
   close OUTPUT;
-  die "Automatic patch generation for `Makefile' failed.\n".
+  die "Automatic patch generation for main `Makefile' failed.\n".
       "See our home page http://www.lm-sensors.nu for assistance!" if $printed == 0;
   print_diff $package_root,$kernel_root,$kernel_file,$package_file;
@@ -397 +442 @@
       redo MAIN;
     }
+# 2.5 kernels
+#   if (m@^obj.*CONFIG_I2C@) {
+#   }
     if (not $printed and
         (m@^include \$\(TOPDIR\)/Rules.make$@ or
@@ -425 +473 @@
   close INPUT;
   close OUTPUT;
-  die "Automatic patch generation for `Makefile' failed.\n".
+  die "Automatic patch generation for `drivers/Makefile' failed.\n".
       "See our home page http://www.lm-sensors.nu for assistance!" if $printed == 0 or $added == 0;
   print_diff $package_root,$kernel_root,$kernel_file,$package_file;
@@ -452 +500 @@
 }
 
+# This generates diffs for drivers/i2c/Makefile
+# for either 'old style' or 'new style'.
+# Don't bother putting in 'old style' support for new architectures
+# like 8xx, IBM405, or StrongARM since they aren't supported
+# in old kernels anyway.
 sub gen_drivers_i2c_Makefile
 {
@@ -473 +526 @@
 O_TARGET := i2c.o
 
-export-objs     := i2c-core.o i2c-algo-bit.o i2c-algo-pcf.o i2c-proc.o
+export-objs     := i2c-core.o i2c-algo-bit.o i2c-algo-pcf.o \
+                   i2c-algo-8xx.o i2c-rpx.o i2c-proc.o \
+                   i2c-algo-ibm_ocp.o i2c-adap-ibm_ocp.o
 
 obj-$(CONFIG_I2C)               += i2c-core.o
@@ -484 +539 @@
 obj-$(CONFIG_I2C_ELEKTOR)       += i2c-elektor.o
 obj-$(CONFIG_I2C_PROC)          += i2c-proc.o
+obj-$(CONFIG_I2C_ALGO8XX)       += i2c-algo-8xx.o
+obj-$(CONFIG_I2C_RPXLITE)       += i2c-rpx.o
+obj-$(CONFIG_I2C_IBM_OCP_ALGO)  += i2c-algo-ibm_ocp.o
+obj-$(CONFIG_I2C_IBM_OCP_ADAP)  += i2c-adap-ibm_ocp.o
+obj-$(CONFIG_I2C_FRODO)         += i2c-frodo.o
 
 # This is needed for automatic patch generation: sensors code starts here