From patchwork Mon Jul 25 16:10:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jamie Iles X-Patchwork-Id: 1005432 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p6PGBmsQ003516 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 25 Jul 2011 16:12:09 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QlNkH-0008Mf-PF; Mon, 25 Jul 2011 16:11:06 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QlNkH-0001e4-6Q; Mon, 25 Jul 2011 16:11:05 +0000 Received: from mail-wy0-f177.google.com ([74.125.82.177]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QlNjR-0001Uy-BL for linux-arm-kernel@lists.infradead.org; Mon, 25 Jul 2011 16:10:14 +0000 Received: by wyf23 with SMTP id 23so3834895wyf.36 for ; Mon, 25 Jul 2011 09:10:10 -0700 (PDT) Received: by 10.227.55.15 with SMTP id s15mr4168577wbg.20.1311610210611; Mon, 25 Jul 2011 09:10:10 -0700 (PDT) Received: from localhost (gw-ba1.picochip.com [94.175.234.108]) by mx.google.com with ESMTPS id fo2sm4436580wbb.65.2011.07.25.09.10.09 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 25 Jul 2011 09:10:10 -0700 (PDT) From: Jamie Iles To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/3] versatile: convert to common VIC DT probing Date: Mon, 25 Jul 2011 17:10:00 +0100 Message-Id: <1311610200-12408-4-git-send-email-jamie@jamieiles.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1311610200-12408-1-git-send-email-jamie@jamieiles.com> References: <1311610200-12408-1-git-send-email-jamie@jamieiles.com> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110725_121013_666565_9220BFB2 X-CRM114-Status: GOOD ( 13.92 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.177 listed in list.dnswl.org] Cc: Jamie Iles , devicetree-discuss@lists.ozlabs.org, Russell King X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 25 Jul 2011 16:12:09 +0000 (UTC) Use the common VIC probing code in the VIC driver to instantiate the VIC from the DT. Cc: devicetree-discuss@lists.ozlabs.org Cc: Russell King Signed-off-by: Jamie Iles --- arch/arm/mach-versatile/core.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index 15c0091..3f29c01 100644 --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c @@ -85,12 +85,6 @@ static struct fpga_irq_data sic_irq = { #define PIC_MASK 0 #endif -/* Lookup table for finding a DT node that represents the vic instance */ -static const struct of_device_id vic_of_match[] __initconst = { - { .compatible = "arm,vic", }, - {} -}; - static const struct of_device_id sic_of_match[] __initconst = { { .compatible = "arm,sic", }, {} @@ -98,8 +92,7 @@ static const struct of_device_id sic_of_match[] __initconst = { void __init versatile_init_irq(void) { - vic_init(VA_VIC_BASE, IRQ_VIC_START, ~0, 0); - irq_domain_generate_simple(vic_of_match, VERSATILE_VIC_BASE, IRQ_VIC_START); + vic_of_init(); writel(~0, VA_SIC_BASE + SIC_IRQ_ENABLE_CLEAR);