Patchwork [U-Boot,06/20] iMX28: Add GPIO control

login
register
mail settings
Submitter Marek Vasut
Date Nov. 9, 2011, 9:18 a.m.
Message ID <1320830307-4762-7-git-send-email-marek.vasut@gmail.com>
Download mbox | patch
Permalink /patch/124508/
State Accepted
Commit 6b6440def8ebe1001aa19cab3eb4d13cba12d9c5
Delegated to: Stefano Babic
Headers show

Comments

Marek Vasut - Nov. 9, 2011, 9:18 a.m.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Detlev Zundel <dzu@denx.de>
---
 arch/arm/cpu/arm926ejs/mx28/mx28.c    |    6 ++
 arch/arm/include/asm/arch-mx28/gpio.h |   32 ++++++++
 drivers/gpio/Makefile                 |    1 +
 drivers/gpio/mxs_gpio.c               |  136 +++++++++++++++++++++++++++++++++
 4 files changed, 175 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/include/asm/arch-mx28/gpio.h
 create mode 100644 drivers/gpio/mxs_gpio.c
Stefano Babic - Nov. 10, 2011, 1:11 p.m.
On 11/09/2011 10:18 AM, Marek Vasut wrote:
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Detlev Zundel <dzu@denx.de>
> ---
>  arch/arm/cpu/arm926ejs/mx28/mx28.c    |    6 ++
>  arch/arm/include/asm/arch-mx28/gpio.h |   32 ++++++++
>  drivers/gpio/Makefile                 |    1 +
>  drivers/gpio/mxs_gpio.c               |  136 +++++++++++++++++++++++++++++++++
>  4 files changed, 175 insertions(+), 0 deletions(-)
>  create mode 100644 arch/arm/include/asm/arch-mx28/gpio.h
>  create mode 100644 drivers/gpio/mxs_gpio.c
> 
> diff --git a/arch/arm/cpu/arm926ejs/mx28/mx28.c b/arch/arm/cpu/arm926ejs/mx28/mx28.c
> index 446ea8b..e990f3c 100644
> --- a/arch/arm/cpu/arm926ejs/mx28/mx28.c
> +++ b/arch/arm/cpu/arm926ejs/mx28/mx28.c
> @@ -31,6 +31,7 @@
>  #include <asm/io.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/gpio.h>
> +#include <asm/arch/iomux.h>
>  #include <asm/arch/imx-regs.h>
>  #include <asm/arch/sys_proto.h>
>  
> @@ -134,6 +135,11 @@ int arch_cpu_init(void)
>  
>  	udelay(1000);
>  
> +	/*
> +	 * Configure GPIO unit
> +	 */
> +	mxs_gpio_init();
> +
>  	return 0;
>  }
>  #endif
> diff --git a/arch/arm/include/asm/arch-mx28/gpio.h b/arch/arm/include/asm/arch-mx28/gpio.h
> new file mode 100644
> index 0000000..be1c944
> --- /dev/null
> +++ b/arch/arm/include/asm/arch-mx28/gpio.h
> @@ -0,0 +1,32 @@
> +/*
> + * Freescale i.MX28 GPIO
> + *
> + * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
> + * on behalf of DENX Software Engineering GmbH
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
> + *
> + */
> +
> +#ifndef	__MX28_GPIO_H__
> +#define	__MX28_GPIO_H__
> +
> +#ifdef	CONFIG_MXS_GPIO
> +void mxs_gpio_init(void);
> +#else
> +inline void mxs_gpio_init(void) {}
> +#endif
> +
> +#endif	/* __MX28_GPIO_H__ */
> diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
> index f505813..e1142d1 100644
> --- a/drivers/gpio/Makefile
> +++ b/drivers/gpio/Makefile
> @@ -30,6 +30,7 @@ COBJS-$(CONFIG_KIRKWOOD_GPIO)	+= kw_gpio.o
>  COBJS-$(CONFIG_MARVELL_GPIO)	+= mvgpio.o
>  COBJS-$(CONFIG_MARVELL_MFP)	+= mvmfp.o
>  COBJS-$(CONFIG_MXC_GPIO)	+= mxc_gpio.o
> +COBJS-$(CONFIG_MXS_GPIO)	+= mxs_gpio.o
>  COBJS-$(CONFIG_PCA953X)		+= pca953x.o
>  COBJS-$(CONFIG_PCA9698)		+= pca9698.o
>  COBJS-$(CONFIG_S5P)		+= s5p_gpio.o
> diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c
> new file mode 100644
> index 0000000..b7e9591
> --- /dev/null
> +++ b/drivers/gpio/mxs_gpio.c
> @@ -0,0 +1,136 @@
> +/*
> + * Freescale i.MX28 GPIO control code
> + *
> + * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
> + * on behalf of DENX Software Engineering GmbH
> + *
> + * See file CREDITS for list of people who contributed to this
> + * project.
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of
> + * the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> + * MA 02111-1307 USA
> + */
> +
> +#include <common.h>
> +#include <netdev.h>
> +#include <asm/errno.h>
> +#include <asm/io.h>
> +#include <asm/arch/iomux.h>
> +#include <asm/arch/imx-regs.h>
> +
> +#if	defined(CONFIG_MX23)
> +#define	PINCTRL_BANKS		3
> +#define	PINCTRL_DOUT(n)		(0x0500 + ((n) * 0x10))
> +#define	PINCTRL_DIN(n)		(0x0600 + ((n) * 0x10))
> +#define	PINCTRL_DOE(n)		(0x0700 + ((n) * 0x10))
> +#define	PINCTRL_PIN2IRQ(n)	(0x0800 + ((n) * 0x10))
> +#define	PINCTRL_IRQEN(n)	(0x0900 + ((n) * 0x10))
> +#define	PINCTRL_IRQSTAT(n)	(0x0c00 + ((n) * 0x10))
> +#elif	defined(CONFIG_MX28)
> +#define	PINCTRL_BANKS		5
> +#define	PINCTRL_DOUT(n)		(0x0700 + ((n) * 0x10))
> +#define	PINCTRL_DIN(n)		(0x0900 + ((n) * 0x10))
> +#define	PINCTRL_DOE(n)		(0x0b00 + ((n) * 0x10))
> +#define	PINCTRL_PIN2IRQ(n)	(0x1000 + ((n) * 0x10))
> +#define	PINCTRL_IRQEN(n)	(0x1100 + ((n) * 0x10))
> +#define	PINCTRL_IRQSTAT(n)	(0x1400 + ((n) * 0x10))
> +#else
> +#error "Please select CONFIG_MX23 or CONFIG_MX28"
> +#endif
> +
> +#define GPIO_INT_FALL_EDGE	0x0
> +#define GPIO_INT_LOW_LEV	0x1
> +#define GPIO_INT_RISE_EDGE	0x2
> +#define GPIO_INT_HIGH_LEV	0x3
> +#define GPIO_INT_LEV_MASK	(1 << 0)
> +#define GPIO_INT_POL_MASK	(1 << 1)
> +
> +void mxs_gpio_init(void)
> +{
> +	int i;
> +
> +	for (i = 0; i < PINCTRL_BANKS; i++) {
> +		writel(0, MXS_PINCTRL_BASE + PINCTRL_PIN2IRQ(i));
> +		writel(0, MXS_PINCTRL_BASE + PINCTRL_IRQEN(i));
> +		/* Use SCT address here to clear the IRQSTAT bits */
> +		writel(0xffffffff, MXS_PINCTRL_BASE + PINCTRL_IRQSTAT(i) + 8);
> +	}
> +}
> +
> +int gpio_get_value(int gp)
> +{
> +	uint32_t bank = PAD_BANK(gp);
> +	uint32_t offset = PINCTRL_DIN(bank);
> +	struct mx28_register *reg =
> +		(struct mx28_register *)(MXS_PINCTRL_BASE + offset);
> +
> +	return (readl(&reg->reg) >> PAD_PIN(gp)) & 1;
> +}
> +
> +void gpio_set_value(int gp, int value)
> +{
> +	uint32_t bank = PAD_BANK(gp);
> +	uint32_t offset = PINCTRL_DOUT(bank);
> +	struct mx28_register *reg =
> +		(struct mx28_register *)(MXS_PINCTRL_BASE + offset);
> +
> +	if (value)
> +		writel(1 << PAD_PIN(gp), &reg->reg_set);
> +	else
> +		writel(1 << PAD_PIN(gp), &reg->reg_clr);
> +}
> +
> +int gpio_direction_input(int gp)
> +{
> +	uint32_t bank = PAD_BANK(gp);
> +	uint32_t offset = PINCTRL_DOE(bank);
> +	struct mx28_register *reg =
> +		(struct mx28_register *)(MXS_PINCTRL_BASE + offset);
> +
> +	writel(1 << PAD_PIN(gp), &reg->reg_clr);
> +
> +	return 0;
> +}
> +
> +int gpio_direction_output(int gp, int value)
> +{
> +	uint32_t bank = PAD_BANK(gp);
> +	uint32_t offset = PINCTRL_DOE(bank);
> +	struct mx28_register *reg =
> +		(struct mx28_register *)(MXS_PINCTRL_BASE + offset);
> +
> +	writel(1 << PAD_PIN(gp), &reg->reg_set);
> +
> +	gpio_set_value(gp, value);
> +
> +	return 0;
> +}
> +
> +int gpio_request(int gp, const char *label)
> +{
> +	if (PAD_BANK(gp) > PINCTRL_BANKS)
> +		return -EINVAL;
> +
> +	return 0;
> +}
> +
> +void gpio_free(int gp)
> +{
> +}
> +
> +void gpio_toggle_value(int gp)
> +{
> +	gpio_set_value(gp, !gpio_get_value(gp));
> +}

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic
Mike Frysinger - Nov. 10, 2011, 4:23 p.m.
On Wednesday 09 November 2011 04:18:13 Marek Vasut wrote:
> +int gpio_request(int gp, const char *label)

