Remove now unused definitions for drivers that have been converted to

use the fdt.

diff --git a/sys/arch/armv7/omap/am335x.c b/sys/arch/armv7/omap/am335x.c
index 05fe86e..7988872 100644 (file)
--- a/sys/arch/armv7/omap/am335x.c
+++ b/sys/arch/armv7/omap/am335x.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: am335x.c,v 1.7 2014/03/18 07:34:17 syl Exp $ */
+/* $OpenBSD: am335x.c,v 1.8 2016/07/10 02:55:15 jsg Exp $ */
 
 /*
  * Copyright (c) 2011 Uwe Stuehler <uwe@openbsd.org>
@@ -50,10 +50,6 @@
 #define DMTIMER6_IRQ   94
 #define DMTIMER7_IRQ   95
 
-#define WD_SIZE                0x80
-#define WD_ADDR                0x44E35000
-#define WD_IRQ         91
-
 #define GPIOx_SIZE     0x200
 #define GPIO0_ADDR     0x44E07000
 #define GPIO1_ADDR     0x4804C000
@@ -73,38 +69,6 @@
 #define EDMAMPERR_IRQ  13
 #define EDMAERR_IRQ    14
 
-#define UARTx_SIZE     0x90
-#define UART0_ADDR     0x44E09000
-#define UART1_ADDR     0x48022000
-#define UART2_ADDR     0x48024000
-#define UART3_ADDR     0x481A6000
-#define UART4_ADDR     0x481A8000
-#define UART5_ADDR     0x481AA000
-#define UART0_IRQ      72
-#define UART1_IRQ      73
-#define UART2_IRQ      74
-#define UART3_IRQ      44
-#define UART4_IRQ      45
-#define UART5_IRQ      46
-
-#define HSMMCx_SIZE    0x200
-#define HSMMC0_ADDR    0x48060100
-#define HSMMC1_ADDR    0x481d8100
-#define HSMMC0_IRQ     64
-#define HSMMC1_IRQ     28
-
-#define CPSW_SIZE      0x4000
-#define CPSW_ADDR      0x4A100000
-#define CPSW_IRQ       40
-
-#define IICx_SIZE      0x1000
-#define IIC0_ADDR      0x44e0b000
-#define IIC1_ADDR      0x4802a000
-#define IIC2_ADDR      0x4819c000
-#define IIC0_IRQ       70
-#define IIC1_IRQ       71
-#define IIC2_IRQ       30
-
 struct armv7_dev am335x_devs[] = {
 
        /*
@@ -159,25 +123,6 @@ struct armv7_dev am335x_devs[] = {
          .irq = { DMTIMER3_IRQ }
        },
 
-       /*
-        * Watchdog Timer
-        */
-
-       { .name = "omdog",
-         .unit = 0,
-         .mem = { { WD_ADDR, WD_SIZE } }
-       },
-
-       /*
-        * UART
-        */
-
-       { .name = "com",
-         .unit = 0,
-         .mem = { { UART0_ADDR, UARTx_SIZE } },
-         .irq = { UART0_IRQ }
-       },
-
        /*
         * GPIO 
         */
@@ -206,51 +151,6 @@ struct armv7_dev am335x_devs[] = {
          .irq = { GPIO3_IRQ }
        },
 
