Remove unused table driven omgpio bits.

3 files changed, 3 insertions, 151 deletions

diff --git a/sys/arch/armv7/omap/am335x.c b/sys/arch/armv7/omap/am335x.c
index 851d5a8d029..3bbb047cf18 100644
--- a/sys/arch/armv7/omap/am335x.c
+++ b/sys/arch/armv7/omap/am335x.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: am335x.c,v 1.9 2017/03/01 04:36:45 jsg Exp $ */
+/* $OpenBSD: am335x.c,v 1.10 2017/03/01 05:10:05 jsg Exp $ */
 
 /*
  * Copyright (c) 2011 Uwe Stuehler <uwe@openbsd.org>
@@ -50,16 +50,6 @@
 #define DMTIMER6_IRQ	94
 #define DMTIMER7_IRQ	95
 
-#define GPIOx_SIZE	0x200
-#define GPIO0_ADDR	0x44E07000
-#define GPIO1_ADDR	0x4804C000
-#define GPIO2_ADDR	0x481AC000
-#define GPIO3_ADDR	0x481AE000
-#define GPIO0_IRQ	96
-#define GPIO1_IRQ	98
-#define GPIO2_IRQ	32
-#define GPIO3_IRQ	62
-
 struct armv7_dev am335x_devs[] = {
 
 	/*
@@ -105,34 +95,6 @@ struct armv7_dev am335x_devs[] = {
 	  .irq = { DMTIMER3_IRQ }
 	},
 
-	/*
-	 * GPIO 
-	 */
-
-	{ .name = "omgpio",
-	  .unit = 0,
-	  .mem = { { GPIO0_ADDR, GPIOx_SIZE } },
-	  .irq = { GPIO0_IRQ }
-	},
-
-	{ .name = "omgpio",
-	  .unit = 1,
-	  .mem = { { GPIO1_ADDR, GPIOx_SIZE } },
-	  .irq = { GPIO1_IRQ }
-	},
-
-	{ .name = "omgpio",
-	  .unit = 2,
-	  .mem = { { GPIO2_ADDR, GPIOx_SIZE } },
-	  .irq = { GPIO2_IRQ }
-	},
-
-	{ .name = "omgpio",
-	  .unit = 3,
-	  .mem = { { GPIO3_ADDR, GPIOx_SIZE } },
-	  .irq = { GPIO3_IRQ }
-	},
-
 	/* Terminator */
 	{ .name = NULL,
 	  .unit = 0
diff --git a/sys/arch/armv7/omap/omap3.c b/sys/arch/armv7/omap/omap3.c
index 0d6ad482318..52855d35e73 100644
--- a/sys/arch/armv7/omap/omap3.c
+++ b/sys/arch/armv7/omap/omap3.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: omap3.c,v 1.3 2016/07/10 02:55:15 jsg Exp $ */
+/* $OpenBSD: omap3.c,v 1.4 2017/03/01 05:10:05 jsg Exp $ */
 
 /*
  * Copyright (c) 2011 Uwe Stuehler <uwe@openbsd.org>
@@ -35,21 +35,6 @@
 #define GPTIMER2_ADDR	0x49032000
 #define GPTIMER2_IRQ	38
 
-#define GPIOx_SIZE	0x1000
-#define GPIO1_ADDR	0x48310000
-#define GPIO2_ADDR	0x49050000
-#define GPIO3_ADDR	0x49052000
-#define GPIO4_ADDR	0x49054000
-#define GPIO5_ADDR	0x49056000
-#define GPIO6_ADDR	0x49058000
-
-#define GPIO1_IRQ	29
-#define GPIO2_IRQ	30
-#define GPIO3_IRQ	31
-#define GPIO4_IRQ	32
-#define GPIO5_IRQ	33
-#define GPIO6_IRQ	34
-
 #define USBTLL_ADDR	0x48062000
 #define USBTLL_SIZE	0x1000
 
@@ -90,46 +75,6 @@ struct armv7_dev omap3_devs[] = {
 	},
 
 	/*
-	 * GPIO
-	 */
-
-	{ .name = "omgpio",
-	  .unit = 0,
-	  .mem = { { GPIO1_ADDR, GPIOx_SIZE } },
-	  .irq = { GPIO1_IRQ }
-	},
-
-	{ .name = "omgpio",
-	  .unit = 1,
-	  .mem = { { GPIO2_ADDR, GPIOx_SIZE } },
-	  .irq = { GPIO2_IRQ }
-	},
-
-	{ .name = "omgpio",
-	  .unit = 2,
-	  .mem = { { GPIO3_ADDR, GPIOx_SIZE } },
-	  .irq = { GPIO3_IRQ }
-	},
-
-	{ .name = "omgpio",
-	  .unit = 3,
-	  .mem = { { GPIO4_ADDR, GPIOx_SIZE } },
-	  .irq = { GPIO4_IRQ }
-	},
-
-	{ .name = "omgpio",
-	  .unit = 4,
-	  .mem = { { GPIO5_ADDR, GPIOx_SIZE } },
-	  .irq = { GPIO5_IRQ }
-	},
-
-	{ .name = "omgpio",
-	  .unit = 5,
-	  .mem = { { GPIO6_ADDR, GPIOx_SIZE } },
-	  .irq = { GPIO6_IRQ }
-	},
-
-	/*
 	 * USB
 	 */
 
diff --git a/sys/arch/armv7/omap/omap4.c b/sys/arch/armv7/omap/omap4.c
index 1762111be58..9457dc6efb9 100644
--- a/sys/arch/armv7/omap/omap4.c
+++ b/sys/arch/armv7/omap/omap4.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: omap4.c,v 1.4 2016/07/10 02:55:15 jsg Exp $ */
+/* $OpenBSD: omap4.c,v 1.5 2017/03/01 05:10:05 jsg Exp $ */
 
 /*
  * Copyright (c) 2011 Uwe Stuehler <uwe@openbsd.org>
@@ -27,21 +27,6 @@
 #define OMAPID_ADDR	0x4a002000
 #define OMAPID_SIZE	0x1000
 
-#define GPIOx_SIZE	0x1000
-#define GPIO1_ADDR	0x4a310000
-#define GPIO2_ADDR	0x48055000
-#define GPIO3_ADDR	0x48057000
-#define GPIO4_ADDR	0x48059000
-#define GPIO5_ADDR	0x4805b000
-#define GPIO6_ADDR	0x4805d000
-
-#define GPIO1_IRQ	29
-#define GPIO2_IRQ	30
-#define GPIO3_IRQ	31
-#define GPIO4_IRQ	32
-#define GPIO5_IRQ	33
-#define GPIO6_IRQ	34
-
 #define PRM_ADDR	0x4a306000
 #define PRM_SIZE	0x2000
 #define CM1_ADDR	0x4a004000
@@ -88,46 +73,6 @@ struct armv7_dev omap4_devs[] = {
 	},
 
 	/*
-	 * GPIO
-	 */
-
-	{ .name = "omgpio",
-	  .unit = 0,
-	  .mem = { { GPIO1_ADDR, GPIOx_SIZE } },
-	  .irq = { GPIO1_IRQ }
-	},
-
-	{ .name = "omgpio",
-	  .unit = 1,
-	  .mem = { { GPIO2_ADDR, GPIOx_SIZE } },
-	  .irq = { GPIO2_IRQ }
-	},
-
-	{ .name = "omgpio",
-	  .unit = 2,
-	  .mem = { { GPIO3_ADDR, GPIOx_SIZE } },
-	  .irq = { GPIO3_IRQ }
-	},
-
-	{ .name = "omgpio",
-	  .unit = 3,
-	  .mem = { { GPIO4_ADDR, GPIOx_SIZE } },
-	  .irq = { GPIO4_IRQ }
-	},
-
-	{ .name = "omgpio",
-	  .unit = 4,
-	  .mem = { { GPIO5_ADDR, GPIOx_SIZE } },
-	  .irq = { GPIO5_IRQ }
-	},
-
-	{ .name = "omgpio",
-	  .unit = 5,
-	  .mem = { { GPIO6_ADDR, GPIOx_SIZE } },
-	  .irq = { GPIO6_IRQ }
-	},
-
-	/*
 	 * USB
 	 */