all of these gpio funcs should be "unsigned gpio"
-mike
Marek Vasut - Nov. 10, 2011, 4:58 p.m.
> On Wednesday 09 November 2011 04:18:13 Marek Vasut wrote:
> > +int gpio_request(int gp, const char *label)
> 
> all of these gpio funcs should be "unsigned gpio"
> -mike

It's a problem of API then?

include/asm/gpio.h:int gpio_request(int gp, const char *label);

TBH, I can't imagine gpio number to be lower than zero, but who knows.

M
Mike Frysinger - Nov. 10, 2011, 5:10 p.m.
On Thursday 10 November 2011 11:58:17 Marek Vasut wrote:
> > On Wednesday 09 November 2011 04:18:13 Marek Vasut wrote:
> > > +int gpio_request(int gp, const char *label)
> > 
> > all of these gpio funcs should be "unsigned gpio"
> 
> It's a problem of API then?
> 
> include/asm/gpio.h:int gpio_request(int gp, const char *label);

a patch has been posted already to fix that

> TBH, I can't imagine gpio number to be lower than zero, but who knows.

such a value makes no sense.  the incoming number is interpreted by the gpio 
driver, so the starting/ending numbers are completely arbitrary.  thus we deal 
with unsigned only.
-mike
Marek Vasut - Nov. 10, 2011, 5:44 p.m.
> On Thursday 10 November 2011 11:58:17 Marek Vasut wrote:
> > > On Wednesday 09 November 2011 04:18:13 Marek Vasut wrote:
> > > > +int gpio_request(int gp, const char *label)
> > > 
> > > all of these gpio funcs should be "unsigned gpio"
> > 
> > It's a problem of API then?
> > 
> > include/asm/gpio.h:int gpio_request(int gp, const char *label);
> 
> a patch has been posted already to fix that

