From d368760571ea1462ec159318982f02a2c877735f Mon Sep 17 00:00:00 2001 From: jsg Date: Wed, 20 May 2015 03:49:23 +0000 Subject: [PATCH] Remove cubieboard specific gpio led setting. From Artturi Alm in bitrig. --- sys/arch/armv7/sunxi/a1xintc.c | 9 +-------- sys/arch/armv7/sunxi/sxipio.c | 6 +----- sys/arch/armv7/sunxi/sxipiovar.h | 4 +--- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/sys/arch/armv7/sunxi/a1xintc.c b/sys/arch/armv7/sunxi/a1xintc.c index b316d7b4ffb..42f28722bef 100644 --- a/sys/arch/armv7/sunxi/a1xintc.c +++ b/sys/arch/armv7/sunxi/a1xintc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: a1xintc.c,v 1.5 2015/05/19 06:09:35 jsg Exp $ */ +/* $OpenBSD: a1xintc.c,v 1.6 2015/05/20 03:49:23 jsg Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn * Copyright (c) 2013 Artturi Alm @@ -27,7 +27,6 @@ #include #include -#include #include #ifdef DEBUG_INTC @@ -317,10 +316,6 @@ a1xintc_irq_handler(void *frame) irq = bus_space_read_4(a1xintc_iot, a1xintc_ioh, INTC_VECTOR_REG) >> 2; if (irq == 0) return; - if (irq == 1) - sxipio_togglepin(SXIPIO_LED_BLUE); - - sxipio_setpin(SXIPIO_LED_GREEN); prio = a1xintc_handler[irq].iq_irq; s = a1xintc_splraise(prio); @@ -355,8 +350,6 @@ a1xintc_irq_handler(void *frame) ih->ih_count.ec_count++; } a1xintc_splx(s); - - sxipio_clrpin(SXIPIO_LED_GREEN); } void * diff --git a/sys/arch/armv7/sunxi/sxipio.c b/sys/arch/armv7/sunxi/sxipio.c index d0beb4a7327..9a493435a92 100644 --- a/sys/arch/armv7/sunxi/sxipio.c +++ b/sys/arch/armv7/sunxi/sxipio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sxipio.c,v 1.6 2015/05/04 03:59:42 jsg Exp $ */ +/* $OpenBSD: sxipio.c,v 1.7 2015/05/20 03:49:23 jsg Exp $ */ /* * Copyright (c) 2010 Miodrag Vallat. * Copyright (c) 2013 Artturi Alm @@ -117,10 +117,6 @@ sxipio_attach(struct device *parent, struct device *self, void *args) sxipio_sc = sc; sc->sc_irq = aa->aa_dev->irq[0]; - sxipio_setcfg(SXIPIO_LED_GREEN, SXIPIO_OUTPUT); - sxipio_setcfg(SXIPIO_LED_BLUE, SXIPIO_OUTPUT); - sxipio_setpin(SXIPIO_LED_GREEN); - sxipio_setpin(SXIPIO_LED_BLUE); config_defer(self, sxipio_attach_gpio); diff --git a/sys/arch/armv7/sunxi/sxipiovar.h b/sys/arch/armv7/sunxi/sxipiovar.h index 4b44bced029..275a8765f4f 100644 --- a/sys/arch/armv7/sunxi/sxipiovar.h +++ b/sys/arch/armv7/sunxi/sxipiovar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sxipiovar.h,v 1.2 2013/10/23 18:01:52 jasper Exp $ */ +/* $OpenBSD: sxipiovar.h,v 1.3 2015/05/20 03:49:23 jsg Exp $ */ /* * Copyright (c) 2013 Artturi Alm * @@ -28,8 +28,6 @@ #define SXIPIO_USB1_PWR 230 #define SXIPIO_USB2_PWR 227 -#define SXIPIO_LED_GREEN 244 -#define SXIPIO_LED_BLUE 245 #define SXIPIO_SATA_PWR 40 #define SXIPIO_EMAC_NPINS 18 /* PORTA 0-17 */ -- 2.20.1