summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--machine/sam9g25_mfser_gpio.h19
-rw-r--r--machine/ti43x_mfser_gpio.h19
-rw-r--r--mtac_mfser.c4
3 files changed, 2 insertions, 40 deletions
diff --git a/machine/sam9g25_mfser_gpio.h b/machine/sam9g25_mfser_gpio.h
deleted file mode 100644
index 1f94a83..0000000
--- a/machine/sam9g25_mfser_gpio.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef SAM9G25_MFSER_GPIO_H
-#define SAM9G25_MFSER_GPIO_H
-
-#include <linux/at91gpio.h>
-
-// M_* for machine specific GPIO pin
-
-// gpio pins for Accessory Card 1
-#define M_AP1_GPIO1 AT91_PIN_PC6
-#define M_AP1_GPIO2 AT91_PIN_PC7
-#define M_AP1_GPIO3 AT91_PIN_PC8
-#define M_AP1_GPIO4 AT91_PIN_PC9
-
-// gpio pins for Accessory Card 2
-#define M_AP2_GPIO1 AT91_PIN_PC20
-#define M_AP2_GPIO2 AT91_PIN_PC21
-#define M_AP2_GPIO3 AT91_PIN_PC22
-#define M_AP2_GPIO4 AT91_PIN_PC23
-#endif /* SAM9G25_MFSER_GPIO_H */ \ No newline at end of file
diff --git a/machine/ti43x_mfser_gpio.h b/machine/ti43x_mfser_gpio.h
deleted file mode 100644
index ce227e7..0000000
--- a/machine/ti43x_mfser_gpio.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef TI43X_MFSER_GPIO_H
-#define TI43X_MFSER_GPIO_H
-
-#define OMAP_GPIO(BANK, GPIO) ((BANK*32)+GPIO)
-
-// M_* for machine specific GPIO pin
-
-// gpio pins for Accessory Card 1
-#define M_AP1_GPIO1 OMAP_GPIO(1,0)
-#define M_AP1_GPIO2 OMAP_GPIO(0,24)
-#define M_AP1_GPIO3 OMAP_GPIO(0,23)
-#define M_AP1_GPIO4 OMAP_GPIO(0,22)
-
-// gpio pins for Accessory Card 2
-#define M_AP2_GPIO1 OMAP_GPIO(3,19)
-#define M_AP2_GPIO2 OMAP_GPIO(3,16)
-#define M_AP2_GPIO3 OMAP_GPIO(3,20)
-#define M_AP2_GPIO4 OMAP_GPIO(0,19)
-#endif /* SAM9G25_MFSER_GPIO_H */ \ No newline at end of file
diff --git a/mtac_mfser.c b/mtac_mfser.c
index 04da4e8..d8548cb 100644
--- a/mtac_mfser.c
+++ b/mtac_mfser.c
@@ -13,10 +13,10 @@
#include <linux/mtac.h>
#include <linux/mts_io.h>
#ifdef TI43X
-#include "machine/ti43x_mfser_gpio.h"
+#include <linux/ti43x_gpio.h>
#endif
#ifdef SAM9G25
-#include "machine/sam9g25_mfser_gpio.h"
+#include <linux/sam9g25_gpio.h>
#endif
static struct gpio_pin gpio_pins_mtac_mfser[] = {