Skip to contentSkip to conversation

add a new AT91 GPIO driver

PATCH New Jens Scharsig 2 participants 3 messages Jan 23, 2010 – Feb 3, 2010

Subsystems (2)
GPIO Arm/Microchip (AT91) SoC support
lore
Share & tools
lore

Jens Scharsig

author
#0 lore raw

PATCH v3 3/9 add a new AT91 GPIO driver

* add a real AT91 GPIO driver instead of header inline code
* change board config files to use new driver

Signed-off-by Jens Scharsig <[email protected]>
---
 drivers/gpio/Makefile              |    1 +
 drivers/gpio/at91_gpio.c           |  240 ++++++++++++++++++++++++++++++++++++
 include/asm-arm/arch-at91/gpio.h   |  151 +----------------------
 include/configs/afeb9260.h         |    1 +
 include/configs/at91cap9adk.h      |    1 +
 include/configs/at91sam9260ek.h    |    2 +
 include/configs/at91sam9261ek.h    |    2 +
 include/configs/at91sam9263ek.h    |    2 +
 include/configs/at91sam9m10g45ek.h |    2 +
 include/configs/at91sam9rlek.h     |    2 +
 include/configs/cpu9260.h          |    2 +
 include/configs/meesc.h            |    2 +
 include/configs/pm9261.h           |    2 +
 include/configs/pm9263.h           |    2 +
 include/configs/sbc35_a9g20.h      |    2 +
 include/configs/tny_a9260.h        |    2 +
 16 files changed, 268 insertions(+), 148 deletions(-)
 create mode 100644 drivers/gpio/at91_gpio.c
drivers/gpio/Makefile +1 -0
index acba56c..d966082 100644
@@ -25,6 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB 	:= $(obj)libgpio.a
 
+COBJS-$(CONFIG_AT91_GPIO)	+= at91_gpio.o
 COBJS-$(CONFIG_KIRKWOOD_GPIO)	+= kw_gpio.o
 COBJS-$(CONFIG_MX31_GPIO)	+= mx31_gpio.o
 COBJS-$(CONFIG_PCA953X)		+= pca953x.o
drivers/gpio/at91_gpio.c new file +240 -0

240 lines not on this page · raw message

include/asm-arm/arch-at91/gpio.h +3 -148

158 lines not on this page · raw message

include/configs/afeb9260.h +1 -0
index 3b69de8..9f8c567 100644
@@ -47,6 +47,7 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
 #define CONFIG_ATMEL_USART	1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
include/configs/at91cap9adk.h +1 -0
index 4c2782a..9da5846 100644
@@ -49,6 +49,7 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
 #define CONFIG_ATMEL_USART	1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
include/configs/at91sam9260ek.h +2 -0
index a620d57..6d8969b 100644
@@ -54,6 +54,8 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
+
 #define CONFIG_ATMEL_USART	1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
include/configs/at91sam9261ek.h +2 -0
index 832b1cd..e67d899 100644
@@ -52,6 +52,8 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
+
 #define CONFIG_ATMEL_USART	1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
include/configs/at91sam9263ek.h +2 -0
index 1d82a15..dc010f2 100644
@@ -51,6 +51,8 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
+
 #define CONFIG_ATMEL_USART	1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
include/configs/at91sam9m10g45ek.h +2 -0
index 50b118f..d034863 100644
@@ -52,6 +52,8 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
+
 #define CONFIG_ATMEL_USART	1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
include/configs/at91sam9rlek.h +2 -0
index 8db296a..423890b 100644
@@ -49,6 +49,8 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
+
 #define CONFIG_ATMEL_USART	1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
include/configs/cpu9260.h +2 -0
index e967e7c..50e31ff 100644
@@ -244,6 +244,8 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
+
 #define CONFIG_ATMEL_USART	1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
include/configs/meesc.h +2 -0
index 253a53d..13e60e7 100644
@@ -58,6 +58,8 @@
  */
 
 /* Console output */
+#define CONFIG_AT91_GPIO			1
+
 #define CONFIG_ATMEL_USART			1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
include/configs/pm9261.h +2 -0
index 26a2fad..25b6689 100644
@@ -159,6 +159,8 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
+
 #define CONFIG_ATMEL_USART	1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
include/configs/pm9263.h +2 -0
index e55098c..f318a86 100644
@@ -173,6 +173,8 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
+
 #define CONFIG_ATMEL_USART	1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
include/configs/sbc35_a9g20.h +2 -0
index 7bdc729..3f0723f 100644
@@ -59,6 +59,8 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
+
 #define CONFIG_ATMEL_USART
 #define CONFIG_USART0
 #undef CONFIG_USART1
include/configs/tny_a9260.h +2 -0
index 21475f8..466d27b 100644
@@ -68,6 +68,8 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
+
 #define CONFIG_ATMEL_USART	1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
#1 lore raw

PATCH v3 3/9 add a new AT91 GPIO driver

Quoted 50 lines · Jens Scharsig

* add a real AT91 GPIO driver instead of header inline code
* change board config files to use new driver

Signed-off-by Jens Scharsig <[email protected]>
---
 drivers/gpio/Makefile              |    1 +
 drivers/gpio/at91_gpio.c           |  240 ++++++++++++++++++++++++++++++++++++
 include/asm-arm/arch-at91/gpio.h   |  151 +----------------------
 include/configs/afeb9260.h         |    1 +
 include/configs/at91cap9adk.h      |    1 +
 include/configs/at91sam9260ek.h    |    2 +
 include/configs/at91sam9261ek.h    |    2 +
 include/configs/at91sam9263ek.h    |    2 +
 include/configs/at91sam9m10g45ek.h |    2 +
 include/configs/at91sam9rlek.h     |    2 +
 include/configs/cpu9260.h          |    2 +
 include/configs/meesc.h            |    2 +
 include/configs/pm9261.h           |    2 +
 include/configs/pm9263.h           |    2 +
 include/configs/sbc35_a9g20.h      |    2 +
 include/configs/tny_a9260.h        |    2 +
 16 files changed, 268 insertions(+), 148 deletions(-)
 create mode 100644 drivers/gpio/at91_gpio.c
drivers/gpio/Makefile +1 -0
index acba56c..d966082 100644
@@ -25,6 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB 	:= $(obj)libgpio.a
 
+COBJS-$(CONFIG_AT91_GPIO)	+= at91_gpio.o
 COBJS-$(CONFIG_KIRKWOOD_GPIO)	+= kw_gpio.o
 COBJS-$(CONFIG_MX31_GPIO)	+= mx31_gpio.o
 COBJS-$(CONFIG_PCA953X)		+= pca953x.o
