6 files changed, 0 insertions, 213 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 2cd16deb7195..fb51d38e8b46 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -225,14 +225,6 @@ Who:	Len Brown <len.brown@intel.com>
 
 ---------------------------
 
-What:   i2c-ixp2000, i2c-ixp4xx and scx200_i2c drivers
-When:   September 2007
-Why:    Obsolete. The new i2c-gpio driver replaces all hardware-specific
-        I2C-over-GPIO drivers.
-Who:    Jean Delvare <khali@linux-fr.org>
-
----------------------------
-
 What:   'time' kernel boot parameter
 When:   January 2008
 Why:    replaced by 'printk.time=<value>' so that printk timestamps can be
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index c466c6cfc2e5..2cef92a0bd0e 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -259,20 +259,6 @@ config I2C_IOP3XX
           This driver can also be built as a module.  If so, the module
           will be called i2c-iop3xx.
 
-config I2C_IXP4XX
-        tristate "IXP4xx GPIO-Based I2C Interface (DEPRECATED)"
-        depends on ARCH_IXP4XX
-        select I2C_ALGOBIT
-        help
-          Say Y here if you have an Intel IXP4xx(420,421,422,425) based 
-          system and are using GPIO lines for an I2C bus.
-
-          This support is also available as a module. If so, the module
-          will be called i2c-ixp4xx.
-
-          This driver is deprecated and will be dropped soon. Use i2c-gpio
-          instead.
-
 config I2C_IXP2000
         tristate "IXP2000 GPIO-Based I2C Interface (DEPRECATED)"
         depends on ARCH_IXP2000
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
index 81d43c27cf93..ea7068f1eb6b 100644
--- a/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile
@@ -20,7 +20,6 @@ obj-$(CONFIG_I2C_I810)		+= i2c-i810.o
 obj-$(CONFIG_I2C_IBM_IIC)       += i2c-ibm_iic.o
 obj-$(CONFIG_I2C_IOP3XX)        += i2c-iop3xx.o
 obj-$(CONFIG_I2C_IXP2000)       += i2c-ixp2000.o
-obj-$(CONFIG_I2C_IXP4XX)        += i2c-ixp4xx.o
 obj-$(CONFIG_I2C_POWERMAC)      += i2c-powermac.o
 obj-$(CONFIG_I2C_MPC)           += i2c-mpc.o
 obj-$(CONFIG_I2C_MV64XXX)       += i2c-mv64xxx.o
