Blackfin arch: Add Support for Peripheral PortMux and resouce allocation

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>

1 files changed, 160 insertions, 29 deletions

diff --git a/arch/blackfin/mach-bf548/gpio.c b/arch/blackfin/mach-bf548/gpio.c
index 9b1a00aabf28..0da5f0003b8c 100644
--- a/arch/blackfin/mach-bf548/gpio.c
+++ b/arch/blackfin/mach-bf548/gpio.c
@@ -31,38 +31,64 @@
 #include <linux/err.h>
 #include <asm/blackfin.h>
 #include <asm/gpio.h>
+#include <asm/portmux.h>
 #include <linux/irq.h>
 
 static struct gpio_port_t *gpio_array[gpio_bank(MAX_BLACKFIN_GPIOS)] = {
-        (struct gpio_port_t *) PORTA_FER,
-        (struct gpio_port_t *) PORTB_FER,
-        (struct gpio_port_t *) PORTC_FER,
-        (struct gpio_port_t *) PORTD_FER,
-        (struct gpio_port_t *) PORTE_FER,
-        (struct gpio_port_t *) PORTF_FER,
-        (struct gpio_port_t *) PORTG_FER,
-        (struct gpio_port_t *) PORTH_FER,
-        (struct gpio_port_t *) PORTI_FER,
-        (struct gpio_port_t *) PORTJ_FER,
+        (struct gpio_port_t *)PORTA_FER,
+        (struct gpio_port_t *)PORTB_FER,
+        (struct gpio_port_t *)PORTC_FER,
+        (struct gpio_port_t *)PORTD_FER,
+        (struct gpio_port_t *)PORTE_FER,
+        (struct gpio_port_t *)PORTF_FER,
+        (struct gpio_port_t *)PORTG_FER,
+        (struct gpio_port_t *)PORTH_FER,
+        (struct gpio_port_t *)PORTI_FER,
+        (struct gpio_port_t *)PORTJ_FER,
 };
 
-static unsigned short reserved_map[gpio_bank(MAX_BLACKFIN_GPIOS)];
+static unsigned short reserved_gpio_map[gpio_bank(MAX_BLACKFIN_GPIOS)];
+static unsigned short reserved_peri_map[gpio_bank(MAX_BLACKFIN_GPIOS)];
 
 inline int check_gpio(unsigned short gpio)
 {
-        if (gpio == GPIO_PB15 || gpio == GPIO_PC14 || gpio == GPIO_PC15 \
-                        || gpio == GPIO_PH14 || gpio == GPIO_PH15 \
-                        || gpio == GPIO_PJ14 || gpio == GPIO_PJ15 \
-                        || gpio > MAX_BLACKFIN_GPIOS)
+        if (gpio == GPIO_PB15 || gpio == GPIO_PC14 || gpio == GPIO_PC15
+            || gpio == GPIO_PH14 || gpio == GPIO_PH15
+            || gpio == GPIO_PJ14 || gpio == GPIO_PJ15
+            || gpio > MAX_BLACKFIN_GPIOS)
                 return -EINVAL;
         return 0;
 }
 