drivers/gpio/at91_gpio.c new file +8 -0
new file mode 100644
index 0000000..5e50ead
@@ -0,0 +1,240 @@
+/*
+ * Memory Setup stuff - taken from blob memsetup.S
+ *
+ * Copyright (C) 2009 Jens Scharsig (js_at_ng at scharsoft.de)
+ *
+ *  Copyright (C) 2005 HP Labs
+ *
+ * See file CREDITS for list of people who contributed to this

drivers/gpio/at91_gpio.c line 18

Quoted 10 lines
drivers/gpio/at91_gpio.c new file +10 -0
+ * 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

ws
extra tab
Look for these globally

Quoted 17 lines
drivers/gpio/at91_gpio.c new file +17 -0
+ * 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 <config.h>
+#include <common.h>
+#include <asm/sizes.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/io.h>
+#include <asm/arch/at91_pio.h>
+
+#define PIN_BASE		32
+

drivers/gpio/at91_gpio.c line 45

Quoted 10 lines
drivers/gpio/at91_gpio.c new file +10 -0
+u32 portpin_to_port(u32 portpin)
+{
+	return (portpin - PIN_BASE) / 32;
+}
+
+u32 portpin_to_pin(u32 portpin)
+{
+	return 1 << ((portpin - PIN_BASE) % 32);
+}
+

This are only used locally
Change to static

May want to check input.

Quoted 5 lines
drivers/gpio/at91_gpio.c new file +5 -0
+/*
+ * mux the pin to the "GPIO" peripheral role.
+ */
+int at91_set_gpio_periph(unsigned pin, int use_pullup)
+{

drivers/gpio/at91_gpio.c line 60

Quoted 10 lines
drivers/gpio/at91_gpio.c new file +10 -0
+	at91_pio_t	*pio 	= (at91_pio_t *) AT91_PIO_BASE;
+	u32		port	= portpin_to_port(pin);
+	u32 		mask	= portpin_to_pin(pin);
+
+	writel(mask, &pio->port[port].idr);
+	if (use_pullup)
+		writel(mask, &pio->port[port].puer);
+	else
+		writel(mask, &pio->port[port].pudr);
+	writel(mask, &pio->port[port].per);

The next several functions are similar.
The common part could be pulled out into its own function

Quoted 79 lines
drivers/gpio/at91_gpio.c new file +79 -0
+
+	return 0;
+}
+
+/*
+ * mux the pin to the "A" internal peripheral role.
+ */
+int at91_set_a_periph(unsigned pin, int use_pullup)
+{
+	at91_pio_t	*pio 	= (at91_pio_t *) AT91_PIO_BASE;
+	u32		port	= portpin_to_port(pin);
+	u32 		mask	= portpin_to_pin(pin);
+
+	writel(mask, &pio->port[port].idr);
+	if (use_pullup)
+		writel(mask, &pio->port[port].puer);
+	else
+		writel(mask, &pio->port[port].pudr);
+	writel(mask, &pio->port[port].asr);
+	writel(mask, &pio->port[port].pdr);
+
+	return 0;
+}
+
+/*
+ * mux the pin to the "B" internal peripheral role.
+ */
+int at91_set_b_periph(unsigned pin, int use_pullup)
+{
+	at91_pio_t	*pio 	= (at91_pio_t *) AT91_PIO_BASE;
+	u32		port	= portpin_to_port(pin);
+	u32 		mask	= portpin_to_pin(pin);
+
+	writel(mask, &pio->port[port].idr);
+	if (use_pullup)
+		writel(mask, &pio->port[port].puer);
+	else
+		writel(mask, &pio->port[port].pudr);
+	writel(mask, &pio->port[port].bsr);
+	writel(mask, &pio->port[port].pdr);
+
+	return 0;
+}
+
+/*
+ * mux the pin to the gpio controller (instead of "A" or "B" peripheral), and
+ * configure it for an input.
+ */
+int at91_set_gpio_input(u32 pin, int use_pullup)
+{
+	at91_pio_t	*pio 	= (at91_pio_t *) AT91_PIO_BASE;
+	u32		port	= portpin_to_port(pin);
+	u32 		mask	= portpin_to_pin(pin);
+
+	writel(mask, &pio->port[port].idr);
+	if (use_pullup)
+		writel(mask, &pio->port[port].puer);
+	else
+		writel(mask, &pio->port[port].pudr);
+	writel(mask, &pio->port[port].odr);
+	writel(mask, &pio->port[port].per);
+	return 0;
+}
+
+/*
+ * mux the pin to the gpio controller (instead of "A" or "B" peripheral),
+ * and configure it for an output.
+ */
+int at91_set_gpio_output(u32 pin, int value)
+{
+	at91_pio_t	*pio 	= (at91_pio_t *) AT91_PIO_BASE;
+	u32		port	= portpin_to_port(pin);
+	u32 		mask	= portpin_to_pin(pin);
+
+	writel(mask, &pio->port[port].idr);
+	writel(mask, &pio->port[port].pudr);
+	if (value)
+		writel(mask, &pio->port[port].sodr);
+	else

drivers/gpio/at91_gpio.c line 149

Quoted 10 lines
drivers/gpio/at91_gpio.c new file +10 -0
+		writel(mask, &pio->port[port].codr);
+	writel(mask, &pio->port[port].oer);
+	writel(mask, &pio->port[port].per);
+
+	return 0;
+}
+
+/*
+ * enable/disable the glitch filter; mostly used with IRQ handling.
+ */

grammer
';' -> .
Similar below

