From patchwork Mon Aug 26 08:52:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 2849445 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C3CB99F271 for ; Mon, 26 Aug 2013 08:52:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C155C20155 for ; Mon, 26 Aug 2013 08:52:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A3E9E2010A for ; Mon, 26 Aug 2013 08:52:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756220Ab3HZIw1 (ORCPT ); Mon, 26 Aug 2013 04:52:27 -0400 Received: from mail-pb0-f52.google.com ([209.85.160.52]:46007 "EHLO mail-pb0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751775Ab3HZIw0 (ORCPT ); Mon, 26 Aug 2013 04:52:26 -0400 Received: by mail-pb0-f52.google.com with SMTP id wz12so3150632pbc.39 for ; Mon, 26 Aug 2013 01:52:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:sender:message-id:to:cc:in-reply-to:references:from:subject :user-agent:mime-version:content-type; bh=Vka+yd8hITnYJvfT2fH9uIqPC6rtAMRyMygVsLWHkrU=; b=eKBWhIohtmIT3Yd3G5/VMEKjf3qt/xJTLa9hqCfwri8oud+D1ngG8MhV4XDw04gXMJ IRGEJsdRGSYwgwRdI6GbdGBqJYKdQrk740XIfYlA9UnaeEZOvSnNbMYyH5c6G3f8ruGG DqyU6w3kXaS4YLU/RkASZRkjnlHqs87uUFnmqz5LzQqrbZ6K10d1yDqlFrwhU74rbtJ7 LTfXZBtjQKFffUfd0QeiP1CsHIe/xdcl9Ml8p0o4x+F1Y+6iA+hUepfxMHlmxqMh7IxT hA0awX/FY+Ied2GgAcCuk54ot0N27Q8ADgDzEpNaPG+XfzXl3H3RizZSp2dUbGcG7zLg Vglw== X-Received: by 10.68.196.167 with SMTP id in7mr13871283pbc.127.1377507144620; Mon, 26 Aug 2013 01:52:24 -0700 (PDT) Received: from morimoto-Dell-XPS420.gmail.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id ct4sm7518778pbb.41.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 26 Aug 2013 01:52:23 -0700 (PDT) Date: Mon, 26 Aug 2013 01:52:23 -0700 (PDT) Message-ID: <87d2p0vnph.wl%kuninori.morimoto.gx@renesas.com> To: Laurent , Simon Cc: Magnus , Linux-SH , Kuninori Morimoto In-Reply-To: <87haecvns0.wl%kuninori.morimoto.gx@renesas.com> References: <874nb2jgc4.wl%kuninori.morimoto.gx@renesas.com> <87haecvns0.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 3/5 v2] ARM: shmobile: bockw: enable global use of FPGA User-Agent: Wanderlust/2.14.0 Emacs/23.3 Mule/6.0 MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-9.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch enables global use of FPGA, since it will be used from many devices. Signed-off-by: Kuninori Morimoto --- v1 -> v2 - no change arch/arm/mach-shmobile/board-bockw.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c index 255e97e..56bc9cc 100644 --- a/arch/arm/mach-shmobile/board-bockw.c +++ b/arch/arm/mach-shmobile/board-bockw.c @@ -36,6 +36,10 @@ #include #include +#define FPGA 0x18200000 +#define IRQ0MR 0x30 +static void __iomem *fpga; + /* * CN9(Upper side) SCIF/RCAN selection * @@ -194,8 +198,6 @@ static const struct pinctrl_map bockw_pinctrl_map[] = { "sdhi0_wp", "sdhi0"), }; -#define FPGA 0x18200000 -#define IRQ0MR 0x30 #define PFC 0xfffc0000 #define PUPR4 0x110 static void __init bockw_init(void) @@ -229,8 +231,8 @@ static void __init bockw_init(void) /* for SMSC */ - base = ioremap_nocache(FPGA, SZ_1M); - if (base) { + fpga = ioremap_nocache(FPGA, SZ_1M); + if (fpga) { /* * CAUTION * @@ -238,10 +240,9 @@ static void __init bockw_init(void) * it should be cared in the future * Now, it is assuming IRQ0 was used only from SMSC. */ - u16 val = ioread16(base + IRQ0MR); + u16 val = ioread16(fpga + IRQ0MR); val &= ~(1 << 4); /* enable SMSC911x */ - iowrite16(val, base + IRQ0MR); - iounmap(base); + iowrite16(val, fpga + IRQ0MR); regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));