Skip to contentSkip to conversation

add gpiolib support to ucb1x00

PATCH New Thomas Kunze 1 participant 1 message Feb 10, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 6/9 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(-)
arch/arm/mach-sa1100/include/mach/mcp.h +1 -0
index fb8b09a..ed1a331 100644
@@ -16,6 +16,7 @@ struct mcp_plat_data {
 	u32 mccr0;
 	u32 mccr1;
 	unsigned int sclk_rate;
+	int gpio_base;
 };
 
 #endif
drivers/mfd/mcp-sa11x0.c +1 -0
index 2121898..2584272 100644
@@ -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);
 
drivers/mfd/ucb1x00-core.c +85 -2

154 lines not on this page · raw message

include/linux/mfd/mcp.h +1 -0
index be95e09..ee49670 100644
@@ -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 {
include/linux/mfd/ucb1x00.h +3 -0
index eac3463..aa9c378 100644
@@ -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
 
@@ -123,6 +125,7 @@ struct ucb1x00 {
 	struct device		dev;
 	struct list_head	node;
 	struct list_head	devs;
+	struct gpio_chip 	gpio;
 };
 
 struct ucb1x00_driver;
Signature · 4 lines
1.6.0.4


--------------080106070900050803030700--