diff -rduN linux-2.6.27.6/drivers/char/pc8736x_gpio.c linux-2.6.27.6-soekris/drivers/char/pc8736x_gpio.c --- linux-2.6.27.6/drivers/char/pc8736x_gpio.c 2008-11-13 18:56:21.000000000 +0100 +++ linux-2.6.27.6-soekris/drivers/char/pc8736x_gpio.c 2008-11-20 20:45:45.000000000 +0100 @@ -22,6 +22,7 @@ #include #include #include +#include #define DEVNAME "pc8736x_gpio" @@ -247,9 +248,68 @@ static struct cdev pc8736x_gpio_cdev; +/* wrapper functions for the arch-independent gpio support + * maps device minor numbers to real pin numbers on a soekris + * net4801 */ +static int pin2minor(unsigned pin) { + switch(pin) { + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + return 16 + pin; + case 8: + case 9: + return pin - 4; + case 10: + case 11: + return pin; + default: + return -1; + } +} + +static int pc8736x_gpio_direction_output(struct gpio_chip *gc, + unsigned offset, int value) { + + // i'm not quite sure what "value" does here... + pc8736x_gpio_configure(pin2minor(offset), ~1, 1); + if(value) { + //open drain + pc8736x_gpio_configure(pin2minor(offset), ~2, 0); + } else { + //push pull + pc8736x_gpio_configure(pin2minor(offset), ~2, 2); + } + + return 0; +} + +static int pc8736x_gpio_direction_input(struct gpio_chip *gc, + unsigned offset) { + + pc8736x_gpio_configure(pin2minor(offset), ~1, 0); + + return 0; +} +static int pc8736x_gpio_get_value(struct gpio_chip *gc, + unsigned offset) { + return pc8736x_gpio_get(pin2minor(offset)); +} +static void pc8736x_gpio_set_value(struct gpio_chip *gc, + unsigned offset, int value) { + + pc8736x_gpio_set(pin2minor(offset), value); +} + static int __init pc8736x_gpio_init(void) { int rc; + struct gpio_chip* gc; dev_t devid; pdev = platform_device_alloc(DEVNAME, 0); @@ -321,8 +381,34 @@ cdev_init(&pc8736x_gpio_cdev, &pc8736x_gpio_fileops); cdev_add(&pc8736x_gpio_cdev, devid, PC8736X_GPIO_CT); - return 0; + /* register us with the arch-independent gpio */ + gc = kzalloc(sizeof(struct gpio_chip), GFP_KERNEL); + if (gc == NULL) { + dev_err(&pdev->dev, "could not alloc memory for gpio_chip\n"); + goto undo_request_region; + } + + gc->direction_input = pc8736x_gpio_direction_input; + gc->direction_output = pc8736x_gpio_direction_output; + gc->get = pc8736x_gpio_get_value; + gc->set = pc8736x_gpio_set_value; + gc->can_sleep = 0; + + gc->base = -1; // dynamic allocation + gc->ngpio = 12; + gc->label = "Soekris PC8736x GPIOs"; + gc->dev = &pdev->dev; + gc->owner = THIS_MODULE; + rc = gpiochip_add(gc); + if(rc) { + dev_err(&pdev->dev, "gpiochip_add failed!\n"); + goto undo_kalloc_gpio_chip; + } + + return 0; +undo_kalloc_gpio_chip: + kfree(gc); undo_request_region: release_region(pc8736x_gpio_base, PC8736X_GPIO_RANGE); undo_platform_dev_add: diff -rduN linux-2.6.27.6/drivers/i2c/busses/i2c-gpio-custom.c linux-2.6.27.6-soekris/drivers/i2c/busses/i2c-gpio-custom.c --- linux-2.6.27.6/drivers/i2c/busses/i2c-gpio-custom.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.27.6-soekris/drivers/i2c/busses/i2c-gpio-custom.c 2008-11-20 18:35:07.000000000 +0100 @@ -0,0 +1,200 @@ +/* + * Custom GPIO-based I2C driver + * + * Copyright (C) 2007-2008 Gabor Juhos + * + * 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 ,,,,,,, + * + * where: + * + * ID to used as device_id for the corresponding bus (required) + * GPIO pin ID to used for SDA (required) + * GPIO pin ID to used for SCL (required) + * signal toggle delay. + * clock stretching timeout. + * SDA is configured as open drain. + * SCL is configured as open drain. + * 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 +#include +#include +#include + +#include + +#define DRV_NAME "i2c-gpio-custom" +#define DRV_DESC "Custom GPIO-based I2C driver" +#define DRV_VERSION "0.1.1" + +#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_put(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; + } + + 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.sda_is_open_drain = 1; + pdata.scl_is_open_drain = 1; + pdata.scl_is_output_only = params[BUS_PARAM_SCL_OO] != 0; + + err = platform_device_add_data(pdev, &pdata, sizeof(pdata)); + if (err) + goto err_put; + + err = platform_device_add(pdev); + if (err) + goto err_put; + + devices[nr_devices++] = pdev; + return 0; + +err_put: + platform_device_put(pdev); +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 "); +MODULE_DESCRIPTION(DRV_DESC); +MODULE_VERSION(DRV_VERSION); diff -rduN linux-2.6.27.6/drivers/i2c/busses/Kconfig linux-2.6.27.6-soekris/drivers/i2c/busses/Kconfig --- linux-2.6.27.6/drivers/i2c/busses/Kconfig 2008-11-13 18:56:21.000000000 +0100 +++ linux-2.6.27.6-soekris/drivers/i2c/busses/Kconfig 2008-11-20 18:36:27.000000000 +0100 @@ -701,3 +701,14 @@ will be called scx200_acb. endmenu + +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. diff -rduN linux-2.6.27.6/drivers/i2c/busses/Makefile linux-2.6.27.6-soekris/drivers/i2c/busses/Makefile --- linux-2.6.27.6/drivers/i2c/busses/Makefile 2008-11-13 18:56:21.000000000 +0100 +++ linux-2.6.27.6-soekris/drivers/i2c/busses/Makefile 2008-11-20 18:35:43.000000000 +0100 @@ -67,6 +67,8 @@ obj-$(CONFIG_SCx200_ACB) += scx200_acb.o obj-$(CONFIG_SCx200_I2C) += scx200_i2c.o +obj-${CONFIG_I2C_GPIO_CUSTOM} += i2c-gpio-custom.o + ifeq ($(CONFIG_I2C_DEBUG_BUS),y) EXTRA_CFLAGS += -DDEBUG endif