From patchwork Thu Jan 28 15:17:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 8151441 X-Patchwork-Delegate: horms@verge.net.au 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 C86AB9F440 for ; Thu, 28 Jan 2016 15:17:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3385520304 for ; Thu, 28 Jan 2016 15:17:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A3DF920373 for ; Thu, 28 Jan 2016 15:17:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966616AbcA1PRa (ORCPT ); Thu, 28 Jan 2016 10:17:30 -0500 Received: from michel.telenet-ops.be ([195.130.137.88]:34059 "EHLO michel.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966459AbcA1PRa (ORCPT ); Thu, 28 Jan 2016 10:17:30 -0500 Received: from ayla.of.borg ([84.195.106.123]) by michel.telenet-ops.be with bizsmtp id BTHT1s00T2fm56U06THTob; Thu, 28 Jan 2016 16:17:27 +0100 Received: from ramsan.of.borg ([192.168.97.29] helo=ramsan) by ayla.of.borg with esmtp (Exim 4.82) (envelope-from ) id 1aOoK7-0006rd-6Z; Thu, 28 Jan 2016 16:17:27 +0100 Received: from geert by ramsan with local (Exim 4.82) (envelope-from ) id 1aOoK7-0003Mc-NH; Thu, 28 Jan 2016 16:17:27 +0100 From: Geert Uytterhoeven To: Simon Horman , Magnus Damm Cc: linux-renesas-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Geert Uytterhoeven Subject: [PATCH 2/2] ARM: shmobile: emev2: Remove legacy machine_desc.map_io() callback Date: Thu, 28 Jan 2016 16:17:26 +0100 Message-Id: <1453994246-12886-3-git-send-email-geert+renesas@glider.be> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1453994246-12886-1-git-send-email-geert+renesas@glider.be> References: <1453994246-12886-1-git-send-email-geert+renesas@glider.be> 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 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 --- This depends on "ARM: shmobile: Consolidate SCU mapping code". --- 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 10b7cb5dcb3af1e3..0829d0215c38da89 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,