X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fcns3xxx%2Fpatches-3.3%2F104-cns3xxx_gpio.patch;fp=target%2Flinux%2Fcns3xxx%2Fpatches-3.3%2F104-cns3xxx_gpio.patch;h=0000000000000000000000000000000000000000;hb=5cddb170cdbe2ab2cdfd3e24cd025b387baa5438;hp=1f0d44401b34d6a43fc2660b63e86c4613310ae6;hpb=77504ac06fe4dcfd069fdd51abb318b6d8cb0a31;p=openwrt%2Fopenwrt.git

diff --git a/target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch b/target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch
deleted file mode 100644
index 1f0d44401b..0000000000
--- a/target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch
+++ /dev/null
@@ -1,117 +0,0 @@
---- a/arch/arm/mach-cns3xxx/cns3420vb.c
-+++ b/arch/arm/mach-cns3xxx/cns3420vb.c
-@@ -213,7 +213,7 @@ static struct map_desc cns3420_io_desc[]
- 
- static void __init cns3420_map_io(void)
- {
--	cns3xxx_map_io();
-+	cns3xxx_common_init();
- 	iotable_init(cns3420_io_desc, ARRAY_SIZE(cns3420_io_desc));
- 
- 	cns3420_early_serial_setup();
---- a/arch/arm/mach-cns3xxx/core.c
-+++ b/arch/arm/mach-cns3xxx/core.c
-@@ -21,6 +21,7 @@
- #include <asm/hardware/gic.h>
- #include <asm/smp_twd.h>
- #include <asm/hardware/cache-l2x0.h>
-+#include <asm/gpio.h>
- #include <mach/cns3xxx.h>
- #include "core.h"
- 
-@@ -72,12 +73,73 @@ static struct map_desc cns3xxx_io_desc[]
- 	},
- };
- 
--void __init cns3xxx_map_io(void)
-+static inline void gpio_line_config(u8 line, u32 direction)
-+{
-+	u32 reg;
-+	if (direction) {
-+		if (line < 32) {
-+			reg = __raw_readl(CNS3XXX_GPIOA_BASE_VIRT + CNS3XXX_GPIO_DIR);
-+			reg |= (1 << line);
-+			__raw_writel(reg, CNS3XXX_GPIOA_BASE_VIRT + CNS3XXX_GPIO_DIR);
-+		} else {
-+			reg = __raw_readl(CNS3XXX_GPIOB_BASE_VIRT + CNS3XXX_GPIO_DIR);
-+			reg |= (1 << (line - 32));
-+			__raw_writel(reg, CNS3XXX_GPIOB_BASE_VIRT + CNS3XXX_GPIO_DIR);
-+		}
-+	} else {
-+		if (line < 32) {
-+			reg = __raw_readl(CNS3XXX_GPIOA_BASE_VIRT + CNS3XXX_GPIO_DIR);
-+			reg &= ~(1 << line);
-+			__raw_writel(reg, CNS3XXX_GPIOA_BASE_VIRT + CNS3XXX_GPIO_DIR);
-+		} else {
-+			reg = __raw_readl(CNS3XXX_GPIOB_BASE_VIRT + CNS3XXX_GPIO_DIR);
-+			reg &= ~(1 << (line - 32));
-+			__raw_writel(reg, CNS3XXX_GPIOB_BASE_VIRT + CNS3XXX_GPIO_DIR);
-+		}
-+	}
-+}
-+
-+static int cns3xxx_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
-+{
-+	gpio_line_config(gpio, CNS3XXX_GPIO_IN);
-+	return 0;
-+}
-+
-+static int cns3xxx_gpio_direction_output(struct gpio_chip *chip, unsigned gpio, int level)
-+{
-+	gpio_line_set(gpio, level);
-+	gpio_line_config(gpio, CNS3XXX_GPIO_OUT);
-+	return 0;
-+}
-+
-+static int cns3xxx_gpio_get_value(struct gpio_chip *chip, unsigned gpio)
-+{
-+	return gpio_get_value(gpio);
-+}
-+
-+static void cns3xxx_gpio_set_value(struct gpio_chip *chip, unsigned gpio, int value)
-+{
-+	gpio_set_value(gpio, value);
-+}
-+
-+static struct gpio_chip cns3xxx_gpio_chip = {
-+	.label			= "CNS3XXX_GPIO_CHIP",
-+	.direction_input	= cns3xxx_gpio_direction_input,
-+	.direction_output	= cns3xxx_gpio_direction_output,
-+	.get			= cns3xxx_gpio_get_value,
-+	.set			= cns3xxx_gpio_set_value,
-+	.base			= 0,
-+	.ngpio			= 64,
-+};
-+
-+void __init cns3xxx_common_init(void)
- {
- #ifdef CONFIG_LOCAL_TIMERS
- 	twd_base = (void __iomem *) CNS3XXX_TC11MP_TWD_BASE_VIRT;
- #endif
- 	iotable_init(cns3xxx_io_desc, ARRAY_SIZE(cns3xxx_io_desc));
-+
-+	gpiochip_add(&cns3xxx_gpio_chip);
- }
- 
- /* used by entry-macro.S */
---- a/arch/arm/mach-cns3xxx/core.h
-+++ b/arch/arm/mach-cns3xxx/core.h
-@@ -19,7 +19,7 @@ void __init cns3xxx_l2x0_init(void);
- static inline void cns3xxx_l2x0_init(void) {}
- #endif /* CONFIG_CACHE_L2X0 */
- 
--void __init cns3xxx_map_io(void);
-+void __init cns3xxx_common_init(void);
- void __init cns3xxx_init_irq(void);
- void cns3xxx_power_off(void);
- void cns3xxx_restart(char, const char *);
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -366,6 +366,7 @@ config ARCH_CLPS711X
- config ARCH_CNS3XXX
- 	bool "Cavium Networks CNS3XXX family"
- 	select CPU_V6K
-+	select ARCH_WANT_OPTIONAL_GPIOLIB
- 	select GENERIC_CLOCKEVENTS
- 	select ARM_GIC
- 	select CLKDEV_LOOKUP