ENGR00315894-60 GPIO: Modify driver mxc_gpio to support RDC Semaphores

For GPIO group which shared by multiple masters, it may set in RDC
to shared and semaphore required. Before access the GPIO register,
the GPIO driver must get the RDC semaphore, and release the semaphore
after the GPIO register access.

When CONFIG_MXC_RDC is set, the features related to RDC semaphores
is enabled in mxc_gpio driver.

Signed-off-by: Ye.Li <B37916@freescale.com>
(cherry picked from commit 84d63e2e2ce12f714e88baad8b2325684614a7c1)
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Conflicts:
	drivers/gpio/mxc_gpio.c

(cherry picked from commit c9943b9c8a78bb2c9886bfe582e82978387d8dee)
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
(cherry picked from commit faf94726cac8316c4342e19936f1e03ef283ace3)
(cherry picked from commit 6c0474fe0e4fc543c62b22c05c2702a881f56418)
(cherry picked from commit 7cd5fec7ce6a9ecfdaa1a9c1aaaa0d0ac18a4f86)
(cherry picked from commit 74d68c1b9f098c44992d591616372f0ec5ff13dd)
(cherry picked from commit 208c009aa15453349ee9272d62e2c1cebe14ecab)
(cherry picked from commit 59777a11b1e923f3222a34d243884efaf9cd59d6)

diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
index 35311cd..90deda1 100644 (file)
--- a/drivers/gpio/mxc_gpio.c
+++ b/drivers/gpio/mxc_gpio.c
@@ -5,6 +5,9 @@
  *
  * Copyright (C) 2011
  * Stefano Babic, DENX Software Engineering, <sbabic@denx.de>
+ *
+ * Copyright (C) 2015-2016 Freescale Semiconductor, Inc.
+ *
  */
 #include <common.h>
 #include <errno.h>
@@ -15,6 +18,10 @@
 #include <asm/io.h>
 #include <dt-structs.h>
 #include <mapmem.h>
+#ifdef CONFIG_IMX_RDC
+#include <asm/mach-imx/rdc-sema.h>
+#include <asm/arch/imx-rdc.h>
+#endif
 
 enum mxc_gpio_direction {
        MXC_GPIO_DIRECTION_IN,
@@ -70,6 +77,27 @@ static unsigned long gpio_ports[] = {
 #endif
 };
 
+#ifdef CONFIG_IMX_RDC
+static unsigned int gpio_rdc[] = {
+       RDC_PER_GPIO1,
+       RDC_PER_GPIO2,
+       RDC_PER_GPIO3,
+       RDC_PER_GPIO4,
+       RDC_PER_GPIO5,
+       RDC_PER_GPIO6,
+       RDC_PER_GPIO7,
+};
+
+#define RDC_CHECK(x) imx_rdc_check_permission(gpio_rdc[x], 0)
+#define RDC_SPINLOCK_UP(x) imx_rdc_sema_lock(gpio_rdc[x])
+#define RDC_SPINLOCK_DOWN(x) imx_rdc_sema_unlock(gpio_rdc[x])
+#else
+#define RDC_CHECK(x) 0
+#define RDC_SPINLOCK_UP(x)
+#define RDC_SPINLOCK_DOWN(x)
+#endif
+
+
 static int mxc_gpio_direction(unsigned int gpio,
        enum mxc_gpio_direction direction)
 {
@@ -80,6 +108,11 @@ static int mxc_gpio_direction(unsigned int gpio,
        if (port >= ARRAY_SIZE(gpio_ports))
                return -1;
 
+       if (RDC_CHECK(port))
+               return -1;
+
+       RDC_SPINLOCK_UP(port);
+
        gpio &= 0x1f;
 
        regs = (struct gpio_regs *)gpio_ports[port];
@@ -95,6 +128,8 @@ static int mxc_gpio_direction(unsigned int gpio,
        }
        writel(l, &regs->gpio_dir);
 
+       RDC_SPINLOCK_DOWN(port);
+
        return 0;
 }
 
@@ -107,6 +142,11 @@ int gpio_set_value(unsigned gpio, int value)
        if (port >= ARRAY_SIZE(gpio_ports))
                return -1;
 
+       if (RDC_CHECK(port))
+               return -1;
+
+       RDC_SPINLOCK_UP(port);
+
        gpio &= 0x1f;
 
        regs = (struct gpio_regs *)gpio_ports[port];
@@ -118,6 +158,8 @@ int gpio_set_value(unsigned gpio, int value)
                l &= ~(1 << gpio);
        writel(l, &regs->gpio_dr);
 
+       RDC_SPINLOCK_DOWN(port);
+
        return 0;
 }
 
@@ -130,12 +172,19 @@ int gpio_get_value(unsigned gpio)
        if (port >= ARRAY_SIZE(gpio_ports))
                return -1;
 
+       if (RDC_CHECK(port))
+               return -1;
+
+       RDC_SPINLOCK_UP(port);
+
        gpio &= 0x1f;
 
        regs = (struct gpio_regs *)gpio_ports[port];
 
        val = (readl(&regs->gpio_dr) >> gpio) & 0x01;
 
+       RDC_SPINLOCK_DOWN(port);
+
        return val;
 }
 
@@ -144,6 +193,10 @@ int gpio_request(unsigned gpio, const char *label)
        unsigned int port = GPIO_TO_PORT(gpio);
        if (port >= ARRAY_SIZE(gpio_ports))
                return -1;
+
+       if (RDC_CHECK(port))
+               return -1;
+
        return 0;
 }