From patchwork Wed May 15 02:57:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 2569611 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id EE096DFE75 for ; Wed, 15 May 2013 02:57:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752565Ab3EOC5i (ORCPT ); Tue, 14 May 2013 22:57:38 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:46790 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755970Ab3EOC5h (ORCPT ); Tue, 14 May 2013 22:57:37 -0400 Received: from ayumi.akashicho.tokyo.vergenet.net (p5212-ipbfp1903kobeminato.hyogo.ocn.ne.jp [114.172.132.212]) by kirsty.vergenet.net (Postfix) with ESMTP id 5938025C024; Wed, 15 May 2013 12:57:36 +1000 (EST) Received: by ayumi.akashicho.tokyo.vergenet.net (Postfix, from userid 7100) id EC59DEDE7CF; Wed, 15 May 2013 11:57:34 +0900 (JST) From: Simon Horman To: linux-sh@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Magnus Damm , Laurent Pinchart , Simon Horman Subject: [PATCH v2 3/4] ARM: shmobile: marzen-reference: Initialise irqpin Date: Wed, 15 May 2013 11:57:29 +0900 Message-Id: <1368586650-26263-4-git-send-email-horms+renesas@verge.net.au> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1368586650-26263-1-git-send-email-horms+renesas@verge.net.au> References: <1368586650-26263-1-git-send-email-horms+renesas@verge.net.au> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org Empirically it appears to be necessary to call r8a7779_init_irq_extpin(1) in order to initialise irqpin for use with IRQ1. This is already done in the marzen board code. This adds the call to the marzen-reference board code. The motivation for this is to allow use of SMSC LAN, which uses IRQ1, with marzen-reference. Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/board-marzen-reference.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c index 5332e89..f83b6d1 100644 --- a/arch/arm/mach-shmobile/board-marzen-reference.c +++ b/arch/arm/mach-shmobile/board-marzen-reference.c @@ -63,12 +63,18 @@ static const char *marzen_boards_compat_dt[] __initdata = { NULL, }; +void __init marzen_init_irq(void) +{ + r8a7779_init_irq_extpin(1); /* IRQ1 as individual interrupt */ + r8a7779_init_irq_dt(); +} + DT_MACHINE_START(MARZEN, "marzen") .smp = smp_ops(r8a7779_smp_ops), .map_io = r8a7779_map_io, .init_early = r8a7779_init_delay, .nr_irqs = NR_IRQS_LEGACY, - .init_irq = r8a7779_init_irq_dt, + .init_irq = marzen_init_irq, .init_machine = marzen_init, .init_time = shmobile_timer_init, .dt_compat = marzen_boards_compat_dt,