From patchwork Fri Sep 11 12:40:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1362416 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=hcOwLw6S; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=u1tMQqY0; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BnwNx01Glz9sTK for ; Fri, 11 Sep 2020 22:41:36 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=vAEunlPTErtopM9vK2JAW4sEeAeHFLLlBcdCopLLRcY=; b=hcOwLw6SoyagoTWchf4NsbLkCU YsODfKahF1Ipo5FSXHkGhvX62GsB35eYdbNzmVBx0mgA3+I6U8yVXEFxD0e+0SZaxbBXAcb+7tW2n 8Y7O5jXULF+cE7MA0g2N2rbpOyhFDZZ+sQJKHq6QDHd7XfpDxcqvNci8rWnmsV+Q0PvelhU4mtk8N fID8Zfqfetfrnf4ot00EXDyNXeEYWx7hVxg4sYipTLjfCcz7RbNsS7duG0plvnrXodIFVEZU9In/k RF3xFUCpgTSc0PtDFfpz4fct2QtHYRvm1RvrLsudIvpVSHzKWA1rxJXAWqTh/z5mPjePIyf8MJUk3 NFlrJfWA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGiMZ-0003hC-LJ; Fri, 11 Sep 2020 12:41:11 +0000 Received: from mail-qt1-x842.google.com ([2607:f8b0:4864:20::842]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kGiMR-0003f1-Lt for linux-arm-kernel@lists.infradead.org; Fri, 11 Sep 2020 12:41:04 +0000 Received: by mail-qt1-x842.google.com with SMTP id r8so7628713qtp.13 for ; Fri, 11 Sep 2020 05:41:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Z+XNmDOoFdAq6CILon5k9gUyj9aw3AtmOKchfb7KcMM=; b=u1tMQqY0R8/JB1JTu0n76kkM58plB2TOPBcTKK1NXCS2Rto9EzZ11NyWpb34qzkTY9 xPJC6cgP0988IkgBB0nW2hV2wFOqjzxT91XIDGbhV79sPPahHzHkuIbseIur3NKEndiq Ve6+3zqBzJeOernndI/QblM2RsUIll1FBjldwismj5QDNAWPh9VD/appQbE4cb7NYwjN bWyHK47SvuJ7WE3aQ72d4Zh/f1pCbs3fi1hye3/12Hw2bMMjdL9TyB1cZtL4fOWvmYF4 bwN8+DTm6owwVt33zDF82sLQkhEyaZN4qnmfdl7MCsgZ5bMepSk6U7sTOuuPFQFLKbOe YIcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Z+XNmDOoFdAq6CILon5k9gUyj9aw3AtmOKchfb7KcMM=; b=j7ZkKx8Rqtp/bwAOgq5wJIbVHVcLsqbCaudA2G0BXubhZLd0ZdYRJbunYIFaAlpSpR Z40vNZxGOsHj5+1QyMMUqFGFm6KpuoYnJ/yYdotMI4PFSXzmQ8gR3uNdfaPUh7oLV7D5 g4eNn669octPgIoQtoaGMkkb0tQ/nPC9wvYnDdkDFPFWUiDcGXFLZ/VW1lrmtd9cOQVp 6jAGL2Wzt/TNDZ/FzMgSFTVdXocfH1fMnQvfeAzTnvmHd0+Yx5E2F2wXUxmyIsGd89DU IDfWUbqPNRviUfkjEesfluZHnBRnCtvDCGB/ChfzxgLesG/HmCNy3iLfovAAvWuVUVnf +sjw== X-Gm-Message-State: AOAM532xu6Y0Yewbv7EPt3rFyY8vZiHvEqgfdozwh14DDIAivDCM/scv 24oOEBL4zfRMNJy1ujZhcn0= X-Google-Smtp-Source: ABdhPJxD+HxR/RUylB1jyAYruxYpIxjwEEDqYqQnMrch9euqqO6raSGWR79L+ccqALmDjelRmjtv8Q== X-Received: by 2002:ac8:1a48:: with SMTP id q8mr1674555qtk.240.1599828062251; Fri, 11 Sep 2020 05:41:02 -0700 (PDT) Received: from localhost.localdomain ([2804:14c:482:640:e918:537:c362:6060]) by smtp.gmail.com with ESMTPSA id c13sm2343931qtq.5.2020.09.11.05.40.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2020 05:41:01 -0700 (PDT) From: Fabio Estevam To: shawnguo@kernel.org Subject: [PATCH 3/9] ARM: imx27: Get rid of mm-imx27.c Date: Fri, 11 Sep 2020 09:40:28 -0300 Message-Id: <20200911124034.6792-4-festevam@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200911124034.6792-1-festevam@gmail.com> References: <20200911124034.6792-1-festevam@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200911_084103_751799_2B26B47E X-CRM114-Status: GOOD ( 19.10 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:842 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [festevam[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Fabio Estevam , arnd@arndb.de, linux-imx@nxp.com, kernel@pengutronix.de MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org Get rid of mm-imx27.c and move its code to the mach-imx27.c file. This aligns with other i.MX SoC code. Signed-off-by: Fabio Estevam --- arch/arm/mach-imx/Makefile | 2 +- arch/arm/mach-imx/common.h | 3 -- arch/arm/mach-imx/mach-imx27.c | 49 ++++++++++++++++++++++++++++ arch/arm/mach-imx/mm-imx27.c | 58 ---------------------------------- 4 files changed, 50 insertions(+), 62 deletions(-) delete mode 100644 arch/arm/mach-imx/mm-imx27.c diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 7fe3060c300e..a976b120ad45 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -3,7 +3,7 @@ obj-y := cpu.o system.o irq-common.o obj-$(CONFIG_SOC_IMX25) += cpu-imx25.o mach-imx25.o pm-imx25.o -obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o mach-imx27.o mm-imx27.o +obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o mach-imx27.o obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o iomux-imx31.o mach-imx31.o obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o mach-imx35.o diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h index 9c1c51c5f46f..6dd86b99cc68 100644 --- a/arch/arm/mach-imx/common.h +++ b/arch/arm/mach-imx/common.h @@ -18,16 +18,13 @@ enum mxc_cpu_pwr_mode; struct of_device_id; void mx21_map_io(void); -void mx27_map_io(void); void mx31_map_io(void); void mx35_map_io(void); void imx21_init_early(void); -void imx27_init_early(void); void imx31_init_early(void); void imx35_init_early(void); void mxc_init_irq(void __iomem *); void mx21_init_irq(void); -void mx27_init_irq(void); void mx31_init_irq(void); void mx35_init_irq(void); void imx21_soc_init(void); diff --git a/arch/arm/mach-imx/mach-imx27.c b/arch/arm/mach-imx/mach-imx27.c index 29d97bd64381..2d981d1eafbf 100644 --- a/arch/arm/mach-imx/mach-imx27.c +++ b/arch/arm/mach-imx/mach-imx27.c @@ -3,15 +3,64 @@ * Copyright 2012 Sascha Hauer, Pengutronix */ +#include #include #include #include +#include #include +#include #include #include "common.h" +#include "devices/devices-common.h" +#include "hardware.h" #include "mx27.h" +/* MX27 memory map definition */ +static struct map_desc imx27_io_desc[] __initdata = { + /* + * this fixed mapping covers: + * - AIPI1 + * - AIPI2 + * - AITC + * - ROM Patch + * - and some reserved space + */ + imx_map_entry(MX27, AIPI, MT_DEVICE), + /* + * this fixed mapping covers: + * - CSI + * - ATA + */ + imx_map_entry(MX27, SAHB1, MT_DEVICE), + /* + * this fixed mapping covers: + * - EMI + */ + imx_map_entry(MX27, X_MEMC, MT_DEVICE), +}; + +/* + * Initialize the memory map. It is called during the + * system startup to create static physical to virtual + * memory map for the IO modules. + */ +static void __init mx27_map_io(void) +{ + iotable_init(imx27_io_desc, ARRAY_SIZE(imx27_io_desc)); +} + +static void __init imx27_init_early(void) +{ + mxc_set_cpu_type(MXC_CPU_MX27); +} + +static void __init mx27_init_irq(void) +{ + mxc_init_irq(MX27_IO_ADDRESS(MX27_AVIC_BASE_ADDR)); +} + static const char * const imx27_dt_board_compat[] __initconst = { "fsl,imx27", NULL diff --git a/arch/arm/mach-imx/mm-imx27.c b/arch/arm/mach-imx/mm-imx27.c deleted file mode 100644 index 17345066b043..000000000000 --- a/arch/arm/mach-imx/mm-imx27.c +++ /dev/null @@ -1,58 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* - * arch/arm/mach-imx/mm-imx27.c - * - * Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de) - */ - -#include -#include -#include - -#include "common.h" -#include "devices/devices-common.h" -#include "hardware.h" - -/* MX27 memory map definition */ -static struct map_desc imx27_io_desc[] __initdata = { - /* - * this fixed mapping covers: - * - AIPI1 - * - AIPI2 - * - AITC - * - ROM Patch - * - and some reserved space - */ - imx_map_entry(MX27, AIPI, MT_DEVICE), - /* - * this fixed mapping covers: - * - CSI - * - ATA - */ - imx_map_entry(MX27, SAHB1, MT_DEVICE), - /* - * this fixed mapping covers: - * - EMI - */ - imx_map_entry(MX27, X_MEMC, MT_DEVICE), -}; - -/* - * Initialize the memory map. It is called during the - * system startup to create static physical to virtual - * memory map for the IO modules. - */ -void __init mx27_map_io(void) -{ - iotable_init(imx27_io_desc, ARRAY_SIZE(imx27_io_desc)); -} - -void __init imx27_init_early(void) -{ - mxc_set_cpu_type(MXC_CPU_MX27); -} - -void __init mx27_init_irq(void) -{ - mxc_init_irq(MX27_IO_ADDRESS(MX27_AVIC_BASE_ADDR)); -}