aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/linux/linux-2.6.28/collie/0016-add-gpiolib-support-to-ucb1x00.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/linux/linux-2.6.28/collie/0016-add-gpiolib-support-to-ucb1x00.patch')
-rw-r--r--recipes/linux/linux-2.6.28/collie/0016-add-gpiolib-support-to-ucb1x00.patch242
1 files changed, 0 insertions, 242 deletions
diff --git a/recipes/linux/linux-2.6.28/collie/0016-add-gpiolib-support-to-ucb1x00.patch b/recipes/linux/linux-2.6.28/collie/0016-add-gpiolib-support-to-ucb1x00.patch
deleted file mode 100644
index aab08a66c9..0000000000
--- a/recipes/linux/linux-2.6.28/collie/0016-add-gpiolib-support-to-ucb1x00.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-From 1de1b5c2860d889a9422f187ad90d8e38b2431fd Mon Sep 17 00:00:00 2001
-From: Thomas Kunze <thommycheck@gmx.de>
-Date: Tue, 10 Feb 2009 14:50:56 +0100
-Subject: [PATCH 16/23] add gpiolib support to ucb1x00
-
-The old access methods to the gpios will be removed when
-all users has been converted. (mainly ucb1x00-ts)
----
- arch/arm/mach-sa1100/include/mach/mcp.h | 1 +
- drivers/mfd/mcp-sa11x0.c | 1 +
- drivers/mfd/ucb1x00-core.c | 87 ++++++++++++++++++++++++++++++-
- include/linux/mfd/mcp.h | 1 +
- include/linux/mfd/ucb1x00.h | 3 +
- 5 files changed, 91 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/mach-sa1100/include/mach/mcp.h b/arch/arm/mach-sa1100/include/mach/mcp.h
-index fb8b09a..ed1a331 100644
---- a/arch/arm/mach-sa1100/include/mach/mcp.h
-+++ b/arch/arm/mach-sa1100/include/mach/mcp.h
-@@ -16,6 +16,7 @@ struct mcp_plat_data {
- u32 mccr0;
- u32 mccr1;
- unsigned int sclk_rate;
-+ int gpio_base;
- };
-
- #endif
-diff --git a/drivers/mfd/mcp-sa11x0.c b/drivers/mfd/mcp-sa11x0.c
-index 88c81cf..dfa59eb 100644
---- a/drivers/mfd/mcp-sa11x0.c
-+++ b/drivers/mfd/mcp-sa11x0.c
-@@ -163,6 +163,7 @@ static int mcp_sa11x0_probe(struct platform_device *pdev)
- mcp->dma_audio_wr = DMA_Ser4MCP0Wr;
- mcp->dma_telco_rd = DMA_Ser4MCP1Rd;
- mcp->dma_telco_wr = DMA_Ser4MCP1Wr;
-+ mcp->gpio_base = data->gpio_base;
-
- platform_set_drvdata(pdev, mcp);
-
-diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c
-index bc2c1ba..b9c3f3d 100644
---- a/drivers/mfd/ucb1x00-core.c
-+++ b/drivers/mfd/ucb1x00-core.c
-@@ -25,11 +25,11 @@
- #include <linux/device.h>
- #include <linux/mutex.h>
- #include <linux/mfd/ucb1x00.h>
-+#include <linux/gpio.h>
-
- #include <asm/dma.h>
- #include <mach/hardware.h>
-
--
- static DEFINE_MUTEX(ucb1x00_mutex);
- static LIST_HEAD(ucb1x00_drivers);
- static LIST_HEAD(ucb1x00_devices);
-@@ -107,6 +107,60 @@ unsigned int ucb1x00_io_read(struct ucb1x00 *ucb)
- return ucb1x00_reg_read(ucb, UCB_IO_DATA);
- }
-
-+static void ucb1x00_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
-+{
-+ struct ucb1x00 *ucb = container_of(chip, struct ucb1x00, gpio);
-+ unsigned long flags;
-+
-+ spin_lock_irqsave(&ucb->io_lock, flags);
-+ if (value)
-+ ucb->io_out |= 1 << offset;
-+ else
-+ ucb->io_out &= ~(1 << offset);
-+
-+ ucb1x00_reg_write(ucb, UCB_IO_DATA, ucb->io_out);
-+ spin_unlock_irqrestore(&ucb->io_lock, flags);
-+}
-+
-+static int ucb1x00_gpio_get(struct gpio_chip *chip, unsigned offset)
-+{
-+ struct ucb1x00 *ucb = container_of(chip, struct ucb1x00, gpio);
-+ return ucb1x00_reg_read(ucb, UCB_IO_DATA) & (1 << offset);
-+}
-+
-+static int ucb1x00_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
-+{
-+ struct ucb1x00 *ucb = container_of(chip, struct ucb1x00, gpio);
-+ unsigned long flags;
-+
-+ spin_lock_irqsave(&ucb->io_lock, flags);
-+ ucb->io_dir &= ~(1 << offset);
-+ ucb1x00_reg_write(ucb, UCB_IO_DIR, ucb->io_dir);
-+ spin_unlock_irqrestore(&ucb->io_lock, flags);
-+
-+ return 0;
-+}
-+
-+static int ucb1x00_gpio_direction_output(struct gpio_chip *chip, unsigned offset
-+ , int value)
-+{
-+ struct ucb1x00 *ucb = container_of(chip, struct ucb1x00, gpio);
-+ unsigned long flags;
-+
-+ spin_lock_irqsave(&ucb->io_lock, flags);
-+ ucb->io_dir |= (1 << offset);
-+ ucb1x00_reg_write(ucb, UCB_IO_DIR, ucb->io_dir);
-+
-+ if (value)
-+ ucb->io_out |= 1 << offset;
-+ else
-+ ucb->io_out &= ~(1 << offset);
-+ ucb1x00_reg_write(ucb, UCB_IO_DATA, ucb->io_out);
-+ spin_unlock_irqrestore(&ucb->io_lock, flags);
-+
-+ return 0;
-+}
-+
- /*
- * UCB1300 data sheet says we must:
- * 1. enable ADC => 5us (including reference startup time)
-@@ -475,6 +529,7 @@ static int ucb1x00_probe(struct mcp *mcp)
- struct ucb1x00_driver *drv;
- unsigned int id;
- int ret = -ENODEV;
-+ int temp;
-
- mcp_enable(mcp);
- id = mcp_reg_read(mcp, UCB_ID);
-@@ -507,12 +562,27 @@ static int ucb1x00_probe(struct mcp *mcp)
- goto err_free;
- }
-
-+ ucb->gpio.base = -1;
-+ if (mcp->gpio_base != 0) {
-+ ucb->gpio.label = dev_name(&ucb->dev);
-+ ucb->gpio.base = mcp->gpio_base;
-+ ucb->gpio.ngpio = 10;
-+ ucb->gpio.set = ucb1x00_gpio_set;
-+ ucb->gpio.get = ucb1x00_gpio_get;
-+ ucb->gpio.direction_input = ucb1x00_gpio_direction_input;
-+ ucb->gpio.direction_output = ucb1x00_gpio_direction_output;
-+ ret = gpiochip_add(&ucb->gpio);
-+ if (ret)
-+ goto err_free;
-+ } else
-+ dev_info(&ucb->dev, "gpio_base not set so no gpiolib support");
-+
- ret = request_irq(ucb->irq, ucb1x00_irq, IRQF_TRIGGER_RISING,
- "UCB1x00", ucb);
- if (ret) {
- printk(KERN_ERR "ucb1x00: unable to grab irq%d: %d\n",
- ucb->irq, ret);
-- goto err_free;
-+ goto err_gpio;
- }
-
- mcp_set_drvdata(mcp, ucb);
-@@ -521,6 +591,7 @@ static int ucb1x00_probe(struct mcp *mcp)
- if (ret)
- goto err_irq;
-
-+
- INIT_LIST_HEAD(&ucb->devs);
- mutex_lock(&ucb1x00_mutex);
- list_add(&ucb->node, &ucb1x00_devices);
-@@ -528,10 +599,14 @@ static int ucb1x00_probe(struct mcp *mcp)
- ucb1x00_add_dev(ucb, drv);
- }
- mutex_unlock(&ucb1x00_mutex);
-+
- goto out;
-
- err_irq:
- free_irq(ucb->irq, ucb);
-+ err_gpio:
-+ if (ucb->gpio.base != -1)
-+ temp = gpiochip_remove(&ucb->gpio);
- err_free:
- kfree(ucb);
- err_disable:
-@@ -544,6 +619,7 @@ static void ucb1x00_remove(struct mcp *mcp)
- {
- struct ucb1x00 *ucb = mcp_get_drvdata(mcp);
- struct list_head *l, *n;
-+ int ret;
-
- mutex_lock(&ucb1x00_mutex);
- list_del(&ucb->node);
-@@ -553,6 +629,12 @@ static void ucb1x00_remove(struct mcp *mcp)
- }
- mutex_unlock(&ucb1x00_mutex);
-
-+ if (ucb->gpio.base != -1) {
-+ ret = gpiochip_remove(&ucb->gpio);
-+ if (ret)
-+ dev_err(&ucb->dev, "Can't remove gpio chip: %d\n", ret);
-+ }
-+
- free_irq(ucb->irq, ucb);
- device_unregister(&ucb->dev);
- }
-@@ -603,6 +685,7 @@ static int ucb1x00_resume(struct mcp *mcp)
- struct ucb1x00 *ucb = mcp_get_drvdata(mcp);
- struct ucb1x00_dev *dev;
-
-+ ucb1x00_reg_write(ucb, UCB_IO_DIR, ucb->io_dir);
- mutex_lock(&ucb1x00_mutex);
- list_for_each_entry(dev, &ucb->devs, dev_node) {
- if (dev->drv->resume)
-diff --git a/include/linux/mfd/mcp.h b/include/linux/mfd/mcp.h
-index be95e09..ee49670 100644
---- a/include/linux/mfd/mcp.h
-+++ b/include/linux/mfd/mcp.h
-@@ -26,6 +26,7 @@ struct mcp {
- dma_device_t dma_telco_rd;
- dma_device_t dma_telco_wr;
- struct device attached_device;
-+ int gpio_base;
- };
-
- struct mcp_ops {
-diff --git a/include/linux/mfd/ucb1x00.h b/include/linux/mfd/ucb1x00.h
-index 70eb763..b13171e 100644
---- a/include/linux/mfd/ucb1x00.h
-+++ b/include/linux/mfd/ucb1x00.h
-@@ -11,6 +11,8 @@
- #define UCB1200_H
-
- #include <linux/mfd/mcp.h>
-+#include <linux/gpio.h>
-+
- #define UCB_IO_DATA 0x00
- #define UCB_IO_DIR 0x01
-
-@@ -126,6 +128,7 @@ struct ucb1x00 {
- struct device dev;
- struct list_head node;
- struct list_head devs;
-+ struct gpio_chip gpio;
- };
-
- struct ucb1x00_driver;
---
-1.5.6.5
-
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-01 13:39:45 +0000