diff --git a/drivers/i2c/busses/i2c-ixp4xx.c b/drivers/i2c/busses/i2c-ixp4xx.c
deleted file mode 100644
index 069ed7f3b395..000000000000
--- a/drivers/i2c/busses/i2c-ixp4xx.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * drivers/i2c/busses/i2c-ixp4xx.c
- *
- * Intel's IXP4xx XScale NPU chipsets (IXP420, 421, 422, 425) do not have
- * an on board I2C controller but provide 16 GPIO pins that are often
- * used to create an I2C bus. This driver provides an i2c_adapter 
- * interface that plugs in under algo_bit and drives the GPIO pins
- * as instructed by the alogorithm driver.
- *
- * Author: Deepak Saxena <dsaxena@plexity.net>
- *
- * Copyright (c) 2003-2004 MontaVista Software Inc.
- *
- * This file is licensed under the terms of the GNU General Public 
- * License version 2. This program is licensed "as is" without any 
- * warranty of any kind, whether express or implied.
- *
- * NOTE: Since different platforms will use different GPIO pins for
- *       I2C, this driver uses an IXP4xx-specific platform_data
- *       pointer to pass the GPIO numbers to the driver. This 
- *       allows us to support all the different IXP4xx platforms
- *       w/o having to put #ifdefs in this driver.
- *
- *       See arch/arm/mach-ixp4xx/ixdp425.c for an example of building a 
- *       device list and filling in the ixp4xx_i2c_pins data structure 
- *       that is passed as the platform_data to this driver.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/module.h>
-#include <linux/i2c.h>
-#include <linux/i2c-algo-bit.h>
-
-#include <asm/hardware.h>       /* Pick up IXP4xx-specific bits */
-
-static inline int ixp4xx_scl_pin(void *data)
-{
-        return ((struct ixp4xx_i2c_pins*)data)->scl_pin;
-}
-
-static inline int ixp4xx_sda_pin(void *data)
-{
-        return ((struct ixp4xx_i2c_pins*)data)->sda_pin;
-}
-
-static void ixp4xx_bit_setscl(void *data, int val)
-{
-        gpio_line_set(ixp4xx_scl_pin(data), 0);
-        gpio_line_config(ixp4xx_scl_pin(data),
-                val ? IXP4XX_GPIO_IN : IXP4XX_GPIO_OUT );
-}
-
-static void ixp4xx_bit_setsda(void *data, int val)
-{
-        gpio_line_set(ixp4xx_sda_pin(data), 0);
-        gpio_line_config(ixp4xx_sda_pin(data),
-                val ? IXP4XX_GPIO_IN : IXP4XX_GPIO_OUT );
-}
-
-static int ixp4xx_bit_getscl(void *data)
-{
-        int scl;
-
-        gpio_line_config(ixp4xx_scl_pin(data), IXP4XX_GPIO_IN );
-        gpio_line_get(ixp4xx_scl_pin(data), &scl);
-
-        return scl;
-}       
-
-static int ixp4xx_bit_getsda(void *data)
-{
-        int sda;
-
-        gpio_line_config(ixp4xx_sda_pin(data), IXP4XX_GPIO_IN );
-        gpio_line_get(ixp4xx_sda_pin(data), &sda);
-
-        return sda;
-}       
-
-struct ixp4xx_i2c_data {
-        struct ixp4xx_i2c_pins *gpio_pins;
-        struct i2c_adapter adapter;
-        struct i2c_algo_bit_data algo_data;
-};
-
-static int ixp4xx_i2c_remove(struct platform_device *plat_dev)
-{
-        struct ixp4xx_i2c_data *drv_data = platform_get_drvdata(plat_dev);
-
-        platform_set_drvdata(plat_dev, NULL);
-
-        i2c_del_adapter(&drv_data->adapter);
-
-        kfree(drv_data);
-
-        return 0;
-}
-
-static int ixp4xx_i2c_probe(struct platform_device *plat_dev)
-{
-        int err;
-        struct ixp4xx_i2c_pins *gpio = plat_dev->dev.platform_data;
-        struct ixp4xx_i2c_data *drv_data = 
-                kzalloc(sizeof(struct ixp4xx_i2c_data), GFP_KERNEL);
-
-        if(!drv_data)
-                return -ENOMEM;
-
-        drv_data->gpio_pins = gpio;
-
-        /*
-         * We could make a lot of these structures static, but
-         * certain platforms may have multiple GPIO-based I2C
-         * buses for various device domains, so we need per-device
-         * algo_data->data. 
-         */
-        drv_data->algo_data.data = gpio;
-        drv_data->algo_data.setsda = ixp4xx_bit_setsda;
-        drv_data->algo_data.setscl = ixp4xx_bit_setscl;
-        drv_data->algo_data.getsda = ixp4xx_bit_getsda;
-        drv_data->algo_data.getscl = ixp4xx_bit_getscl;
-        drv_data->algo_data.udelay = 10;
-        drv_data->algo_data.timeout = 100;
-
-        drv_data->adapter.id = I2C_HW_B_IXP4XX;
-        drv_data->adapter.class = I2C_CLASS_HWMON;
-        strlcpy(drv_data->adapter.name, plat_dev->dev.driver->name,
-                sizeof(drv_data->adapter.name));
-        drv_data->adapter.algo_data = &drv_data->algo_data;
-
-        drv_data->adapter.dev.parent = &plat_dev->dev;
-
-        gpio_line_config(gpio->scl_pin, IXP4XX_GPIO_IN);
-        gpio_line_config(gpio->sda_pin, IXP4XX_GPIO_IN);
-        gpio_line_set(gpio->scl_pin, 0);
-        gpio_line_set(gpio->sda_pin, 0);
-
-        err = i2c_bit_add_bus(&drv_data->adapter);
-        if (err) {
-                printk(KERN_ERR "ERROR: Could not install %s\n", plat_dev->dev.bus_id);
-
-                kfree(drv_data);
-                return err;
-        }
-
-        platform_set_drvdata(plat_dev, drv_data);
-
-        return 0;
-}
-
-static struct platform_driver ixp4xx_i2c_driver = {
-        .probe          = ixp4xx_i2c_probe,
-        .remove         = ixp4xx_i2c_remove,
-        .driver         = {
-                .name   = "IXP4XX-I2C",
-                .owner  = THIS_MODULE,
-        },
-};
-
-static int __init ixp4xx_i2c_init(void)
-{
-        return platform_driver_register(&ixp4xx_i2c_driver);
-}
-
-static void __exit ixp4xx_i2c_exit(void)
-{
-        platform_driver_unregister(&ixp4xx_i2c_driver);
-}
-
-module_init(ixp4xx_i2c_init);
-module_exit(ixp4xx_i2c_exit);
-
-MODULE_DESCRIPTION("GPIO-based I2C adapter for IXP4xx systems");
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Deepak Saxena <dsaxena@plexity.net>");
-
diff --git a/include/asm-arm/arch-ixp4xx/platform.h b/include/asm-arm/arch-ixp4xx/platform.h
index 2a44d3d67980..2ce28e3fd325 100644
--- a/include/asm-arm/arch-ixp4xx/platform.h
+++ b/include/asm-arm/arch-ixp4xx/platform.h
@@ -76,17 +76,6 @@ extern unsigned long ixp4xx_exp_bus_size;
 #define IXP4XX_UART_XTAL                14745600
 
 /*
- * The IXP4xx chips do not have an I2C unit, so GPIO lines are just
- * used to 
- * Used as platform_data to provide GPIO pin information to the ixp42x
- * I2C driver.
- */
-struct ixp4xx_i2c_pins {
-        unsigned long sda_pin;
-        unsigned long scl_pin;
-};
-
-/*
  * This structure provide a means for the board setup code
  * to give information to th pata_ixp4xx driver. It is
  * passed as platform_data.
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index 10c8edd7795c..6bab140a4505 100644
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -191,7 +191,6 @@
 #define I2C_HW_B_OMAHA          0x010014 /* Omaha I2C interface (ARM) */
 #define I2C_HW_B_GUIDE          0x010015 /* Guide bit-basher */
 #define I2C_HW_B_IXP2000        0x010016 /* GPIO on IXP2000 systems */
-#define I2C_HW_B_IXP4XX         0x010017 /* GPIO on IXP4XX systems */
 #define I2C_HW_B_S3VIA          0x010018 /* S3Via ProSavage adapter */
 #define I2C_HW_B_ZR36067        0x010019 /* Zoran-36057/36067 based boards */
 #define I2C_HW_B_PCILYNX        0x01001a /* TI PCILynx I2C adapter */