Posted, yes ... applied?

> 
> > TBH, I can't imagine gpio number to be lower than zero, but who knows.
> 
> such a value makes no sense.  the incoming number is interpreted by the
> gpio driver, so the starting/ending numbers are completely arbitrary. 
> thus we deal with unsigned only.
> -mike

Definitelly.

Patch

diff --git a/arch/arm/cpu/arm926ejs/mx28/mx28.c b/arch/arm/cpu/arm926ejs/mx28/mx28.c
index 446ea8b..e990f3c 100644
--- a/arch/arm/cpu/arm926ejs/mx28/mx28.c
+++ b/arch/arm/cpu/arm926ejs/mx28/mx28.c
@@ -31,6 +31,7 @@ 
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/gpio.h>
+#include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 
@@ -134,6 +135,11 @@  int arch_cpu_init(void)
 
 	udelay(1000);
 
+	/*
+	 * Configure GPIO unit
+	 */
+	mxs_gpio_init();
+
 	return 0;
 }
 #endif
diff --git a/arch/arm/include/asm/arch-mx28/gpio.h b/arch/arm/include/asm/arch-mx28/gpio.h
new file mode 100644
index 0000000..be1c944
--- /dev/null
+++ b/arch/arm/include/asm/arch-mx28/gpio.h
@@ -0,0 +1,32 @@ 
+/*
+ * Freescale i.MX28 GPIO
+ *
+ * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
+ * on behalf of DENX Software Engineering GmbH
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#ifndef	__MX28_GPIO_H__
+#define	__MX28_GPIO_H__
+
+#ifdef	CONFIG_MXS_GPIO
+void mxs_gpio_init(void);
+#else
+inline void mxs_gpio_init(void) {}
+#endif
+
+#endif	/* __MX28_GPIO_H__ */
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index f505813..e1142d1 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -30,6 +30,7 @@  COBJS-$(CONFIG_KIRKWOOD_GPIO)	+= kw_gpio.o
 COBJS-$(CONFIG_MARVELL_GPIO)	+= mvgpio.o
 COBJS-$(CONFIG_MARVELL_MFP)	+= mvmfp.o
 COBJS-$(CONFIG_MXC_GPIO)	+= mxc_gpio.o
