mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-27 06:18:13 +00:00
Koen Kooi
189ce92b4c
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
211 lines
5.5 KiB
Diff
211 lines
5.5 KiB
Diff
From ee8e09be6e0d533351740fc80d291bab8e2686c3 Mon Sep 17 00:00:00 2001
|
|
From: Richard Cochran <richardcochran@gmail.com>
|
|
Date: Wed, 23 May 2012 18:19:51 +0200
|
|
Subject: [PATCH 08/86] ixp4xx: fix compilation by adding gpiolib support
|
|
|
|
commit 9dde0ae3769875ec1370cb316e50c54b57d52c1a upstream.
|
|
|
|
Once again, ixp4xx no longer even compiles. This patch fixes the issue
|
|
by converting over to gpiolib. This patch was first made by Imre and
|
|
posted by Marc, and I added in Russell's suggestion to empty the gpio
|
|
header file.
|
|
|
|
This fix should also go for 3.1, 3.2, 3.3, and 3.4.
|
|
|
|
Signed-off-by: Richard Cochran <richardcochran@gmail.com>
|
|
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
arch/arm/Kconfig | 2 +-
|
|
arch/arm/mach-ixp4xx/common.c | 48 +++++++++++++++++-
|
|
arch/arm/mach-ixp4xx/include/mach/gpio.h | 79 +-----------------------------
|
|
3 files changed, 48 insertions(+), 81 deletions(-)
|
|
|
|
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
|
|
index 26574f0..cad2ec2 100644
|
|
--- a/arch/arm/Kconfig
|
|
+++ b/arch/arm/Kconfig
|
|
@@ -520,7 +520,7 @@ config ARCH_IXP4XX
|
|
depends on MMU
|
|
select CLKSRC_MMIO
|
|
select CPU_XSCALE
|
|
- select GENERIC_GPIO
|
|
+ select ARCH_REQUIRE_GPIOLIB
|
|
select GENERIC_CLOCKEVENTS
|
|
select HAVE_SCHED_CLOCK
|
|
select MIGHT_HAVE_PCI
|
|
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
|
|
index b86a005..caf28fc 100644
|
|
--- a/arch/arm/mach-ixp4xx/common.c
|
|
+++ b/arch/arm/mach-ixp4xx/common.c
|
|
@@ -29,6 +29,7 @@
|
|
#include <linux/clockchips.h>
|
|
#include <linux/io.h>
|
|
#include <linux/export.h>
|
|
+#include <linux/gpio.h>
|
|
|
|
#include <mach/udc.h>
|
|
#include <mach/hardware.h>
|
|
@@ -106,7 +107,7 @@ static signed char irq2gpio[32] = {
|
|
7, 8, 9, 10, 11, 12, -1, -1,
|
|
};
|
|
|
|
-int gpio_to_irq(int gpio)
|
|
+static int ixp4xx_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)
|
|
{
|
|
int irq;
|
|
|
|
@@ -116,7 +117,6 @@ int gpio_to_irq(int gpio)
|
|
}
|
|
return -EINVAL;
|
|
}
|
|
-EXPORT_SYMBOL(gpio_to_irq);
|
|
|
|
int irq_to_gpio(unsigned int irq)
|
|
{
|
|
@@ -376,12 +376,56 @@ static struct platform_device *ixp46x_devices[] __initdata = {
|
|
unsigned long ixp4xx_exp_bus_size;
|
|
EXPORT_SYMBOL(ixp4xx_exp_bus_size);
|
|
|
|
+static int ixp4xx_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
|
|
+{
|
|
+ gpio_line_config(gpio, IXP4XX_GPIO_IN);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int ixp4xx_gpio_direction_output(struct gpio_chip *chip, unsigned gpio,
|
|
+ int level)
|
|
+{
|
|
+ gpio_line_set(gpio, level);
|
|
+ gpio_line_config(gpio, IXP4XX_GPIO_OUT);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int ixp4xx_gpio_get_value(struct gpio_chip *chip, unsigned gpio)
|
|
+{
|
|
+ int value;
|
|
+
|
|
+ gpio_line_get(gpio, &value);
|
|
+
|
|
+ return value;
|
|
+}
|
|
+
|
|
+static void ixp4xx_gpio_set_value(struct gpio_chip *chip, unsigned gpio,
|
|
+ int value)
|
|
+{
|
|
+ gpio_line_set(gpio, value);
|
|
+}
|
|
+
|
|
+static struct gpio_chip ixp4xx_gpio_chip = {
|
|
+ .label = "IXP4XX_GPIO_CHIP",
|
|
+ .direction_input = ixp4xx_gpio_direction_input,
|
|
+ .direction_output = ixp4xx_gpio_direction_output,
|
|
+ .get = ixp4xx_gpio_get_value,
|
|
+ .set = ixp4xx_gpio_set_value,
|
|
+ .to_irq = ixp4xx_gpio_to_irq,
|
|
+ .base = 0,
|
|
+ .ngpio = 16,
|
|
+};
|
|
+
|
|
void __init ixp4xx_sys_init(void)
|
|
{
|
|
ixp4xx_exp_bus_size = SZ_16M;
|
|
|
|
platform_add_devices(ixp4xx_devices, ARRAY_SIZE(ixp4xx_devices));
|
|
|
|
+ gpiochip_add(&ixp4xx_gpio_chip);
|
|
+
|
|
if (cpu_is_ixp46x()) {
|
|
int region;
|
|
|
|
diff --git a/arch/arm/mach-ixp4xx/include/mach/gpio.h b/arch/arm/mach-ixp4xx/include/mach/gpio.h
|
|
index 83d6b4e..ef37f26 100644
|
|
--- a/arch/arm/mach-ixp4xx/include/mach/gpio.h
|
|
+++ b/arch/arm/mach-ixp4xx/include/mach/gpio.h
|
|
@@ -1,79 +1,2 @@
|
|
-/*
|
|
- * arch/arm/mach-ixp4xx/include/mach/gpio.h
|
|
- *
|
|
- * IXP4XX GPIO wrappers for arch-neutral GPIO calls
|
|
- *
|
|
- * Written by Milan Svoboda <msvoboda@ra.rockwell.com>
|
|
- * Based on PXA implementation by Philipp Zabel <philipp.zabel@gmail.com>
|
|
- *
|
|
- * This program is free software; you can redistribute it and/or modify
|
|
- * it under the terms of the GNU General Public License as published by
|
|
- * the Free Software Foundation; either version 2 of the License, or
|
|
- * (at your option) any later version.
|
|
- *
|
|
- * This program is distributed in the hope that it will be useful,
|
|
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
- * GNU General Public License for more details.
|
|
- *
|
|
- * You should have received a copy of the GNU General Public License
|
|
- * along with this program; if not, write to the Free Software
|
|
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
- *
|
|
- */
|
|
-
|
|
-#ifndef __ASM_ARCH_IXP4XX_GPIO_H
|
|
-#define __ASM_ARCH_IXP4XX_GPIO_H
|
|
-
|
|
-#include <linux/kernel.h>
|
|
-#include <mach/hardware.h>
|
|
-
|
|
-#define __ARM_GPIOLIB_COMPLEX
|
|
-
|
|
-static inline int gpio_request(unsigned gpio, const char *label)
|
|
-{
|
|
- return 0;
|
|
-}
|
|
-
|
|
-static inline void gpio_free(unsigned gpio)
|
|
-{
|
|
- might_sleep();
|
|
-
|
|
- return;
|
|
-}
|
|
-
|
|
-static inline int gpio_direction_input(unsigned gpio)
|
|
-{
|
|
- gpio_line_config(gpio, IXP4XX_GPIO_IN);
|
|
- return 0;
|
|
-}
|
|
-
|
|
-static inline int gpio_direction_output(unsigned gpio, int level)
|
|
-{
|
|
- gpio_line_set(gpio, level);
|
|
- gpio_line_config(gpio, IXP4XX_GPIO_OUT);
|
|
- return 0;
|
|
-}
|
|
-
|
|
-static inline int gpio_get_value(unsigned gpio)
|
|
-{
|
|
- int value;
|
|
-
|
|
- gpio_line_get(gpio, &value);
|
|
-
|
|
- return value;
|
|
-}
|
|
-
|
|
-static inline void gpio_set_value(unsigned gpio, int value)
|
|
-{
|
|
- gpio_line_set(gpio, value);
|
|
-}
|
|
-
|
|
-#include <asm-generic/gpio.h> /* cansleep wrappers */
|
|
-
|
|
-extern int gpio_to_irq(int gpio);
|
|
-#define gpio_to_irq gpio_to_irq
|
|
-extern int irq_to_gpio(unsigned int irq);
|
|
-
|
|
-#endif
|
|
+/* empty */
|
|
|
|
--
|
|
1.7.9.5
|
|
|