From owner-svn-src-all@freebsd.org  Sat Apr 23 04:22:39 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7CB7CB1986E;
 Sat, 23 Apr 2016 04:22:39 +0000 (UTC)
 (envelope-from sgalabov@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 49D671FDC;
 Sat, 23 Apr 2016 04:22:39 +0000 (UTC)
 (envelope-from sgalabov@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3N4Mc3B009827;
 Sat, 23 Apr 2016 04:22:38 GMT (envelope-from sgalabov@FreeBSD.org)
Received: (from sgalabov@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3N4Mc9m009826;
 Sat, 23 Apr 2016 04:22:38 GMT (envelope-from sgalabov@FreeBSD.org)
Message-Id: <201604230422.u3N4Mc9m009826@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sgalabov set sender to
 sgalabov@FreeBSD.org using -f
From: Stanislav Galabov <sgalabov@FreeBSD.org>
Date: Sat, 23 Apr 2016 04:22:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298499 - head/sys/mips/mediatek
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Apr 2016 04:22:39 -0000

Author: sgalabov
Date: Sat Apr 23 04:22:38 2016
New Revision: 298499
URL: https://svnweb.freebsd.org/changeset/base/298499

Log:
  Use cpu_establish_hardintr in mtk_intr_gic
  
  This allows us to come closer to OpenWRT vanilla DTS files.
  
  Approved by:	adrian (mentor)
  Sponsored by:	Smartcom - Bulgaria AD
  Differential Revision:	https://reviews.freebsd.org/D6045

Modified:
  head/sys/mips/mediatek/mtk_intr_gic.c

Modified: head/sys/mips/mediatek/mtk_intr_gic.c
==============================================================================
--- head/sys/mips/mediatek/mtk_intr_gic.c	Sat Apr 23 04:21:18 2016	(r298498)
+++ head/sys/mips/mediatek/mtk_intr_gic.c	Sat Apr 23 04:22:38 2016	(r298499)
@@ -95,7 +95,6 @@ struct mtk_gic_softc {
 
 static struct resource_spec mtk_gic_spec[] = {
 	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },	/* Registers */
-	{ SYS_RES_IRQ,		0,	RF_ACTIVE },	/* Parent interrupt 1 */
 	{ -1, 0 }
 };
 
@@ -104,15 +103,8 @@ static struct ofw_compat_data compat_dat
 	{ NULL,		0 }
 };
 
-#if 0
-#define	READ4(_sc, _reg)	\
-    bus_space_read_4((_sc)->bst, (_sc)->bsh, _reg)
-#define	WRITE4(_sc, _reg, _val) \
-    bus_space_write_4((_sc)->bst, (_sc)->bsh, _reg, _val)
-#else
 #define READ4(_sc, _reg)	bus_read_4((_sc)->gic_res[0], (_reg))
 #define WRITE4(_sc, _reg, _val)	bus_write_4((_sc)->gic_res[0], (_reg), (_val))
-#endif
 
 static int
 mtk_gic_probe(device_t dev)
@@ -226,12 +218,9 @@ mtk_gic_attach(device_t dev)
 		goto cleanup;
 	}
 
-	if (bus_setup_intr(dev, sc->gic_res[1], INTR_TYPE_CLK,
-	    mtk_gic_intr, NULL, sc, &sc->gic_intrhand)) {
-		device_printf(dev, "could not setup irq handler\n");
-		intr_pic_deregister(dev, xref);
-		goto cleanup;
-	}
+	cpu_establish_hardintr("gic", mtk_gic_intr, NULL, sc, 0, INTR_TYPE_CLK,
+	    NULL);
+
 	return (0);
 
 cleanup: