Modified: trunk/drivers/i2c/busses/Kconfig (4066 => 4067)
--- trunk/drivers/i2c/busses/Kconfig 2007-12-26 07:14:47 UTC (rev 4066)
+++ trunk/drivers/i2c/busses/Kconfig 2007-12-26 07:18:00 UTC (rev 4067)
@@ -90,39 +90,6 @@
This driver can also be built as a module. If so, the module
will be called i2c-au1550.
-config I2C_BLACKFIN_GPIO
- tristate "Blackfin GPIO based I2C interface"
- depends on I2C && BLACKFIN && EXPERIMENTAL
- select I2C_ALGOBIT
- help
- Say Y here if you have an Blackfin BF5xx based
- system and are using GPIO lines for an I2C bus.
-
-menu "Blackfin I2C SDA/SCL Selection"
- depends on I2C_BLACKFIN_GPIO
-config I2C_BLACKFIN_GPIO_SDA
- int "SDA GPIO pin number"
- range 0 15 if (BF533 || BF532 || BF531)
- range 0 47 if (BF534 || BF536 || BF537)
- range 0 47 if BF561
- default 2 if !BF561
- default 1 if BF561
-
-config I2C_BLACKFIN_GPIO_SCL
- int "SCL GPIO pin number"
- range 0 15 if (BF533 || BF532 || BF531)
- range 0 47 if (BF534 || BF536 || BF537)
- range 0 47 if BF561
- default 3 if !BF561
- default 0 if BF561
-endmenu
-
-config I2C_BLACKFIN_GPIO_CYCLE_DELAY
- int "Cycle Delay in uSec"
- depends on I2C_BLACKFIN_GPIO
- range 5 100
- default 40
-
config I2C_BLACKFIN_TWI
tristate "Blackfin TWI I2C support"
depends on I2C && (BF534 || BF536 || BF537 || BF54x || BF522 || BF525 || BF527)
Modified: trunk/drivers/i2c/busses/Makefile (4066 => 4067)
--- trunk/drivers/i2c/busses/Makefile 2007-12-26 07:14:47 UTC (rev 4066)
+++ trunk/drivers/i2c/busses/Makefile 2007-12-26 07:18:00 UTC (rev 4067)
@@ -11,7 +11,6 @@
obj-$(CONFIG_I2C_AT91) += i2c-at91.o
obj-$(CONFIG_I2C_AU1550) += i2c-au1550.o
obj-$(CONFIG_I2C_BLACKFIN_TWI) += i2c-bfin-twi.o
-obj-$(CONFIG_I2C_BLACKFIN_GPIO) += i2c-bfin-gpio.o
obj-$(CONFIG_I2C_ELEKTOR) += i2c-elektor.o
obj-$(CONFIG_I2C_GPIO) += i2c-gpio.o
obj-$(CONFIG_I2C_HYDRA) += i2c-hydra.o
Deleted: trunk/drivers/i2c/busses/i2c-bfin-gpio.c (4066 => 4067)
--- trunk/drivers/i2c/busses/i2c-bfin-gpio.c 2007-12-26 07:14:47 UTC (rev 4066)
+++ trunk/drivers/i2c/busses/i2c-bfin-gpio.c 2007-12-26 07:18:00 UTC (rev 4067)
@@ -1,126 +0,0 @@
-/*
- * File: drivers/i2c/busses/i2c-bfin-gpio.c
- * Based on:
- * Author: Meihui Fan <[EMAIL PROTECTED]>
- * Michael Hennerich ([EMAIL PROTECTED])
- *
- * Created:
- * Description: I2C Adapter for algo_bit using the GPIO layer
- *
- * Modified: CopyRight (c) 2004 HHTech (www.hhcn.com, www.hhcn.org)
- * Copyright 2005-2007 Analog Devices Inc.
- *
- * Bugs: Enter bugs at http://blackfin.uclinux.org/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see the file COPYING, or write
- * to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/delay.h>
-#include <linux/init.h>
-#include <linux/i2c.h>
-#include <linux/i2c-algo-bit.h>
-
-#include <asm/blackfin.h>
-#include <asm/gpio.h>
-
-#define DRV_NAME "i2c-bfin-gpio"
-
-static void hhbf_setsda(void *data, int state)
-{
- if (state) {
- gpio_direction_input(CONFIG_I2C_BLACKFIN_GPIO_SDA);
- } else {
- gpio_direction_output(CONFIG_I2C_BLACKFIN_GPIO_SDA);
- gpio_set_value(CONFIG_I2C_BLACKFIN_GPIO_SDA, 0);
- }
-}
-
-static void hhbf_setscl(void *data, int state)
-{
- if (state) {
- gpio_direction_input(CONFIG_I2C_BLACKFIN_GPIO_SCL);
- } else {
- gpio_direction_output(CONFIG_I2C_BLACKFIN_GPIO_SCL);
- gpio_set_value(CONFIG_I2C_BLACKFIN_GPIO_SCL, 0);
- }
-}
-
-static int hhbf_getsda(void *data)
-{
- gpio_direction_input(CONFIG_I2C_BLACKFIN_GPIO_SDA);
-
- return gpio_get_value(CONFIG_I2C_BLACKFIN_GPIO_SDA);
-}
-
-static int hhbf_getscl(void *data)
-{
- gpio_direction_input(CONFIG_I2C_BLACKFIN_GPIO_SCL);
-
- return gpio_get_value(CONFIG_I2C_BLACKFIN_GPIO_SCL);
-}
-
-static struct i2c_algo_bit_data bit_hhbf_data = {
- .setsda = hhbf_setsda,
- .setscl = hhbf_setscl,
- .getsda = hhbf_getsda,
- .getscl = hhbf_getscl,
- .udelay = CONFIG_I2C_BLACKFIN_GPIO_CYCLE_DELAY,
- .timeout = HZ
-};
-
-static struct i2c_adapter hhbf_ops = {
- .owner = THIS_MODULE,
- .id = I2C_HW_B_BLACKFIN,
- .algo_data = &bit_hhbf_data,
- .name = "Blackfin GPIO based I2C driver",
-};
-
-static int __init i2c_hhbf_init(void)
-{
-
- if (gpio_request(CONFIG_I2C_BLACKFIN_GPIO_SCL, DRV_NAME)) {
- printk(KERN_ERR DRV_NAME": gpio_request GPIO %d failed \n"
- , CONFIG_I2C_BLACKFIN_GPIO_SCL);
- return -EBUSY;
- }
-
- if (gpio_request(CONFIG_I2C_BLACKFIN_GPIO_SDA, DRV_NAME)) {
- printk(KERN_ERR DRV_NAME": gpio_request GPIO %d failed \n"
- , CONFIG_I2C_BLACKFIN_GPIO_SDA);
- return -EBUSY;
- }
-
- gpio_direction_input(CONFIG_I2C_BLACKFIN_GPIO_SCL);
- gpio_direction_input(CONFIG_I2C_BLACKFIN_GPIO_SDA);
-
- return i2c_bit_add_bus(&hhbf_ops);
-}
-
-static void __exit i2c_hhbf_exit(void)
-{
- gpio_free(CONFIG_I2C_BLACKFIN_GPIO_SCL);
- gpio_free(CONFIG_I2C_BLACKFIN_GPIO_SDA);
- i2c_bit_del_bus(&hhbf_ops);
-}
-
-MODULE_AUTHOR("Meihui Fan <[EMAIL PROTECTED]>");
-MODULE_DESCRIPTION("I2C-Bus adapter routines for Blackfin and HHBF Boards");
-MODULE_LICENSE("GPL");
-
-module_init(i2c_hhbf_init);
-module_exit(i2c_hhbf_exit);
