From patchwork Tue Jul 2 09:28:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 2811571 Return-Path: X-Original-To: patchwork-linux-arm@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 A2CF99F3C3 for ; Tue, 2 Jul 2013 10:07:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5721F2013D for ; Tue, 2 Jul 2013 10:07:45 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 380C7200DA for ; Tue, 2 Jul 2013 10:07:44 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Utwvh-00038f-NF; Tue, 02 Jul 2013 09:31:28 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Utwt7-0002l1-Qu; Tue, 02 Jul 2013 09:28:41 +0000 Received: from mail-pb0-x229.google.com ([2607:f8b0:400e:c01::229]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Utwt5-0002iv-34 for linux-arm-kernel@lists.infradead.org; Tue, 02 Jul 2013 09:28:39 +0000 Received: by mail-pb0-f41.google.com with SMTP id rp16so5964760pbb.28 for ; Tue, 02 Jul 2013 02:28:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=0vPpxKgtOe2LsR0z+40vIJ9EN2+wgjP9F80NzkDaTOA=; b=BU09cRbiZNgDx5fnjyd/i3RYlG6myMaP4Uqwibp0+IZBpiiT+EkzPU7ljKbAv3H+rO DlZr/B1q1/r8RVhLGYyrFJwYKYaEd40yZsVeS9TRhRIY3gvcfXaDRVEn3/PiD+zwu4D2 /mplV7c+POPpKj4keF4Q4UXEbI4yKd00sQwPMwrg8vvGzPoZb7bUM6AGT4804qNowWo9 Wmp7e4PT3W6gZp/a3Nn1KNxy0EhApLgZ1W4i8R8IoPivS+XLCi5eb2Sy5VXDtwD4FPH1 gEhGy/1CrBctZdRMTRpniSV6iuCx5Tp3bkDD97YJvG05/IJJQlq1Ph4kgEbFp63FD/gJ UrTQ== X-Received: by 10.66.119.35 with SMTP id kr3mr28376900pab.149.1372757297639; Tue, 02 Jul 2013 02:28:17 -0700 (PDT) Received: from [127.0.0.1] (ac230065.ppp.asahi-net.or.jp. [183.77.230.65]) by mx.google.com with ESMTPSA id hu6sm20369146pbc.28.2013.07.02.02.28.15 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 02 Jul 2013 02:28:17 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Tue, 02 Jul 2013 18:28:22 +0900 Message-Id: <20130702092822.32066.80242.sendpatchset@w520> In-Reply-To: <20130702092725.32066.54861.sendpatchset@w520> References: <20130702092725.32066.54861.sendpatchset@w520> Subject: [PATCH 07/08] ARM: shmobile: EMEV2 map_io update X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130702_052839_275213_BC0E116A X-CRM114-Status: UNSURE ( 9.47 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) Cc: arnd@arndb.de, Magnus Damm , horms@verge.net.au, olof@lixom.net, shinya.kuribayashi.px@renesas.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, 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 From: Magnus Damm Update the EMEV2 struct map_desc to exclude the SMU and also include the ->map_io() callback in the DT version of EMEV2 board support. The EMEV2 SMP code can these days perform ioremap() early on without the SMU information in the io_desc[]. To correctly support SMP in case of DT-only board support then the ->map_io() callback is needed. Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/setup-emev2.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) --- 0004/arch/arm/mach-shmobile/setup-emev2.c +++ work/arch/arm/mach-shmobile/setup-emev2.c 2013-07-02 15:22:37.000000000 +0900 @@ -38,13 +38,6 @@ static struct map_desc emev2_io_desc[] __initdata = { #ifdef CONFIG_SMP - /* 128K entity map for 0xe0100000 (SMU) */ - { - .virtual = 0xe0100000, - .pfn = __phys_to_pfn(0xe0100000), - .length = SZ_128K, - .type = MT_DEVICE - }, /* 2M mapping for SCU + L2 controller */ { .virtual = 0xf0000000, @@ -220,6 +213,7 @@ static const char *emev2_boards_compat_d DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)") .smp = smp_ops(emev2_smp_ops), + .map_io = emev2_map_io, .init_early = emev2_init_delay, .init_machine = emev2_add_standard_devices_dt, .dt_compat = emev2_boards_compat_dt,