From patchwork Fri Mar 29 21:05:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2366691 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id DE5F53FD40 for ; Fri, 29 Mar 2013 21:06:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757070Ab3C2VGA (ORCPT ); Fri, 29 Mar 2013 17:06:00 -0400 Received: from moutng.kundenserver.de ([212.227.17.10]:55584 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756890Ab3C2VGA (ORCPT ); Fri, 29 Mar 2013 17:06:00 -0400 Received: from axis700.grange (dslb-178-001-229-203.pools.arcor-ip.net [178.1.229.203]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0MGoVt-1UQPZo0ixt-00DVyp; Fri, 29 Mar 2013 22:05:53 +0100 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id B398240BB3; Fri, 29 Mar 2013 22:05:52 +0100 (CET) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1ULgUi-0001Fn-GY; Fri, 29 Mar 2013 22:05:52 +0100 From: Guennadi Liakhovetski To: linux-sh@vger.kernel.org Cc: Simon Horman , Magnus Damm , Laurent Pinchart , Guennadi Liakhovetski Subject: [PATCH v3 4/5] ARM: shmobile: mackerel: add interrupt names for SDHI0 Date: Fri, 29 Mar 2013 22:05:51 +0100 Message-Id: <1364591152-4780-5-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1364591152-4780-1-git-send-email-g.liakhovetski@gmx.de> References: <1364591152-4780-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:wRbvQk3IBO9CGujpJ130LprF9T1Eebx7D2eE9WP2V85 0HI5Ol/hi7eBLCrHC84apAHyRYCDiyeYqWD8zylXKpiDaXf/MC n1JOzNa5aSMcXKAQsPfcIf16yOBaylBmVZjlA/vXYdrEGL2exv O+gzNVWu0gkL5/jklUJZxeAtHVdvvBPkYlSM9PGoxu4qkwnBum O8VH9s0NEGPZG8Tcl6UbnbIALQkgvHBsxUePqK0MaiNxU6R9Cd jAC7bjLRO0/z+8m37YD07SwowW0UeDR1Xz1U0mqZ/FrzRvxHhg yIW+DBoNtRun8COv2mxx9NE/a20ckF5uVV09T1teWYbypyQtrQ 9sH8GbyDopFPOS1VoNW1VJoS6U2FnppSPHsysx5fVUBnlaeNJM jh5eQR0I/YtOw== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org To unify with SDHI1 also use named IRQs for SDHI0. This also clarifies which specific IRQs are used. Signed-off-by: Guennadi Liakhovetski --- arch/arm/mach-shmobile/board-mackerel.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index a47a1116..b976ad6 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c @@ -979,12 +979,11 @@ static struct resource sdhi0_resources[] = { .end = 0xe68500ff, .flags = IORESOURCE_MEM, }, { - .start = evt2irq(0x0e00) /* SDHI0_SDHI0I0 */, - .flags = IORESOURCE_IRQ, - }, { + .name = SH_MOBILE_SDHI_IRQ_SDCARD, .start = evt2irq(0x0e20) /* SDHI0_SDHI0I1 */, .flags = IORESOURCE_IRQ, }, { + .name = SH_MOBILE_SDHI_IRQ_SDIO, .start = evt2irq(0x0e40) /* SDHI0_SDHI0I2 */, .flags = IORESOURCE_IRQ, }, @@ -1020,10 +1019,6 @@ static struct resource sdhi1_resources[] = { .end = 0xe68600ff, .flags = IORESOURCE_MEM, }, { - .name = SH_MOBILE_SDHI_IRQ_CARD_DETECT, - .start = evt2irq(0x0e80), /* SDHI1_SDHI1I0 */ - .flags = IORESOURCE_IRQ, - }, { .name = SH_MOBILE_SDHI_IRQ_SDCARD, .start = evt2irq(0x0ea0), /* SDHI1_SDHI1I1 */ .flags = IORESOURCE_IRQ,