From patchwork Wed Feb 24 01:21:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 8397831 Return-Path: X-Original-To: patchwork-linux-renesas-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E26DF9F314 for ; Wed, 24 Feb 2016 01:21:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 532C32024F for ; Wed, 24 Feb 2016 01:21:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 96A89200CC for ; Wed, 24 Feb 2016 01:21:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753369AbcBXBVj (ORCPT ); Tue, 23 Feb 2016 20:21:39 -0500 Received: from kirsty.vergenet.net ([202.4.237.240]:42579 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753478AbcBXBVj (ORCPT ); Tue, 23 Feb 2016 20:21:39 -0500 Received: from reginn.isobedori.kobe.vergenet.net (p5023-ipbfp803kobeminato.hyogo.ocn.ne.jp [123.221.39.23]) by kirsty.vergenet.net (Postfix) with ESMTPA id 125F025BE7D; Wed, 24 Feb 2016 12:21:34 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1456276894; bh=Usin5K4Y2xIeT0KFyxOR4rh6Z6M0EUBZBGjRNwC7ZZw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IDdisKeAYFdTg8+3yXIeUOzCa7b+NcLJ9r0UJoeqNMT3+vPV6Y8rNTP/5Gx4p+BDC byvzoVMov4MYdp3xtKtM3OIp+2oDHdNeLadDKRLa5X1f8oeoemXbPO9OWTHk0Sk72K Z1PbSlSXm6GsxCxckybcJHdu2rURRlX5xSpVtJ7I= Received: by reginn.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id 77EBB940809; Wed, 24 Feb 2016 10:21:32 +0900 (JST) From: Simon Horman To: linux-renesas-soc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Magnus Damm , Geert Uytterhoeven , Simon Horman Subject: [PATCH 4/6] ARM: shmobile: emev2: Remove legacy machine_desc.map_io() callback Date: Wed, 24 Feb 2016 10:21:29 +0900 Message-Id: <247ac89b99102f79483f7e08b9a94911f9b482d9.1456275652.git.horms+renesas@verge.net.au> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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: Geert Uytterhoeven Commit FIXME ("ARM: shmobile: Consolidate SCU mapping code") removed the last user of the static mapping on emev2-based systems. Remove the mapping and the legacy machine_desc.map_io() callback. Signed-off-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/setup-emev2.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/arch/arm/mach-shmobile/setup-emev2.c b/arch/arm/mach-shmobile/setup-emev2.c index 10b7cb5dcb3a..0829d0215c38 100644 --- a/arch/arm/mach-shmobile/setup-emev2.c +++ b/arch/arm/mach-shmobile/setup-emev2.c @@ -20,23 +20,6 @@ #include #include "common.h" -static struct map_desc emev2_io_desc[] __initdata = { -#ifdef CONFIG_SMP - /* 2M mapping for SCU + L2 controller */ - { - .virtual = 0xf0000000, - .pfn = __phys_to_pfn(0x1e000000), - .length = SZ_2M, - .type = MT_DEVICE - }, -#endif -}; - -static void __init emev2_map_io(void) -{ - iotable_init(emev2_io_desc, ARRAY_SIZE(emev2_io_desc)); -} - static const char *const emev2_boards_compat_dt[] __initconst = { "renesas,emev2", NULL, @@ -46,7 +29,6 @@ extern const struct smp_operations emev2_smp_ops; 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 = shmobile_init_delay, .init_late = shmobile_init_late, .dt_compat = emev2_boards_compat_dt,