Quoted 50 lines
drivers/gpio/at91_gpio.c new file +50 -0
+int at91_set_deglitch(unsigned pin, int is_on)
+{
+	at91_pio_t	*pio 	= (at91_pio_t *) AT91_PIO_BASE;
+	u32		port	= portpin_to_port(pin);
+	u32 		mask	= portpin_to_pin(pin);
+
+	if (is_on)
+		writel(mask, &pio->port[port].ifer);
+	else
+		writel(mask, &pio->port[port].ifdr);
+	return 0;
+}
+
+/*
+ * enable/disable the multi-driver; This is only valid for output and
+ * allows the output pin to run as an open collector output.
+ */
+int at91_set_multi_drive(unsigned pin, int is_on)
+{
+	at91_pio_t	*pio 	= (at91_pio_t *) AT91_PIO_BASE;
+	u32		port	= portpin_to_port(pin);
+	u32 		mask	= portpin_to_pin(pin);
+
+	if (is_on)
+		writel(mask, &pio->port[port].mder);
+	else
+		writel(mask, &pio->port[port].mddr);
+	return 0;
+}
+
+/*
+int gpio_direction_input(unsigned pin)
+{
+	at91_pio_t	*pio 	= (at91_pio_t *) AT91_PIO_BASE;
+	u32		port	= portpin_to_port(pin);
+	u32 		mask	= portpin_to_pin(pin);
+
+	if (!(readl(&pio->port[port].psr) & mask))
+		return -EINVAL;
+	writel(mask, &pio->port[port].odr);
+	return 0;
+}
+
+int gpio_direction_output(unsigned pin, int value)
+{
+	at91_pio_t	*pio 	= (at91_pio_t *) AT91_PIO_BASE;
+	u32		port	= portpin_to_port(pin);
+	u32 		mask	= portpin_to_pin(pin);
+
+	if (!(readl(&pio->port[port].psr) & mask))

drivers/gpio/at91_gpio.c line 209

Quoted 10 lines
drivers/gpio/at91_gpio.c new file +10 -0
+		return -EINVAL;
+	if (value)
+		writel(mask, &pio->port[port].sodr);
+	else
+		writel(mask, &pio->port[port].codr);
+	writel(mask, &pio->port[port].oer);
+
+	return 0;
+}
+*/

These are commented out!
These replaces an functions removed. Please uncomment.

drivers/gpio/at91_gpio.c line 219

Quoted 10 lines
drivers/gpio/at91_gpio.c new file +10 -0
+/*
+ * assuming the pin is muxed as a gpio output, set its value.
+ */
+int at91_set_gpio_value(unsigned pin, int value)
+{
+	at91_pio_t	*pio 	= (at91_pio_t *) AT91_PIO_BASE;
+	u32		port	= portpin_to_port(pin);
+	u32 		mask	= portpin_to_pin(pin);
+
+	/* printf("%d = Port %d Pin %d (%d)",pin, port, mask, value); */

Remove printf or add as a debug

Quoted 226 lines
drivers/gpio/at91_gpio.c new file +21 -0
+	if (value)
+		writel(mask, &pio->port[port].sodr);
+	else
+		writel(mask, &pio->port[port].codr);
+	return 0;
+}
+
+/*
+ * read the pin's value (works even if it's not muxed as a gpio).
+ */
+int at91_get_gpio_value(unsigned pin)
+{
+	at91_pio_t	*pio 	= (at91_pio_t *) AT91_PIO_BASE;
+	u32		port	= portpin_to_port(pin);
+	u32 		mask	= portpin_to_pin(pin);
+	u32		pdsr;
+
+	pdsr = readl(&pio->port[port]);
+	return (pdsr & mask) != 0;
+}
+
include/asm-arm/arch-at91/gpio.h +3 -148
index bc53171..b0c572f 100644
@@ -216,155 +216,10 @@ static inline unsigned pin_to_mask(unsigned pin)
 	return 1 << (pin % 32);
 }
 