+inline void portmux_setup(unsigned short portno, unsigned short function)
+{
+        u32 pmux;
+
+        pmux = gpio_array[gpio_bank(portno)]->port_mux;
+
+        pmux &= ~(0x3 << (2 * gpio_sub_n(portno)));
+        pmux |= (function & 0x3) << (2 * gpio_sub_n(portno));
+
+        gpio_array[gpio_bank(portno)]->port_mux = pmux;
+
+}
+
+inline u16 get_portmux(unsigned short portno)
+{
+        u32 pmux;
+
+        pmux = gpio_array[gpio_bank(portno)]->port_mux;
+
+        return (pmux >> (2 * gpio_sub_n(portno)) & 0x3);
+
+}
+
 static void port_setup(unsigned short gpio, unsigned short usage)
 {
         if (usage == GPIO_USAGE) {
                 if (gpio_array[gpio_bank(gpio)]->port_fer & gpio_bit(gpio))
-                        printk(KERN_WARNING "bfin-gpio: Possible Conflict with Peripheral "
+                        printk(KERN_WARNING
+                               "bfin-gpio: Possible Conflict with Peripheral "
                                "usage and GPIO %d detected!\n", gpio);
                 gpio_array[gpio_bank(gpio)]->port_fer &= ~gpio_bit(gpio);
         } else
@@ -72,18 +98,116 @@ static void port_setup(unsigned short gpio, unsigned short usage)
 
 static int __init bfin_gpio_init(void)
 {
-        int i;
-
         printk(KERN_INFO "Blackfin GPIO Controller\n");
 
-        for (i = 0; i < MAX_BLACKFIN_GPIOS; i += GPIO_BANKSIZE)
-                reserved_map[gpio_bank(i)] = 0;
-
         return 0;
 }
 
 arch_initcall(bfin_gpio_init);
 
+int peripheral_request(unsigned short per, const char *label)
+{
+        unsigned long flags;
+        unsigned short ident = P_IDENT(per);
+
+        if (!(per & P_DEFINED))
+                return -ENODEV;
+
+        if (check_gpio(ident) < 0)
+                return -EINVAL;
+
+        local_irq_save(flags);
+
+        if (unlikely(reserved_gpio_map[gpio_bank(ident)] & gpio_bit(ident))) {
+                printk(KERN_ERR
+                       "%s: Peripheral %d is already reserved as GPIO!\n",
+                       __FUNCTION__, per);
+                dump_stack();
+                local_irq_restore(flags);
+                return -EBUSY;
+        }
+
+        if (unlikely(reserved_peri_map[gpio_bank(ident)] & gpio_bit(ident))) {
+
+                u16 funct = get_portmux(ident);
+
+                if (!((per & P_MAYSHARE) && (funct == P_FUNCT2MUX(per)))) {
+                        printk(KERN_ERR
+                               "%s: Peripheral %d is already reserved!\n",
+                               __FUNCTION__, per);
+                        dump_stack();
+                        local_irq_restore(flags);
+                        return -EBUSY;
+                }
+        }
+
+        reserved_peri_map[gpio_bank(ident)] |= gpio_bit(ident);
+
+        portmux_setup(ident, P_FUNCT2MUX(per));
+        port_setup(ident, PERIPHERAL_USAGE);
+
+        local_irq_restore(flags);
+
+        return 0;
+}
+EXPORT_SYMBOL(peripheral_request);
+
+int peripheral_request_list(unsigned short per[], const char *label)
+{
+
+        u16 cnt;
+        int ret;
+
+        for (cnt = 0; per[cnt] != 0; cnt++) {
+                ret = peripheral_request(per[cnt], label);
+                if (ret < 0)
+                        return ret;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL(peripheral_request_list);
+
+void peripheral_free(unsigned short per)
+{
+        unsigned long flags;
+        unsigned short ident = P_IDENT(per);
+
+        if (!(per & P_DEFINED))
+                return;
+
+        if (check_gpio(ident) < 0)
+                return;
+
+        local_irq_save(flags);
+
+        if (unlikely(!(reserved_peri_map[gpio_bank(ident)] & gpio_bit(ident)))) {
+                printk(KERN_ERR "bfin-gpio: Peripheral %d wasn't reserved!\n", per);
+                dump_stack();
+                local_irq_restore(flags);
+                return;
+        }
+
+        if (!(per & P_MAYSHARE)) {
+                port_setup(ident, GPIO_USAGE);
+        }
+
+        reserved_peri_map[gpio_bank(ident)] &= ~gpio_bit(ident);
+
+        local_irq_restore(flags);
+}
+EXPORT_SYMBOL(peripheral_free);
+
+void peripheral_free_list(unsigned short per[])
+{
+        u16 cnt;
+
+        for (cnt = 0; per[cnt] != 0; cnt++) {
+                peripheral_free(per[cnt]);
+        }
+
+}
+EXPORT_SYMBOL(peripheral_free_list);
 
 /***********************************************************
 *
@@ -109,13 +233,22 @@ int gpio_request(unsigned short gpio, const char *label)
 
         local_irq_save(flags);
 
-        if (unlikely(reserved_map[gpio_bank(gpio)] & gpio_bit(gpio))) {
+        if (unlikely(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio))) {
                 printk(KERN_ERR "bfin-gpio: GPIO %d is already reserved!\n", gpio);
                 dump_stack();
                 local_irq_restore(flags);
                 return -EBUSY;
         }
-        reserved_map[gpio_bank(gpio)] |= gpio_bit(gpio);
+
+        if (unlikely(reserved_peri_map[gpio_bank(gpio)] & gpio_bit(gpio))) {
+                printk(KERN_ERR
+                       "bfin-gpio: GPIO %d is already reserved as Peripheral!\n", gpio);
+                dump_stack();
+                local_irq_restore(flags);
+                return -EBUSY;
+        }
+
+        reserved_gpio_map[gpio_bank(gpio)] |= gpio_bit(gpio);
 
         local_irq_restore(flags);
 
@@ -125,7 +258,6 @@ int gpio_request(unsigned short gpio, const char *label)
 }
 EXPORT_SYMBOL(gpio_request);
 
-
 void gpio_free(unsigned short gpio)
 {
         unsigned long flags;
@@ -135,25 +267,24 @@ void gpio_free(unsigned short gpio)
 
         local_irq_save(flags);
 
-        if (unlikely(!(reserved_map[gpio_bank(gpio)] & gpio_bit(gpio)))) {
+        if (unlikely(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)))) {
                 printk(KERN_ERR "bfin-gpio: GPIO %d wasn't reserved!\n", gpio);
                 dump_stack();
                 local_irq_restore(flags);
                 return;
         }
 
-        reserved_map[gpio_bank(gpio)] &= ~gpio_bit(gpio);
+        reserved_gpio_map[gpio_bank(gpio)] &= ~gpio_bit(gpio);
 
         local_irq_restore(flags);
 }
 EXPORT_SYMBOL(gpio_free);
 
-
 void gpio_direction_input(unsigned short gpio)
 {
         unsigned long flags;
 
-        BUG_ON(!(reserved_map[gpio_bank(gpio)] & gpio_bit(gpio)));
+        BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)));
 
         local_irq_save(flags);
         gpio_array[gpio_bank(gpio)]->port_dir_clear = gpio_bit(gpio);
@@ -166,7 +297,7 @@ void gpio_direction_output(unsigned short gpio)
 {
         unsigned long flags;
 
-        BUG_ON(!(reserved_map[gpio_bank(gpio)] & gpio_bit(gpio)));
+        BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)));
 
         local_irq_save(flags);
         gpio_array[gpio_bank(gpio)]->port_inen &= ~gpio_bit(gpio);