aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-04-29 17:18:21 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-04-29 17:18:21 +0000
commitf9856c01b4b3457f8a6e51376ba7281f918f9258 (patch)
treee8f4be1dbefe30b74073024baaf8b53b43db8e29 /target/linux/adm5120
parent18d20f6fe78d5c50285ae8aec2d27a90eaf5f89d (diff)
downloadupstream-f9856c01b4b3457f8a6e51376ba7281f918f9258.tar.gz
upstream-f9856c01b4b3457f8a6e51376ba7281f918f9258.tar.bz2
upstream-f9856c01b4b3457f8a6e51376ba7281f918f9258.zip
[package] remove the i2c-gpio-custom driver from adm5120, and make it available on all platforms
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10979 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120')
-rw-r--r--target/linux/adm5120/files/drivers/i2c/busses/i2c-gpio-custom.c197
-rw-r--r--target/linux/adm5120/patches/300-i2c_gpio_custom.patch34
2 files changed, 0 insertions, 231 deletions
diff --git a/target/linux/adm5120/files/drivers/i2c/busses/i2c-gpio-custom.c b/target/linux/adm5120/files/drivers/i2c/busses/i2c-gpio-custom.c
deleted file mode 100644
index 36a8bf0e37..0000000000
--- a/target/linux/adm5120/files/drivers/i2c/busses/i2c-gpio-custom.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Custom GPIO-based I2C driver
- *
- * Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org>
- *
- * 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.
- *
- * ---------------------------------------------------------------------------
- *
- * The behaviour of this driver can be altered by setting some parameters
- * from the insmod command line.
- *
- * The following parameters are adjustable:
- *
- * bus0 These four arguments can be arrays of
- * bus1 1-8 unsigned integers as follows:
- * bus2
- * bus3 <id>,<sda>,<scl>,<udelay>,<timeout>,<sda_od>,<scl_od>,<scl_oo>
- *
- * where:
- *
- * <id> ID to used as device_id for the corresponding bus (required)
- * <sda> GPIO pin ID to used for SDA (required)
- * <scl> GPIO pin ID to used for SCL (required)
- * <udelay> signal toggle delay.
- * <timeout> clock stretching timeout.
- * <sda_od> SDA is configured as open drain.
- * <scl_od> SCL is configured as open drain.
- * <scl_oo> SCL output drivers cannot be turned off.
- *
- * See include/i2c-gpio.h for more information about the parameters.
- *
- * If this driver is built into the kernel, you can use the following kernel
- * command line parameters, with the same values as the corresponding module
- * parameters listed above:
- *
- * i2c-gpio-custom.bus0
- * i2c-gpio-custom.bus1
- * i2c-gpio-custom.bus2
- * i2c-gpio-custom.bus3
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-
-#include <linux/i2c-gpio.h>
-
-#define DRV_NAME "i2c-gpio-custom"
-#define DRV_DESC "Custom GPIO-based I2C driver"
-#define DRV_VERSION "0.1.0"
-
-#define PFX DRV_NAME ": "
-
-#define BUS_PARAM_ID 0
-#define BUS_PARAM_SDA 1
-#define BUS_PARAM_SCL 2
-#define BUS_PARAM_UDELAY 3
-#define BUS_PARAM_TIMEOUT 4
-#define BUS_PARAM_SDA_OD 5
-#define BUS_PARAM_SCL_OD 6
-#define BUS_PARAM_SCL_OO 7
-
-#define BUS_PARAM_REQUIRED 3
-#define BUS_PARAM_COUNT 8
-#define BUS_COUNT_MAX 4
-
-static unsigned int bus0[BUS_PARAM_COUNT] __initdata;
-static unsigned int bus1[BUS_PARAM_COUNT] __initdata;
-static unsigned int bus2[BUS_PARAM_COUNT] __initdata;
-static unsigned int bus3[BUS_PARAM_COUNT] __initdata;
-
-static unsigned int bus_nump[BUS_COUNT_MAX] __initdata;
-
-#define BUS_PARM_DESC \
- " config -> id,sda,scl[,udelay,timeout,sda_od,scl_od,scl_oo]"
-
-module_param_array(bus0, uint, &bus_nump[0], 0);
-MODULE_PARM_DESC(bus0, "bus0" BUS_PARM_DESC);
-module_param_array(bus1, uint, &bus_nump[1], 0);
-MODULE_PARM_DESC(bus1, "bus1" BUS_PARM_DESC);
-module_param_array(bus2, uint, &bus_nump[2], 0);
-MODULE_PARM_DESC(bus2, "bus2" BUS_PARM_DESC);
-module_param_array(bus3, uint, &bus_nump[3], 0);
-MODULE_PARM_DESC(bus3, "bus3" BUS_PARM_DESC);
-
-static struct platform_device *devices[BUS_COUNT_MAX];
-static unsigned int nr_devices;
-
-static void i2c_gpio_custom_cleanup(void)
-{
- int i;
-
- for (i = 0; i < nr_devices; i++)
- if (devices[i])
- platform_device_unregister(devices[i]);
-}
-
-static int __init i2c_gpio_custom_add_one(unsigned int id, unsigned int *params)
-{
- struct platform_device *pdev;
- struct i2c_gpio_platform_data pdata;
- int err;
-
- if (!bus_nump[id])
- return 0;
-
- if (bus_nump[id] < BUS_PARAM_REQUIRED) {
- printk(KERN_ERR PFX "not enough parameters for bus%d\n", id);
- err = -EINVAL;
- goto err;
- }
-
- pdev = platform_device_alloc("i2c-gpio", params[BUS_PARAM_ID]);
- if (!pdev) {
- err = -ENOMEM;
- goto err;
- }
-
- devices[nr_devices++] = pdev;
-
- pdata.sda_pin = params[BUS_PARAM_SDA];
- pdata.scl_pin = params[BUS_PARAM_SCL];
- pdata.udelay = params[BUS_PARAM_UDELAY];
- pdata.timeout = params[BUS_PARAM_TIMEOUT];
- pdata.sda_is_open_drain = params[BUS_PARAM_SDA_OD] != 0;
- pdata.scl_is_open_drain = params[BUS_PARAM_SCL_OD] != 0;
- pdata.scl_is_output_only = params[BUS_PARAM_SCL_OO] != 0;
-
- err = platform_device_add_data(pdev, &pdata, sizeof(pdata));
- if (err)
- goto err;
-
- err = platform_device_register(pdev);
- if (err)
- goto err;
-
- return 0;
-
-err:
- return err;
-}
-
-static int __init i2c_gpio_custom_probe(void)
-{
- int err;
-
- printk(KERN_INFO DRV_DESC " version " DRV_VERSION "\n");
-
- err = i2c_gpio_custom_add_one(0, bus0);
- if (err) goto err;
-
- err = i2c_gpio_custom_add_one(1, bus1);
- if (err) goto err;
-
- err = i2c_gpio_custom_add_one(2, bus2);
- if (err) goto err;
-
- err = i2c_gpio_custom_add_one(3, bus3);
- if (err) goto err;
-
- if (!nr_devices) {
- printk(KERN_ERR PFX "no bus parameter(s) specified\n");
- err = -ENODEV;
- goto err;
- }
-
- return 0;
-
-err:
- i2c_gpio_custom_cleanup();
- return err;
-}
-
-#ifdef MODULE
-static int __init i2c_gpio_custom_init(void)
-{
- return i2c_gpio_custom_probe();
-}
-module_init(i2c_gpio_custom_init);
-
-static void __exit i2c_gpio_custom_exit(void)
-{
- i2c_gpio_custom_cleanup();
-}
-module_exit(i2c_gpio_custom_exit);
-#else
-subsys_initcall(i2c_gpio_custom_probe);
-#endif /* MODULE*/
-
-MODULE_LICENSE("GPL v2");
-MODULE_AUTHOR("Gabor Juhos <juhosg at openwrt.org >");
-MODULE_DESCRIPTION(DRV_DESC);
-MODULE_VERSION(DRV_VERSION);
diff --git a/target/linux/adm5120/patches/300-i2c_gpio_custom.patch b/target/linux/adm5120/patches/300-i2c_gpio_custom.patch
deleted file mode 100644
index f7f8997d68..0000000000
--- a/target/linux/adm5120/patches/300-i2c_gpio_custom.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: linux-2.6.24.2/drivers/i2c/busses/Kconfig
-===================================================================
---- linux-2.6.24.2.orig/drivers/i2c/busses/Kconfig
-+++ linux-2.6.24.2/drivers/i2c/busses/Kconfig
-@@ -146,6 +146,17 @@ config I2C_GPIO
- This is a very simple bitbanging I2C driver utilizing the
- arch-neutral GPIO API to control the SCL and SDA lines.
-
-+config I2C_GPIO_CUSTOM
-+ tristate "Custom GPIO-based I2C driver"
-+ depends on GENERIC_GPIO
-+ select I2C_GPIO
-+ help
-+ This is an I2C driver to register 1 to 4 custom I2C buses using
-+ GPIO lines.
-+
-+ This support is also available as a module. If so, the module
-+ will be called i2c-gpio-custom.
-+
- config I2C_HYDRA
- tristate "CHRP Apple Hydra Mac I/O I2C interface"
- depends on PCI && PPC_CHRP && EXPERIMENTAL
-Index: linux-2.6.24.2/drivers/i2c/busses/Makefile
-===================================================================
---- linux-2.6.24.2.orig/drivers/i2c/busses/Makefile
-+++ linux-2.6.24.2/drivers/i2c/busses/Makefile
-@@ -14,6 +14,7 @@ obj-$(CONFIG_I2C_BLACKFIN_TWI) += i2c-bf
- obj-$(CONFIG_I2C_DAVINCI) += i2c-davinci.o
- obj-$(CONFIG_I2C_ELEKTOR) += i2c-elektor.o
- obj-$(CONFIG_I2C_GPIO) += i2c-gpio.o
-+obj-$(CONFIG_I2C_GPIO_CUSTOM) += i2c-gpio-custom.o
- obj-$(CONFIG_I2C_HYDRA) += i2c-hydra.o
- obj-$(CONFIG_I2C_I801) += i2c-i801.o
- obj-$(CONFIG_I2C_I810) += i2c-i810.o