[src/trunk]: src/sys/arch/arm/allwinner do not fail if no awintcon is present...

[aymeric <aymeric%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9c45f6cbdc68
branches:  trunk
changeset: 341797:9c45f6cbdc68
user:      aymeric <aymeric%NetBSD.org@localhost>
date:      Sun Nov 22 17:50:48 2015 +0000

description:
do not fail if no awintcon is present so that ALLWINNER_A80 compiles again

diffstat:

 sys/arch/arm/allwinner/awin_debe.c |  7 +++++--
 sys/arch/arm/allwinner/files.awin  |  4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diffs (55 lines):

diff -r 3f8f5bfb38eb -r 9c45f6cbdc68 sys/arch/arm/allwinner/awin_debe.c
--- a/sys/arch/arm/allwinner/awin_debe.c        Sun Nov 22 15:53:10 2015 +0000
+++ b/sys/arch/arm/allwinner/awin_debe.c        Sun Nov 22 17:50:48 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_debe.c,v 1.19 2015/11/19 18:48:22 bouyer Exp $ */
+/* $NetBSD: awin_debe.c,v 1.20 2015/11/22 17:50:48 aymeric Exp $ */
 
 /*-
  * Copyright (c) 2014 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -29,6 +29,7 @@
 #include "opt_allwinner.h"
 #include "genfb.h"
 #include "awin_mp.h"
+#include "awin_tcon.h"
 
 #ifndef AWIN_DEBE_VIDEOMEM
 #define AWIN_DEBE_VIDEOMEM     (16 * 1024 * 1024)
@@ -37,7 +38,7 @@
 #define AWIN_DEBE_CURMAX       64
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awin_debe.c,v 1.19 2015/11/19 18:48:22 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_debe.c,v 1.20 2015/11/22 17:50:48 aymeric Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -602,8 +603,10 @@
                        val &= ~AWIN_DEBE_MODCTL_HWC_EN;
                }
                DEBE_WRITE(sc, AWIN_DEBE_MODCTL_REG, val);
+#if NAWIN_TCON > 0
                /* debe0 always connected to tcon0, debe1 to tcon1*/
                awin_tcon_setvideo(device_unit(sc->sc_dev), enable);
+#endif
                return 0;
        case WSDISPLAYIO_GVIDEO:
                val = DEBE_READ(sc, AWIN_DEBE_MODCTL_REG);
diff -r 3f8f5bfb38eb -r 9c45f6cbdc68 sys/arch/arm/allwinner/files.awin
--- a/sys/arch/arm/allwinner/files.awin Sun Nov 22 15:53:10 2015 +0000
+++ b/sys/arch/arm/allwinner/files.awin Sun Nov 22 17:50:48 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.awin,v 1.32 2015/07/25 15:19:54 jmcneill Exp $
+#      $NetBSD: files.awin,v 1.33 2015/11/22 17:50:48 aymeric Exp $
 #
 # Configuration info for Allwinner ARM Peripherals
 #
@@ -152,7 +152,7 @@
 # A10/A20/A31 LCD/TV timing controller (TCON)
 device awintcon
 attach awintcon at awinio with awin_tcon
-file   arch/arm/allwinner/awin_tcon.c          awin_tcon | awin_hdmi
+file   arch/arm/allwinner/awin_tcon.c          awin_tcon | awin_hdmi   needs-flag
 
 # A10/A20/A31 Display engine backend (DE-BE)
 device awindebe { }