-       /*
-        * IIC 
-        */
-
-       { .name = "tiiic",
-         .unit = 0,
-         .mem = { { IIC0_ADDR, IICx_SIZE } },
-         .irq = { IIC0_IRQ }
-       },
-
-       { .name = "tiiic",
-         .unit = 1,
-         .mem = { { IIC1_ADDR, IICx_SIZE } },
-         .irq = { IIC1_IRQ }
-       },
-
-       { .name = "tiiic",
-         .unit = 2,
-         .mem = { { IIC2_ADDR, IICx_SIZE } },
-         .irq = { IIC2_IRQ }
-       },
-
-       /*
-        * MMC
-        */
-
-       { .name = "ommmc",
-         .unit = 0,
-         .mem = { { HSMMC0_ADDR, HSMMCx_SIZE } },
-         .irq = { HSMMC0_IRQ }
-       },
-
-       { .name = "ommmc",
-         .unit = 1,
-         .mem = { { HSMMC1_ADDR, HSMMCx_SIZE } },
-         .irq = { HSMMC1_IRQ }
-       },
-
-       /* cpsw Ethernet */
-       { .name = "cpsw",
-         .unit = 0,
-         .mem = { { CPSW_ADDR, CPSW_SIZE } },
-         .irq = { CPSW_IRQ }
-       },
-
        /* Terminator */
        { .name = NULL,
          .unit = 0

diff --git a/sys/arch/armv7/omap/omap3.c b/sys/arch/armv7/omap/omap3.c
index bf2feb5..0d6ad48 100644 (file)
--- a/sys/arch/armv7/omap/omap3.c
+++ b/sys/arch/armv7/omap/omap3.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: omap3.c,v 1.2 2013/11/06 19:03:07 syl Exp $ */
+/* $OpenBSD: omap3.c,v 1.3 2016/07/10 02:55:15 jsg Exp $ */
 
 /*
  * Copyright (c) 2011 Uwe Stuehler <uwe@openbsd.org>
@@ -35,9 +35,6 @@
 #define GPTIMER2_ADDR  0x49032000
 #define GPTIMER2_IRQ   38
 
-#define WD_ADDR                0x48314000
-#define WD_SIZE                0x80
-
 #define GPIOx_SIZE     0x1000
 #define GPIO1_ADDR     0x48310000
 #define GPIO2_ADDR     0x49050000
@@ -53,19 +50,6 @@
 #define GPIO5_IRQ      33
 #define GPIO6_IRQ      34
 
-#define UARTx_SIZE     0x400
-#define UART1_ADDR     0x4806A000
-#define UART2_ADDR     0x4806C000
-#define UART3_ADDR     0x49020000
-
-#define UART1_IRQ      72
-#define UART2_IRQ      73
-#define UART3_IRQ      74
-
-#define HSMMCx_SIZE    0x200
-#define HSMMC1_ADDR    0x4809c000
-#define HSMMC1_IRQ     83
-
 #define USBTLL_ADDR    0x48062000
 #define USBTLL_SIZE    0x1000
 
@@ -145,35 +129,6 @@ struct armv7_dev omap3_devs[] = {
          .irq = { GPIO6_IRQ }
        },
 
-       /*
-        * Watchdog Timer
-        */
-
-       { .name = "omdog",
-         .unit = 0,
-         .mem = { { WD_ADDR, WD_SIZE } }
-       },
-
-       /*
-        * UART
-        */
-
-       { .name = "com",
-         .unit = 2,
-         .mem = { { UART3_ADDR, UARTx_SIZE } },
-         .irq = { UART3_IRQ }
-       },
-
-       /*
-        * MMC
-        */
-
-       { .name = "ommmc",
-         .unit = 0,
-         .mem = { { HSMMC1_ADDR, HSMMCx_SIZE } },
-         .irq = { HSMMC1_IRQ }
-       },
-
        /*
         * USB
         */

diff --git a/sys/arch/armv7/omap/omap4.c b/sys/arch/armv7/omap/omap4.c
index 5cd1b81..1762111 100644 (file)
--- a/sys/arch/armv7/omap/omap4.c
+++ b/sys/arch/armv7/omap/omap4.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: omap4.c,v 1.3 2013/11/06 19:03:07 syl Exp $ */
+/* $OpenBSD: omap4.c,v 1.4 2016/07/10 02:55:15 jsg Exp $ */
 
 /*
  * Copyright (c) 2011 Uwe Stuehler <uwe@openbsd.org>
@@ -27,9 +27,6 @@
 #define OMAPID_ADDR    0x4a002000
 #define OMAPID_SIZE    0x1000
 
-#define WD_ADDR                0x4a314000
-#define WD_SIZE                0x80
-
 #define GPIOx_SIZE     0x1000
 #define GPIO1_ADDR     0x4a310000
 #define GPIO2_ADDR     0x48055000
@@ -45,21 +42,6 @@
 #define GPIO5_IRQ      33
 #define GPIO6_IRQ      34
 
-#define UARTx_SIZE     0x400
-#define UART1_ADDR     0x4806A000
-#define UART2_ADDR     0x4806C000
-#define UART3_ADDR     0x48020000
-#define UART4_ADDR     0x4806E000
-
-#define UART1_IRQ      72
-#define UART2_IRQ      73
-#define UART3_IRQ      74
-#define UART4_IRQ      70
-
-#define HSMMCx_SIZE    0x200
-#define HSMMC1_ADDR    0x4809c100
-#define HSMMC1_IRQ     83
-
 #define PRM_ADDR       0x4a306000
 #define PRM_SIZE       0x2000
 #define CM1_ADDR       0x4a004000
@@ -145,35 +127,6 @@ struct armv7_dev omap4_devs[] = {
          .irq = { GPIO6_IRQ }
        },
 
-       /*
-        * Watchdog Timer
-        */
-
-       { .name = "omdog",
-         .unit = 0,
-         .mem = { { WD_ADDR, WD_SIZE } }
-       },
-
-       /*
-        * UART
-        */
-
-       { .name = "com",
-         .unit = 2,
-         .mem = { { UART3_ADDR, UARTx_SIZE } },
-         .irq = { UART3_IRQ }
-       },
-
-       /*
-        * MMC
-        */
-
-       { .name = "ommmc",
-         .unit = 0,
-         .mem = { { HSMMC1_ADDR, HSMMCx_SIZE } },
-         .irq = { HSMMC1_IRQ }
-       },
-
        /*
         * USB
         */