diff -urpN -X ../dontdiff linux-2.6.20/drivers/spi/Kconfig linux-2.6.20-s1t/drivers/spi/Kconfig --- linux-2.6.20/drivers/spi/Kconfig 2007-02-04 18:44:54.000000000 +0000 +++ linux-2.6.20-s1t/drivers/spi/Kconfig 2007-02-07 16:29:14.000000000 +0000 @@ -121,6 +121,12 @@ config SPI_S3C24XX comment "SPI Protocol Masters" depends on SPI_MASTER +config SPI_TLE62X0 + tristate "Infineon TLE62X0" + depends on SPI_MASTER + help + SPI driver for Infineion TLE62X0 series line driver chips, + such as the TLE6220, TLE6230 and TLE6240. # # Add new SPI protocol masters in alphabetical order above this line diff -urpN -X ../dontdiff linux-2.6.20/drivers/spi/Makefile linux-2.6.20-s1t/drivers/spi/Makefile --- linux-2.6.20/drivers/spi/Makefile 2007-02-04 18:44:54.000000000 +0000 +++ linux-2.6.20-s1t/drivers/spi/Makefile 2007-02-07 16:29:14.000000000 +0000 @@ -22,6 +22,8 @@ obj-$(CONFIG_SPI_S3C24XX) += spi_s3c24x # SPI protocol drivers (device/link on bus) # ... add above this line ... +obj-$(CONFIG_SPI_TLE62X0) += tle62x0.o + # SPI slave controller drivers (upstream link) # ... add above this line ... diff -urpN -X ../dontdiff linux-2.6.20/drivers/spi/tle62x0.c linux-2.6.20-s1t/drivers/spi/tle62x0.c --- linux-2.6.20/drivers/spi/tle62x0.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.20-s1t/drivers/spi/tle62x0.c 2007-02-07 16:29:15.000000000 +0000 @@ -0,0 +1,343 @@ +/* drivers/spi/tle62x0.c + * + * Copyright (c) 2007 Simtec Electronics + * Ben Dooks, + * + * 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. + * + * Infineon TLE62x0 series driver +*/ + +#include +#include + +#include +#include + +#define CMD_READ (0x00) +#define CMD_SET (0xff) + +#define DIAG_NORMAL (0x03) +#define DIAG_OVERLOAD (0x02) +#define DIAG_OPEN (0x01) +#define DIAG_SHORTGND (0x00) + +struct tle62x0_data { + struct spi_device *us; + struct mutex lock; + unsigned int nr_gpio; + unsigned int gpio_state; + + unsigned char tx_buff[4]; + unsigned char rx_buff[4]; +}; + +static int to_gpio_num(struct device_attribute *attr); + +static inline int tle62x0_write(struct tle62x0_data *data) +{ + unsigned char *buff = data->tx_buff; + + buff[0] = CMD_SET; + + if (data->nr_gpio == 16) { + buff[1] = data->gpio_state >> 8; + buff[2] = data->gpio_state; + } else { + buff[1] = data->gpio_state; + } + + dev_dbg(&data->us->dev, "buff %02x,%02x,%02x\n", + buff[0], buff[1], buff[2]); + + return spi_write(data->us, buff, (data->nr_gpio == 16) ? 3 : 2); +} + +static inline int tle62x0_read(struct tle62x0_data *data) +{ + unsigned char *txbuff = data->tx_buff; + struct spi_transfer xfer = { + .tx_buf = txbuff, + .rx_buf = data->rx_buff, + .len = (data->nr_gpio * 2) / 8, + }; + struct spi_message msg; + + txbuff[0] = CMD_READ; + txbuff[1] = 0x00; + txbuff[2] = 0x00; + txbuff[3] = 0x00; + + spi_message_init(&msg); + spi_message_add_tail(&xfer, &msg); + + return spi_sync(data->us, &msg); +} + +static unsigned char *decode_fault(unsigned int fault_code) +{ + fault_code &= 3; + + switch (fault_code) { + case DIAG_NORMAL: + return "N"; + case DIAG_OVERLOAD: + return "V"; + case DIAG_OPEN: + return "O"; + case DIAG_SHORTGND: + return "G"; + } + + return "?"; +} + +static int tle62x0_status_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct tle62x0_data *data = dev_get_drvdata(dev); + char *bp = buf; + unsigned char *buff = data->rx_buff; + unsigned long fault = 0; + int ptr; + int ret; + + mutex_lock(&data->lock); + ret = tle62x0_read(data); + + dev_dbg(dev, "tle62x0_read() returned %d\n", ret); + + for (ptr = 0; ptr < (data->nr_gpio * 2)/8; ptr += 1) { + fault <<= 8; + fault |= ((unsigned long)buff[ptr]); + + dev_dbg(dev, "byte %d is %02x\n", ptr, buff[ptr]); + } + + for (ptr = 0; ptr < data->nr_gpio; ptr++) { + bp += sprintf(bp, "%s ", decode_fault(fault >> (ptr * 2))); + } + + *bp++ = '\n'; + + mutex_unlock(&data->lock); + return bp - buf; +} + +static DEVICE_ATTR(status_show, 0444, tle62x0_status_show, NULL); + +static int tle62x0_gpio_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct tle62x0_data *data = dev_get_drvdata(dev); + int gpio_num = to_gpio_num(attr); + int value; + + mutex_lock(&data->lock); + value = (data->gpio_state >> gpio_num) & 1; + mutex_unlock(&data->lock); + + return snprintf(buf, PAGE_SIZE, "%d", value); +} + +static int tle62x0_gpio_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t len) +{ + struct tle62x0_data *data = dev_get_drvdata(dev); + int gpio_num = to_gpio_num(attr); + unsigned long val; + char *endp; + + val = simple_strtoul(buf, &endp, 0); + if (buf == endp) + return -EINVAL; + + dev_dbg(dev, "setting gpio %d to %ld\n", gpio_num, val); + + mutex_lock(&data->lock); + + if (val) + data->gpio_state |= 1 << gpio_num; + else + data->gpio_state &= ~(1 << gpio_num); + + tle62x0_write(data); + + mutex_unlock(&data->lock); + + return len; +} + +static DEVICE_ATTR(gpio1, 0644, tle62x0_gpio_show, tle62x0_gpio_store); +static DEVICE_ATTR(gpio2, 0644, tle62x0_gpio_show, tle62x0_gpio_store); +static DEVICE_ATTR(gpio3, 0644, tle62x0_gpio_show, tle62x0_gpio_store); +static DEVICE_ATTR(gpio4, 0644, tle62x0_gpio_show, tle62x0_gpio_store); +static DEVICE_ATTR(gpio5, 0644, tle62x0_gpio_show, tle62x0_gpio_store); +static DEVICE_ATTR(gpio6, 0644, tle62x0_gpio_show, tle62x0_gpio_store); +static DEVICE_ATTR(gpio7, 0644, tle62x0_gpio_show, tle62x0_gpio_store); +static DEVICE_ATTR(gpio8, 0644, tle62x0_gpio_show, tle62x0_gpio_store); +static DEVICE_ATTR(gpio9, 0644, tle62x0_gpio_show, tle62x0_gpio_store); +static DEVICE_ATTR(gpio10, 0644, tle62x0_gpio_show, tle62x0_gpio_store); +static DEVICE_ATTR(gpio11, 0644, tle62x0_gpio_show, tle62x0_gpio_store); +static DEVICE_ATTR(gpio12, 0644, tle62x0_gpio_show, tle62x0_gpio_store); +static DEVICE_ATTR(gpio13, 0644, tle62x0_gpio_show, tle62x0_gpio_store); +static DEVICE_ATTR(gpio14, 0644, tle62x0_gpio_show, tle62x0_gpio_store); +static DEVICE_ATTR(gpio15, 0644, tle62x0_gpio_show, tle62x0_gpio_store); +static DEVICE_ATTR(gpio16, 0644, tle62x0_gpio_show, tle62x0_gpio_store); + +static struct device_attribute *gpio_attrs[] = { + [0] = &dev_attr_gpio1, + [1] = &dev_attr_gpio2, + [2] = &dev_attr_gpio3, + [3] = &dev_attr_gpio4, + [4] = &dev_attr_gpio5, + [5] = &dev_attr_gpio6, + [6] = &dev_attr_gpio7, + [7] = &dev_attr_gpio8, + [8] = &dev_attr_gpio9, + [9] = &dev_attr_gpio10, + [10] = &dev_attr_gpio11, + [11] = &dev_attr_gpio12, + [12] = &dev_attr_gpio13, + [13] = &dev_attr_gpio14, + [14] = &dev_attr_gpio15, + [15] = &dev_attr_gpio16 +}; + +static int to_gpio_num(struct device_attribute *attr) +{ + int ptr; + + for (ptr = 0; ptr < ARRAY_SIZE(gpio_attrs); ptr++) { + if (gpio_attrs[ptr] == attr) + return ptr; + } + + return -1; +} + +static int __devinit tle62x0_probe(struct spi_device *spi, int gpios) +{ + struct tle62x0_data *data; + int ptr; + int ret; + + data = kzalloc(sizeof(struct tle62x0_data), GFP_KERNEL); + if (!data) { + dev_err(&spi->dev, "no memory for device state\n"); + return -ENOMEM; + } + + data->us = spi; + data->nr_gpio = gpios; + + mutex_init(&data->lock); + + ret = device_create_file(&spi->dev, &dev_attr_status_show); + if (ret) { + dev_err(&spi->dev, "cannot create status attribute\n"); + goto err_status; + } + + for (ptr = 0; ptr < gpios; ptr++) { + ret = device_create_file(&spi->dev, gpio_attrs[ptr]); + if (ret) { + dev_err(&spi->dev, "cannot create gpio attribute\n"); + goto err_gpios; + } + } + + //tle62x0_write(data); + spi_set_drvdata(spi, data); + return 0; + + err_gpios: + for (; ptr > 0; ptr--) + device_remove_file(&spi->dev, gpio_attrs[ptr]); + + device_remove_file(&spi->dev, &dev_attr_status_show); + + err_status: + kfree(data); + return ret; +} + +static int __devexit tle62x0_remove(struct spi_device *spi) +{ + struct tle62x0_data *data = spi_get_drvdata(spi); + int ptr; + + for (ptr = 0; ptr < data->nr_gpio; ptr++) + device_remove_file(&spi->dev, gpio_attrs[ptr]); + + kfree(data); + return 0; +} + +static int __devinit tle6220_probe(struct spi_device *spi) +{ + return tle62x0_probe(spi, 4); +} + +static int __devinit tle6230_probe(struct spi_device *spi) +{ + return tle62x0_probe(spi, 8); +} + +static int __devinit tle6240_probe(struct spi_device *spi) +{ + return tle62x0_probe(spi, 16); +} + +static struct spi_driver tle6220_driver = { + .driver = { + .name = "tle6220", + .owner = THIS_MODULE, + }, + .probe = tle6220_probe, + .remove = __devexit_p(tle62x0_remove), +}; + +static struct spi_driver tle6230_driver = { + .driver = { + .name = "tle6230", + .owner = THIS_MODULE, + }, + .probe = tle6230_probe, + .remove = __devexit_p(tle62x0_remove), +}; + +static struct spi_driver tle6240_driver = { + .driver = { + .name = "tle6240", + .owner = THIS_MODULE, + }, + .probe = tle6240_probe, + .remove = __devexit_p(tle62x0_remove), +}; + +static __init int tle62x0_init(void) +{ + spi_register_driver(&tle6220_driver); + spi_register_driver(&tle6230_driver); + spi_register_driver(&tle6240_driver); + + return 0; +} + +static __exit void tle62x0_exit(void) +{ + spi_unregister_driver(&tle6220_driver); + spi_unregister_driver(&tle6230_driver); + spi_unregister_driver(&tle6240_driver); +} + +module_init(tle62x0_init); +module_exit(tle62x0_exit); + +MODULE_AUTHOR("Ben Dooks "); +MODULE_DESCRIPTION("TLE62x0 SPI driver"); +MODULE_LICENSE("GPL v2");