Move mtac-eth to modern GPIOD kernel libraryHEAD2.0.0master

2 files changed, 13 insertions, 18 deletions

diff --git a/AUTHORS b/AUTHORS
index f8e3fb5..d338ebe 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1 @@
-James Maki <jmaki@multitech.com>
-John Klug <john.klug@multitech.com>
+Multi-Tech <info@multitech.com>
diff --git a/mtac_eth.c b/mtac_eth.c
index efdea60..316a9e8 100644
--- a/mtac_eth.c
+++ b/mtac_eth.c
@@ -1,16 +1,9 @@
-#define DRIVER_VERSION  "v1.1.1"
+#define DRIVER_VERSION  "v2.0.0"
 #define DRIVER_AUTHOR   "Multi-Tech"
 #define DRIVER_DESC "MTS Ethernet Accessory Card"
 #define DRIVER_NAME "mtac-eth"
 
 #include <linux/types.h>
-#include <linux/gpio.h>
-#ifdef TI43X
-#include <linux/ti43x_gpio.h>
-#endif
-#ifdef SAM9G25
-#include <linux/sam9g25_gpio.h>
-#endif
 #include <linux/platform_device.h>
 #include <linux/kmod.h>
 #include <linux/bitops.h>
@@ -18,27 +11,30 @@
 #include <linux/slab.h>
 #include <linux/mtac.h>
 #include <linux/mts_io.h>
+#include <linux/gpio/consumer.h>
 
 static struct gpio_pin gpio_pins_mtac_eth[] = {
 	// gpio pins for Accessory Card 1
 	{
-		.name = "AP1_RESET",
+		.name = "AP1_NRESET",
 		.pin = {
-			.gpio = M_AP1_NRESET,
-			.flags = GPIOF_OUT_INIT_HIGH,
+			.gpio = ~0U,
+			.flags = GPIOD_OUT_HIGH,
 			.label = "ap1-reset",
-		}
+		},
+		.do_gpio_desc = 1,
 	},
 
 
 	// gpio pins for Accessory Card 2
 	{
-		.name = "AP2_RESET",
+		.name = "AP2_NRESET",
 		.pin = {
-			.gpio = M_AP2_NRESET,
-			.flags = GPIOF_OUT_INIT_HIGH,
+			.gpio = ~0U,
+			.flags = GPIOD_OUT_HIGH,
 			.label = "ap2-reset",
-		}
+		},
+		.do_gpio_desc = 1,
 	},
 	{ },
 };