remove gpio_expander_omap

Now that H3 is converted to use GPIO calls, get rid of the
legacy gpio_expander_omap code ... it has no more users.

One more needless divergence from mainline gone!

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index 79f0b1f8497be84a210e7330b4a87843c5eb14c1..72220db5f091a40d18fa3e262f4095d950ce2dd9 100644 (file)
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -38,7 +38,6 @@ config MACH_OMAP_H2
 config MACH_OMAP_H3
        bool "TI H3 Support"
        depends on ARCH_OMAP1 && ARCH_OMAP16XX
 config MACH_OMAP_H3
        bool "TI H3 Support"
        depends on ARCH_OMAP1 && ARCH_OMAP16XX

-#      select GPIOEXPANDER_OMAP

        help
          TI OMAP 1710 H3 board support. Say Y here if you have such
          a board.
        help
          TI OMAP 1710 H3 board support. Say Y here if you have such
          a board.

diff --git a/arch/arm/plat-omap/include/mach/gpioexpander.h b/arch/arm/plat-omap/include/mach/gpioexpander.h
deleted file mode 100644 (file)
index 90444a0..0000000
--- a/arch/arm/plat-omap/include/mach/gpioexpander.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * arch/arm/plat-omap/include/mach/gpioexpander.h
- *
- *
- * Copyright (C) 2004 Texas Instruments, Inc.
- *
- * This package is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#ifndef __ASM_ARCH_OMAP_GPIOEXPANDER_H
-#define __ASM_ARCH_OMAP_GPIOEXPANDER_H
-
-/* Function Prototypes for GPIO Expander functions */
-
-#ifdef CONFIG_GPIOEXPANDER_OMAP
-int read_gpio_expa(u8 *, int);
-int write_gpio_expa(u8 , int);
-#else
-static inline int read_gpio_expa(u8 *val, int addr)
-{
-       return 0;
-}
-static inline int write_gpio_expa(u8 val, int addr)
-{
-       return 0;
-}
-#endif
-
-#endif /* __ASM_ARCH_OMAP_GPIOEXPANDER_H */

diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index 4c73bb528e51d5f39c75fe8f88e78227cfdb5d19..d61589b238896e4e8db67d54cb080e19ccaa03f5 100644 (file)
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -146,13 +146,6 @@ config SENSORS_TLV320AIC23
          If you say yes here you get support for the I2C control
          interface for Texas Instruments TLV320AIC23 audio codec.
 
          If you say yes here you get support for the I2C control
          interface for Texas Instruments TLV320AIC23 audio codec.
 

-config GPIOEXPANDER_OMAP
-       bool "GPIO Expander PCF8574PWR for OMAP"
-       depends on I2C && MACH_OMAP_H3
-       help
-         If you say yes here you get support for I/O expander calls
-         to configure IrDA, Camera and audio devices.
-

 config TWL4030_MADC
        tristate "TWL4030 MADC Driver"
        depends on TWL4030_CORE
 config TWL4030_MADC
        tristate "TWL4030 MADC Driver"
        depends on TWL4030_CORE

diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
index cb9f2bba285ee08a3ff5cbaed933fb3220668f1d..d82019c0ada5c7256a063f9afde9aa2c1418f686 100644 (file)
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@ -21,7 +21,6 @@ obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o
 obj-$(CONFIG_ISP1301_OMAP)     += isp1301_omap.o
 obj-$(CONFIG_TPS65010)         += tps65010.o
 obj-$(CONFIG_SENSORS_TLV320AIC23) += tlv320aic23.o
 obj-$(CONFIG_ISP1301_OMAP)     += isp1301_omap.o
 obj-$(CONFIG_TPS65010)         += tps65010.o
 obj-$(CONFIG_SENSORS_TLV320AIC23) += tlv320aic23.o

-obj-$(CONFIG_GPIOEXPANDER_OMAP)        += gpio_expander_omap.o

 obj-$(CONFIG_MENELAUS)         += menelaus.o
 obj-$(CONFIG_SENSORS_TSL2550)  += tsl2550.o
 obj-$(CONFIG_MCU_MPC8349EMITX) += mcu_mpc8349emitx.o
 obj-$(CONFIG_MENELAUS)         += menelaus.o
 obj-$(CONFIG_SENSORS_TSL2550)  += tsl2550.o
 obj-$(CONFIG_MCU_MPC8349EMITX) += mcu_mpc8349emitx.o

diff --git a/drivers/i2c/chips/gpio_expander_omap.c b/drivers/i2c/chips/gpio_expander_omap.c
deleted file mode 100644 (file)
index dfe7f04..0000000
--- a/drivers/i2c/chips/gpio_expander_omap.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * drivers/i2c/chips/gpio_expander_omap.c
- *
- * Copyright (C) 2004 Texas Instruments Inc
- * Author:
- *
- * gpio expander is used to configure IrDA, camera and audio devices on omap 1710 processor.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
-
-#include <linux/types.h>
-#include <linux/i2c.h>
-#include <linux/errno.h>
-
-int read_gpio_expa(u8 * val, int addr);
-int write_gpio_expa(u8 val, int addr);
-
-int write_gpio_expa(u8 val, int addr)
-{
-       struct i2c_adapter *adap;
-       int err;
-       struct i2c_msg msg[1];
-       unsigned char data[1];
-
-       adap = i2c_get_adapter(1);
-       if (!adap)
-               return -ENODEV;
-       msg->addr = addr;       /* I2C address of GPIO EXPA */
-       msg->flags = 0;
-       msg->len = 1;
-       msg->buf = data;
-       data[0] = val;
-       err = i2c_transfer(adap, msg, 1);
-       if (err >= 0)
-               return 0;
-       return err;
-}
-
-/* Read from I/O EXPANDER on the H3 board.
- * The IO expanders need an independent I2C client driver.
- */
-
-int read_gpio_expa(u8 * val, int addr)
-{
-       struct i2c_adapter *adap;
-       int err;
-       struct i2c_msg msg[1];
-       unsigned char data[1];
-
-       adap = i2c_get_adapter(1);
-       if (!adap)
-               return -ENODEV;
-       msg->addr = addr;       /* I2C address of GPIO EXPA */
-       msg->flags = I2C_M_RD;
-       msg->len = 2;
-       msg->buf = data;
-       err = i2c_transfer(adap, msg, 1);
-       *val = data[0];
-
-       if (err >= 0)
-               return 0;
-       return err;
-}
-
-EXPORT_SYMBOL(read_gpio_expa);
-EXPORT_SYMBOL(write_gpio_expa);
-