-/*
- * mux the pin to the "GPIO" peripheral role.
- */
-static inline int at91_set_GPIO_periph(unsigned pin, int use_pullup)
-{
-	void		*pio = pin_to_controller(pin);
-	unsigned	mask = pin_to_mask(pin);
-
-	__raw_writel(mask, pio + PIO_IDR);
-	__raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR));
-	__raw_writel(mask, pio + PIO_PER);
-	return 0;
-}
-
-/*
- * mux the pin to the "A" internal peripheral role.
- */
-static inline int at91_set_A_periph(unsigned pin, int use_pullup)
-{
-	void		*pio = pin_to_controller(pin);
-	unsigned	mask = pin_to_mask(pin);
-
-	__raw_writel(mask, pio + PIO_IDR);
-	__raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR));
-	__raw_writel(mask, pio + PIO_ASR);
-	__raw_writel(mask, pio + PIO_PDR);
-	return 0;
-}
-
-/*
- * mux the pin to the "B" internal peripheral role.
- */
-static inline int at91_set_B_periph(unsigned pin, int use_pullup)
-{
-	void		*pio = pin_to_controller(pin);
-	unsigned	mask = pin_to_mask(pin);
-
-	__raw_writel(mask, pio + PIO_IDR);
-	__raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR));
-	__raw_writel(mask, pio + PIO_BSR);
-	__raw_writel(mask, pio + PIO_PDR);
-	return 0;
-}
-
-/*
- * mux the pin to the gpio controller (instead of "A" or "B" peripheral), and
- * configure it for an input.
- */
-static inline int at91_set_gpio_input(unsigned pin, int use_pullup)
-{
-	void		*pio = pin_to_controller(pin);
-	unsigned	mask = pin_to_mask(pin);
-
-	__raw_writel(mask, pio + PIO_IDR);
-	__raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR));
-	__raw_writel(mask, pio + PIO_ODR);
-	__raw_writel(mask, pio + PIO_PER);
-	return 0;
-}
-
-/*
- * mux the pin to the gpio controller (instead of "A" or "B" peripheral),
- * and configure it for an output.
- */
-static inline int at91_set_gpio_output(unsigned pin, int value)
-{
-	void		*pio = pin_to_controller(pin);
-	unsigned	mask = pin_to_mask(pin);
-
-	__raw_writel(mask, pio + PIO_IDR);
-	__raw_writel(mask, pio + PIO_PUDR);
-	__raw_writel(mask, pio + (value ? PIO_SODR : PIO_CODR));
-	__raw_writel(mask, pio + PIO_OER);
-	__raw_writel(mask, pio + PIO_PER);
-	return 0;
-}
-
-/*
- * enable/disable the glitch filter; mostly used with IRQ handling.
- */
-static inline int at91_set_deglitch(unsigned pin, int is_on)
-{
-	void		*pio = pin_to_controller(pin);
-	unsigned	mask = pin_to_mask(pin);
-
-	__raw_writel(mask, pio + (is_on ? PIO_IFER : PIO_IFDR));
-	return 0;
-}
-
-/*
- * enable/disable the multi-driver; This is only valid for output and
- * allows the output pin to run as an open collector output.
- */
-static inline int at91_set_multi_drive(unsigned pin, int is_on)
-{
-	void		*pio = pin_to_controller(pin);
-	unsigned	mask = pin_to_mask(pin);
-
-	__raw_writel(mask, pio + (is_on ? PIO_MDER : PIO_MDDR));
-	return 0;
-}
-
-static inline int gpio_direction_input(unsigned pin)
-{
-	void		*pio = pin_to_controller(pin);
-	unsigned	mask = pin_to_mask(pin);
-
-	if (!(__raw_readl(pio + PIO_PSR) & mask))
-		return -EINVAL;
-	__raw_writel(mask, pio + PIO_ODR);
-	return 0;
-}
+#define at91_set_GPIO_periph	at91_set_gpio_periph
+#define at91_set_A_periph	at91_set_a_periph
+#define at91_set_B_periph	at91_set_b_periph
 