+COBJS-$(CONFIG_MXS_GPIO)	+= mxs_gpio.o
 COBJS-$(CONFIG_PCA953X)		+= pca953x.o
 COBJS-$(CONFIG_PCA9698)		+= pca9698.o
 COBJS-$(CONFIG_S5P)		+= s5p_gpio.o
diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c
new file mode 100644
index 0000000..b7e9591
--- /dev/null
+++ b/drivers/gpio/mxs_gpio.c
@@ -0,0 +1,136 @@ 
+/*
+ * Freescale i.MX28 GPIO control code
+ *
+ * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
+ * on behalf of DENX Software Engineering GmbH
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <netdev.h>
+#include <asm/errno.h>
+#include <asm/io.h>
+#include <asm/arch/iomux.h>
+#include <asm/arch/imx-regs.h>
+
+#if	defined(CONFIG_MX23)
+#define	PINCTRL_BANKS		3
+#define	PINCTRL_DOUT(n)		(0x0500 + ((n) * 0x10))
+#define	PINCTRL_DIN(n)		(0x0600 + ((n) * 0x10))
+#define	PINCTRL_DOE(n)		(0x0700 + ((n) * 0x10))
+#define	PINCTRL_PIN2IRQ(n)	(0x0800 + ((n) * 0x10))
+#define	PINCTRL_IRQEN(n)	(0x0900 + ((n) * 0x10))
+#define	PINCTRL_IRQSTAT(n)	(0x0c00 + ((n) * 0x10))
+#elif	defined(CONFIG_MX28)
+#define	PINCTRL_BANKS		5
+#define	PINCTRL_DOUT(n)		(0x0700 + ((n) * 0x10))
+#define	PINCTRL_DIN(n)		(0x0900 + ((n) * 0x10))
+#define	PINCTRL_DOE(n)		(0x0b00 + ((n) * 0x10))
+#define	PINCTRL_PIN2IRQ(n)	(0x1000 + ((n) * 0x10))
+#define	PINCTRL_IRQEN(n)	(0x1100 + ((n) * 0x10))
+#define	PINCTRL_IRQSTAT(n)	(0x1400 + ((n) * 0x10))
+#else
+#error "Please select CONFIG_MX23 or CONFIG_MX28"
+#endif
+
+#define GPIO_INT_FALL_EDGE	0x0
+#define GPIO_INT_LOW_LEV	0x1
+#define GPIO_INT_RISE_EDGE	0x2
+#define GPIO_INT_HIGH_LEV	0x3
+#define GPIO_INT_LEV_MASK	(1 << 0)
+#define GPIO_INT_POL_MASK	(1 << 1)
+
+void mxs_gpio_init(void)
+{
+	int i;
+
+	for (i = 0; i < PINCTRL_BANKS; i++) {
+		writel(0, MXS_PINCTRL_BASE + PINCTRL_PIN2IRQ(i));
+		writel(0, MXS_PINCTRL_BASE + PINCTRL_IRQEN(i));
+		/* Use SCT address here to clear the IRQSTAT bits */
+		writel(0xffffffff, MXS_PINCTRL_BASE + PINCTRL_IRQSTAT(i) + 8);
+	}
+}
+
+int gpio_get_value(int gp)
+{
+	uint32_t bank = PAD_BANK(gp);
+	uint32_t offset = PINCTRL_DIN(bank);
+	struct mx28_register *reg =
+		(struct mx28_register *)(MXS_PINCTRL_BASE + offset);
+
+	return (readl(&reg->reg) >> PAD_PIN(gp)) & 1;
+}
+
+void gpio_set_value(int gp, int value)
+{
+	uint32_t bank = PAD_BANK(gp);
+	uint32_t offset = PINCTRL_DOUT(bank);
+	struct mx28_register *reg =
+		(struct mx28_register *)(MXS_PINCTRL_BASE + offset);
+
+	if (value)
+		writel(1 << PAD_PIN(gp), &reg->reg_set);
+	else
+		writel(1 << PAD_PIN(gp), &reg->reg_clr);
+}
+
+int gpio_direction_input(int gp)
+{
+	uint32_t bank = PAD_BANK(gp);
+	uint32_t offset = PINCTRL_DOE(bank);
+	struct mx28_register *reg =
+		(struct mx28_register *)(MXS_PINCTRL_BASE + offset);
+
+	writel(1 << PAD_PIN(gp), &reg->reg_clr);
+
+	return 0;
+}
+
+int gpio_direction_output(int gp, int value)
+{
+	uint32_t bank = PAD_BANK(gp);
+	uint32_t offset = PINCTRL_DOE(bank);
+	struct mx28_register *reg =
+		(struct mx28_register *)(MXS_PINCTRL_BASE + offset);
+
+	writel(1 << PAD_PIN(gp), &reg->reg_set);
+
+	gpio_set_value(gp, value);
+
+	return 0;
+}
+
+int gpio_request(int gp, const char *label)
+{
+	if (PAD_BANK(gp) > PINCTRL_BANKS)
+		return -EINVAL;
+
+	return 0;
+}
+
+void gpio_free(int gp)
+{
+}
+
+void gpio_toggle_value(int gp)
+{
+	gpio_set_value(gp, !gpio_get_value(gp));
+}