5 files changed, 0 insertions, 113 deletions

diff --git a/Documentation/i2c/summary b/Documentation/i2c/summary
index aea60bf7e8f0..003c7319b8c7 100644
--- a/Documentation/i2c/summary
+++ b/Documentation/i2c/summary
@@ -67,7 +67,6 @@ i2c-proc: The /proc/sys/dev/sensors interface for device (client) drivers
 Algorithm drivers
 -----------------
 
-i2c-algo-8xx:    An algorithm for CPM's I2C device in Motorola 8xx processors (NOT BUILT BY DEFAULT)
 i2c-algo-bit:    A bit-banging algorithm
 i2c-algo-pcf:    A PCF 8584 style algorithm
 i2c-algo-ibm_ocp: An algorithm for the I2C device in IBM 4xx processors (NOT BUILT BY DEFAULT)
@@ -81,6 +80,5 @@ i2c-pcf-epp:     PCF8584 on a EPP parallel port (uses i2c-algo-pcf) (NOT mkpatch
 i2c-philips-par: Philips style parallel port adapter (uses i2c-algo-bit)
 i2c-adap-ibm_ocp: IBM 4xx processor I2C device (uses i2c-algo-ibm_ocp) (NOT BUILT BY DEFAULT)
 i2c-pport:       Primitive parallel port adapter (uses i2c-algo-bit)
-i2c-rpx:         RPX board Motorola 8xx I2C device (uses i2c-algo-8xx) (NOT BUILT BY DEFAULT)
 i2c-velleman:    Velleman K8000 parallel port adapter (uses i2c-algo-bit)
 
diff --git a/drivers/i2c/algos/Kconfig b/drivers/i2c/algos/Kconfig
index 58899078810b..014dfa575be7 100644
--- a/drivers/i2c/algos/Kconfig
+++ b/drivers/i2c/algos/Kconfig
@@ -34,10 +34,6 @@ config I2C_ALGOPCA
           This support is also available as a module.  If so, the module 
           will be called i2c-algo-pca.
 
-config I2C_ALGO8XX
-        tristate "MPC8xx CPM I2C interface"
-        depends on 8xx
-
 config I2C_ALGO_SGI
         tristate "I2C SGI interfaces"
         depends on SGI_IP22 || SGI_IP32 || X86_VISWS
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index c477dcfad4e7..fcde9bab5b96 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -391,11 +391,6 @@ config I2C_PROSAVAGE
           This support is also available as a module.  If so, the module 
           will be called i2c-prosavage.
 
-config I2C_RPXLITE
-        tristate "Embedded Planet RPX Lite/Classic support"
-        depends on RPXLITE || RPXCLASSIC
-        select I2C_ALGO8XX
-
 config I2C_S3C2410
         tristate "S3C2410 I2C Driver"
         depends on ARCH_S3C2410
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
index d7bbb90056a8..a6db4e38bda8 100644
--- a/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile
@@ -36,7 +36,6 @@ obj-$(CONFIG_I2C_PMCMSP)	+= i2c-pmcmsp.o
 obj-$(CONFIG_I2C_PNX)           += i2c-pnx.o
 obj-$(CONFIG_I2C_PROSAVAGE)     += i2c-prosavage.o
 obj-$(CONFIG_I2C_PXA)           += i2c-pxa.o
-obj-$(CONFIG_I2C_RPXLITE)       += i2c-rpx.o
 obj-$(CONFIG_I2C_S3C2410)       += i2c-s3c2410.o
 obj-$(CONFIG_I2C_SAVAGE4)       += i2c-savage4.o
 obj-$(CONFIG_I2C_SIBYTE)        += i2c-sibyte.o
diff --git a/drivers/i2c/busses/i2c-rpx.c b/drivers/i2c/busses/i2c-rpx.c
deleted file mode 100644
index 8764df06f51d..000000000000
--- a/drivers/i2c/busses/i2c-rpx.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Embedded Planet RPX Lite MPC8xx CPM I2C interface.
- * Copyright (c) 1999 Dan Malek (dmalek@jlc.net).
- *
- * moved into proper i2c interface;
- * Brad Parker (brad@heeltoe.com)
- *
- * 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.
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/stddef.h>
-#include <linux/i2c.h>
-#include <linux/i2c-algo-8xx.h>
-#include <asm/mpc8xx.h>
-#include <asm/commproc.h>
-
-
-static void
-rpx_iic_init(struct i2c_algo_8xx_data *data)
-{
-        volatile cpm8xx_t *cp;
-        volatile immap_t *immap;
-
-        cp = cpmp;      /* Get pointer to Communication Processor */
-        immap = (immap_t *)IMAP_ADDR;   /* and to internal registers */
-
-        data->iip = (iic_t *)&cp->cp_dparam[PROFF_IIC];
-
-        /* Check for and use a microcode relocation patch.
-        */
-        if ((data->reloc = data->iip->iic_rpbase))
-                data->iip = (iic_t *)&cp->cp_dpmem[data->iip->iic_rpbase];
-                
-        data->i2c = (i2c8xx_t *)&(immap->im_i2c);
-        data->cp = cp;
-
-        /* Initialize Port B IIC pins.
-        */
-        cp->cp_pbpar |= 0x00000030;
-        cp->cp_pbdir |= 0x00000030;
-        cp->cp_pbodr |= 0x00000030;
-
-        /* Allocate space for two transmit and two receive buffer
-         * descriptors in the DP ram.
-         */
-        data->dp_addr = cpm_dpalloc(sizeof(cbd_t) * 4, 8);
-                
-        /* ptr to i2c area */
-        data->i2c = (i2c8xx_t *)&(((immap_t *)IMAP_ADDR)->im_i2c);
-}
-
-static int rpx_install_isr(int irq, void (*func)(void *), void *data)
-{
-        /* install interrupt handler */
-        cpm_install_handler(irq, func, data);
-
-        return 0;
-}
-
-static struct i2c_algo_8xx_data rpx_data = {
-        .setisr = rpx_install_isr
-};
-
-static struct i2c_adapter rpx_ops = {
-        .owner          = THIS_MODULE,
-        .name           = "m8xx",
-        .id             = I2C_HW_MPC8XX_EPON,
-        .algo_data      = &rpx_data,
-};
-
-int __init i2c_rpx_init(void)
-{
-        printk(KERN_INFO "i2c-rpx: i2c MPC8xx driver\n");
-
-        /* reset hardware to sane state */
-        rpx_iic_init(&rpx_data);
-
-        if (i2c_8xx_add_bus(&rpx_ops) < 0) {
-                printk(KERN_ERR "i2c-rpx: Unable to register with I2C\n");
-                return -ENODEV;
-        }
-
-        return 0;
-}
-
-void __exit i2c_rpx_exit(void)
-{
-        i2c_8xx_del_bus(&rpx_ops);
-}
-
-MODULE_AUTHOR("Dan Malek <dmalek@jlc.net>");
-MODULE_DESCRIPTION("I2C-Bus adapter routines for MPC8xx boards");
-
-module_init(i2c_rpx_init);
-module_exit(i2c_rpx_exit);