-static inline int gpio_direction_output(unsigned pin, int value)
-{
-	void		*pio = pin_to_controller(pin);
-	unsigned	mask = pin_to_mask(pin);
-
-	if (!(__raw_readl(pio + PIO_PSR) & mask))
-		return -EINVAL;
-	__raw_writel(mask, pio + (value ? PIO_SODR : PIO_CODR));
-	__raw_writel(mask, pio + PIO_OER);
-	return 0;
-}
-
-/*
- * assuming the pin is muxed as a gpio output, set its value.
- */
-static inline int at91_set_gpio_value(unsigned pin, int value)
-{
-	void		*pio = pin_to_controller(pin);
-	unsigned	mask = pin_to_mask(pin);
-
-	__raw_writel(mask, pio + (value ? PIO_SODR : PIO_CODR));
-	return 0;
-}
-
-/*
- * read the pin's value (works even if it's not muxed as a gpio).
- */
-static inline int at91_get_gpio_value(unsigned pin)
-{
-	void		*pio = pin_to_controller(pin);
-	unsigned	mask = pin_to_mask(pin);
-	u32		pdsr;
-
-	pdsr = __raw_readl(pio + PIO_PDSR);
-	return (pdsr & mask) != 0;
-}
 
 #endif
 #endif
include/configs/afeb9260.h +1 -0
index 3b69de8..9f8c567 100644
@@ -47,6 +47,7 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
 #define CONFIG_ATMEL_USART	1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
include/configs/at91cap9adk.h +1 -0
index 4c2782a..9da5846 100644
@@ -49,6 +49,7 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
 #define CONFIG_ATMEL_USART	1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
include/configs/at91sam9260ek.h +2 -0
index a620d57..6d8969b 100644
@@ -54,6 +54,8 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
+
 #define CONFIG_ATMEL_USART	1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
include/configs/at91sam9261ek.h +0 -0
index 832b1cd..e67d899 100644

include/configs/at91sam9261ek.h line 56

Quoted 5 lines
include/configs/at91sam9261ek.h +2 -0
@@ -52,6 +52,8 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
+

extra spaces are not needed remove here and other similar below

Tom

author
#2 lore raw

PATCH v4 3/9 add a new AT91 GPIO driver

In reply to Jens Scharsig

* add a real AT91 GPIO driver instead of header inline code
* resolve the mixing of port and pins
* change board config files to use new driver
* add macros to gpio to realize backward compatibility

Signed-off-by Jens Scharsig <[email protected]>
---
 drivers/gpio/Makefile                |    1 +
 drivers/gpio/at91_gpio.c             |  214 ++++++++++++++++++++++++++++++++++
 include/asm-arm/arch-at91/at91_pio.h |   14 ++-
 include/asm-arm/arch-at91/gpio.h     |  168 +++------------------------
 include/configs/afeb9260.h           |    1 +
 include/configs/at91cap9adk.h        |    1 +
 include/configs/at91sam9260ek.h      |    1 +
 include/configs/at91sam9261ek.h      |    1 +
 include/configs/at91sam9263ek.h      |    1 +
 include/configs/at91sam9m10g45ek.h   |    1 +
 include/configs/at91sam9rlek.h       |    1 +
 include/configs/cpu9260.h            |    1 +
 include/configs/meesc.h              |    1 +
 include/configs/pm9261.h             |    1 +
 include/configs/pm9263.h             |    1 +
 include/configs/sbc35_a9g20.h        |    1 +
 include/configs/tny_a9260.h          |    1 +
 17 files changed, 258 insertions(+), 152 deletions(-)
 create mode 100644 drivers/gpio/at91_gpio.c
drivers/gpio/Makefile +1 -0
index acba56c..d966082 100644
@@ -25,6 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB 	:= $(obj)libgpio.a
 
+COBJS-$(CONFIG_AT91_GPIO)	+= at91_gpio.o
 COBJS-$(CONFIG_KIRKWOOD_GPIO)	+= kw_gpio.o
 COBJS-$(CONFIG_MX31_GPIO)	+= mx31_gpio.o
 COBJS-$(CONFIG_PCA953X)		+= pca953x.o
drivers/gpio/at91_gpio.c new file +214 -0

214 lines not on this page · raw message

include/asm-arm/arch-at91/at91_pio.h +12 -2
index 92c3717..e5946ca 100644
@@ -100,10 +100,20 @@ typedef union at91_pio {
 	at91_port_t port[AT91_PIO_PORTS];
 } at91_pio_t;
 
