summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorYe Li <ye.li@nxp.com>2016-03-10 10:07:28 +0800
committerYe Li <ye.li@nxp.com>2016-03-25 15:48:32 +0800
commitdaa2f1771ac0b21dc0e9d9d84a3ab66b6b70e1ef (patch)
tree1a0c17f4df58e7b715f17c4f21cd28c82c2911f7 /drivers
parent01cc7d9bc205251c13712418d51f3a4d7b20861b (diff)
downloadu-boot-imx-daa2f1771ac0b21dc0e9d9d84a3ab66b6b70e1ef.zip
u-boot-imx-daa2f1771ac0b21dc0e9d9d84a3ab66b6b70e1ef.tar.gz
u-boot-imx-daa2f1771ac0b21dc0e9d9d84a3ab66b6b70e1ef.tar.bz2
MLK-12416-6 imx: rdc: misc fix and update
Change CONFIG_MXC_RDC to CONFIG_IMX_RDC. Do misc update in board header file to support RDC for M4 usage. Fix rdc interface imx_rdc_check_permission change in mxc_gpio. Signed-off-by: Peng Fan <peng.fan@nxp.com> Signed-off-by: Ye Li <ye.li@nxp.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpio/mxc_gpio.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
index 6efe031..3631803 100644
--- a/drivers/gpio/mxc_gpio.c
+++ b/drivers/gpio/mxc_gpio.c
@@ -17,7 +17,7 @@
#include <asm/gpio.h>
#include <asm/io.h>
#include <errno.h>
-#ifdef CONFIG_MXC_RDC
+#ifdef CONFIG_IMX_RDC
#include <asm/imx-common/rdc-sema.h>
#include <asm/arch/imx-rdc.h>
#endif
@@ -65,7 +65,7 @@ static unsigned long gpio_ports[] = {
#endif
};
-#ifdef CONFIG_MXC_RDC
+#ifdef CONFIG_IMX_RDC
static unsigned int gpio_rdc[] = {
RDC_PER_GPIO1,
RDC_PER_GPIO2,
@@ -76,7 +76,7 @@ static unsigned int gpio_rdc[] = {
RDC_PER_GPIO7,
};
-#define RDC_CHECK(x) imx_rdc_check_permission(gpio_rdc[x])
+#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