summaryrefslogtreecommitdiffstats
path: root/target/linux/cns3xxx/patches-3.1/104-cns3xxx_gpio.patch
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-02-11 15:59:23 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-02-11 15:59:23 +0000
commitc6114b60db88f1b33d12ecd77a3bed3a63822e06 (patch)
treee3da1c10fc00d5cdfbd2cc021fe11ea9ea01df8f /target/linux/cns3xxx/patches-3.1/104-cns3xxx_gpio.patch
parent63815e7b5d6aecfc4743f7a83a178bdeb3a79f58 (diff)
[cns3xxx]: rename 3.1 patches directory as it will be used for newer kernels as well
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30454 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/cns3xxx/patches-3.1/104-cns3xxx_gpio.patch')
-rw-r--r--target/linux/cns3xxx/patches-3.1/104-cns3xxx_gpio.patch141
1 files changed, 0 insertions, 141 deletions
diff --git a/target/linux/cns3xxx/patches-3.1/104-cns3xxx_gpio.patch b/target/linux/cns3xxx/patches-3.1/104-cns3xxx_gpio.patch
deleted file mode 100644
index 6dff5b07d..000000000
--- a/target/linux/cns3xxx/patches-3.1/104-cns3xxx_gpio.patch
+++ /dev/null
@@ -1,141 +0,0 @@
---- a/arch/arm/mach-cns3xxx/cns3420vb.c
-+++ b/arch/arm/mach-cns3xxx/cns3420vb.c
-@@ -215,7 +215,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
-@@ -18,6 +18,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"
-
-@@ -75,12 +76,96 @@ static struct map_desc cns3xxx_io_desc[]
- },
- };
-
--void __init cns3xxx_map_io(void)
-+int gpio_to_irq(int gpio)
-+{
-+ if (gpio > 63)
-+ return -EINVAL;
-+
-+ if (gpio < 32)
-+ return IRQ_CNS3XXX_GPIOA;
-+ else
-+ return IRQ_CNS3XXX_GPIOB;
-+}
-+EXPORT_SYMBOL(gpio_to_irq);
-+
-+int irq2gpio(int irq)
-+{
-+ if (irq == IRQ_CNS3XXX_GPIOA)
-+ return 0;
-+ else if (irq == IRQ_CNS3XXX_GPIOB)
-+ return 32;
-+ else
-+ return -EINVAL;
-+}
-+EXPORT_SYMBOL(irq2gpio);
-+
-+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
-@@ -20,7 +20,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);
-
---- a/arch/arm/mach-cns3xxx/laguna.c
-+++ b/arch/arm/mach-cns3xxx/laguna.c
-@@ -611,7 +611,7 @@ static struct map_desc laguna_io_desc[]
-
- static void __init laguna_map_io(void)
- {
-- cns3xxx_map_io();
-+ cns3xxx_common_init();
- iotable_init(laguna_io_desc, ARRAY_SIZE(laguna_io_desc));
- laguna_early_serial_setup();
- }