+#ifdef CONFIG_AT91_GPIO
+int at91_set_a_periph(unsigned port, unsigned pin, int use_pullup);
+int at91_set_b_periph(unsigned port, unsigned pin, int use_pullup);
+int at91_set_pio_input(unsigned port, unsigned pin, int use_pullup);
+int at91_set_pio_multi_drive(unsigned port, unsigned pin, int is_on);
+int at91_set_pio_output(unsigned port, unsigned pin, int value);
+int at91_set_pio_periph(unsigned port, unsigned pin, int use_pullup);
+int at91_set_pio_pullup(unsigned port, unsigned pin, int use_pullup);
+int at91_set_pio_deglitch(unsigned port, unsigned pin, int is_on);
+int at91_set_pio_value(unsigned port, unsigned pin, int value);
+int at91_get_pio_value(unsigned port, unsigned pin);
+#endif
 #endif
 
-#define AT91_PIN_TO_MASK(x)	(1<<x)
-#define AT91_PORTPIN(PORT, PIN)	((0x0##PORT - 9) * 32 + ((PIN) & 0x1F))
 #define	AT91_PIO_PORTA		0x0
 #define	AT91_PIO_PORTB		0x1
 #define	AT91_PIO_PORTC		0x2
include/asm-arm/arch-at91/gpio.h +18 -150

173 lines not on this page · raw message

include/configs/afeb9260.h +1 -0
index 3b69de8..9f8c567 100644
@@ -47,6 +47,7 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
 #define CONFIG_ATMEL_USART	1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
include/configs/at91cap9adk.h +1 -0
index 4c2782a..9da5846 100644
@@ -49,6 +49,7 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
 #define CONFIG_ATMEL_USART	1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
include/configs/at91sam9260ek.h +1 -0
index a620d57..ff1e5b3 100644
@@ -54,6 +54,7 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
 #define CONFIG_ATMEL_USART	1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
include/configs/at91sam9261ek.h +1 -0
index 832b1cd..63b55d2 100644
@@ -52,6 +52,7 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
 #define CONFIG_ATMEL_USART	1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
include/configs/at91sam9263ek.h +1 -0
index 1d82a15..e39762b 100644
@@ -51,6 +51,7 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
 #define CONFIG_ATMEL_USART	1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
include/configs/at91sam9m10g45ek.h +1 -0
index 50b118f..ce21831 100644
@@ -52,6 +52,7 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
 #define CONFIG_ATMEL_USART	1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
include/configs/at91sam9rlek.h +1 -0
index 8db296a..95f3d6c 100644
@@ -49,6 +49,7 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
 #define CONFIG_ATMEL_USART	1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
include/configs/cpu9260.h +1 -0
index e967e7c..38f34c2 100644
@@ -244,6 +244,7 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
 #define CONFIG_ATMEL_USART	1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
include/configs/meesc.h +1 -0
index 253a53d..d469baa 100644
@@ -58,6 +58,7 @@
  */
 
 /* Console output */
+#define CONFIG_AT91_GPIO			1
 #define CONFIG_ATMEL_USART			1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
include/configs/pm9261.h +1 -0
index 26a2fad..8ee132b 100644
@@ -159,6 +159,7 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
 #define CONFIG_ATMEL_USART	1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
include/configs/pm9263.h +1 -0
index e55098c..a6fdcaa 100644
@@ -173,6 +173,7 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
 #define CONFIG_ATMEL_USART	1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
include/configs/sbc35_a9g20.h +1 -0
index 7bdc729..1f2ff9e 100644
@@ -59,6 +59,7 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
 #define CONFIG_ATMEL_USART
 #define CONFIG_USART0
 #undef CONFIG_USART1
include/configs/tny_a9260.h +1 -0
index 21475f8..a159a40 100644
@@ -68,6 +68,7 @@
 /*
  * Hardware drivers
  */
+#define CONFIG_AT91_GPIO	1
 #define CONFIG_ATMEL_USART	1
 #undef CONFIG_USART0
 #undef CONFIG_USART1