From patchwork Wed Sep 2 00:30:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1355467 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=Srwqu/nI; 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=J3y5dEoQ; 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 4Bh4fT3v2jz9sTK for ; Wed, 2 Sep 2020 10:33:05 +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=oSl4vJ/s82YjT3EZccSoyTS/s6a266t8O7bckeEKBzA=; b=Srwqu/nIzVItDsziF7lIwVdUAD oDrBU3w/ImVHeR3EqMnOY+pvlS2qiYei2qZ2O0XyL3nQki2mdeouiVD08glwIVsaY96Wd+U6n2U4c kMntJXMwuaO1kwlqYdc7mJsxv0cag1jqgQ6LuElf1013aIoUpolA6ZGLl4+ttZrpR+NErXbNttA2p /iHmpR7oAogXuQg3bBjQx6yNvH/16J2QThQEyGjeZcN6NgDdGMeeUGpS/ISMlaz+TWFvu2i8S8Euf vm6IdpOnw2jCQOVMxF63BpAabF6wXDIeMThO6VcqxtNsbi9xGc5WY72ahP3Vd1SoWnT4BAOb7wpZ/ HpagPfbg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kDGhh-0001n7-MX; Wed, 02 Sep 2020 00:32:45 +0000 Received: from mail-qk1-x735.google.com ([2607:f8b0:4864:20::735]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kDGhd-0001lC-49 for linux-arm-kernel@lists.infradead.org; Wed, 02 Sep 2020 00:32:43 +0000 Received: by mail-qk1-x735.google.com with SMTP id f2so2848482qkh.3 for ; Tue, 01 Sep 2020 17:32:40 -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=n/LDs04eTgKkGouyZag0frkGR06VqGP603R84Leyf3w=; b=J3y5dEoQedrFXiJ6vdUYHJL6mY5ivCHtbPbXeEDokdrakr4oYHmpuHH5/AqIdLG+xw 32jrOp7c1aLFm/XDZfjV72+d/atLE8vP8yr3Vn8UTORJD+GSG/D8IGVVfiTAfVyLfeCR dE58wN1NQWr6ZK2vX1YVBlqLKGi4yn6lEKhm+eJOLQaoB55fybyDultCSHXwfEZjb7VK 2IYYEHtYRhNtYgFi98gPfu13/mw3+4FzpsJsp5K31E6r4D8v6uq6s4WrvXYmUxRh8GN/ NMcPaITpmq1dcirbKXvUmz1PU1fh5Pu+8aZrA+o/O81j++SoDpb+RWM6y8HW0yaOCOgs qrAw== 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=n/LDs04eTgKkGouyZag0frkGR06VqGP603R84Leyf3w=; b=QMpi2iIbM/NT5WYTrQ9mQPZgpN/P82X4z1aqu2tLwWqSD7TG4gjXZvV4S6fhkloToA 0iZVBUdehxSOWf1nSd6x3LlV6saxALjJ5GBZCjyssjg3mSpfwvPiad5ic0ik1qGWTo/d e5Xr2HHvEvYkdWvRPZ5SJS+oaynWmOy/Q+QEQWXVlBTdBrWGDWtBPaGpel4mwHfTw0k1 FR5D4hfphMtZIemwhdihUmh48S2y7zWSZE9QD1t63udxlUnrfuNbJ191tNZizLLVrkjo wvTv4iYu4BwSVI3j3IGODDzLw7LutH4oKCdDIqk1Tr5XEU+lsmLP30a10sh3QGmexGEM 5S1g== X-Gm-Message-State: AOAM530U7R+z42re/I2dqsekSUvTp2nd1pX2+XyNR3W9fvUpaZnLe5yz AViuBpvPhuEhkceo5aLOlA0= X-Google-Smtp-Source: ABdhPJxwFvM4g6YhRJ3EDMESZlI13FJ7C2gXfdf9ja1DN4zld7kYtO744+W97+HsU5WYZXkeADXyMw== X-Received: by 2002:a05:620a:1595:: with SMTP id d21mr4601842qkk.203.1599006758940; Tue, 01 Sep 2020 17:32:38 -0700 (PDT) Received: from localhost.localdomain ([177.194.72.74]) by smtp.gmail.com with ESMTPSA id d16sm3748864qte.19.2020.09.01.17.32.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2020 17:32:38 -0700 (PDT) From: Fabio Estevam To: shawnguo@kernel.org Subject: [PATCH 4/5] ARM: imx: Remove i.MX35 board files Date: Tue, 1 Sep 2020 21:30:16 -0300 Message-Id: <20200902003018.4870-4-festevam@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200902003018.4870-1-festevam@gmail.com> References: <20200902003018.4870-1-festevam@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200901_203241_229002_081B88EB X-CRM114-Status: GOOD ( 23.71 ) 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:735 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 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 -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 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 i.MX35 has basic device tree support. To achieve the goal of converting all i.MX SoCs to a devicetree-only platform, remove imx35 board files. Signed-off-by: Fabio Estevam --- arch/arm/configs/imx_v6_v7_defconfig | 5 +- arch/arm/mach-imx/Kconfig | 73 +--- arch/arm/mach-imx/Makefile | 8 +- arch/arm/mach-imx/imx35-dt.c | 32 -- arch/arm/mach-imx/mach-mx35_3ds.c | 516 --------------------------- arch/arm/mach-imx/mach-pcm043.c | 412 --------------------- arch/arm/mach-imx/mach-vpr200.c | 306 ---------------- 7 files changed, 10 insertions(+), 1342 deletions(-) delete mode 100644 arch/arm/mach-imx/imx35-dt.c delete mode 100644 arch/arm/mach-imx/mach-mx35_3ds.c delete mode 100644 arch/arm/mach-imx/mach-pcm043.c delete mode 100644 arch/arm/mach-imx/mach-vpr200.c diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 337d3ede0f7f..0fa79bd00219 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -15,11 +15,8 @@ CONFIG_PERF_EVENTS=y # CONFIG_COMPAT_BRK is not set CONFIG_ARCH_MULTI_V6=y CONFIG_ARCH_MXC=y -CONFIG_MACH_IMX35_DT=y -CONFIG_MACH_PCM043=y -CONFIG_MACH_MX35_3DS=y -CONFIG_MACH_VPR200=y CONFIG_SOC_IMX31=y +CONFIG_SOC_IMX35=y CONFIG_SOC_IMX50=y CONFIG_SOC_IMX51=y CONFIG_SOC_IMX53=y diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 0b72883777f2..277562e3ce8c 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -53,14 +53,10 @@ config IMX_HAVE_IOMUX_V1 config ARCH_MXC_IOMUX_V3 bool -config SOC_IMX35 - bool - select ARCH_MXC_IOMUX_V3 - select MXC_AVIC - select PINCTRL_IMX35 - if ARCH_MULTI_V6 +comment "ARM1136 platforms" + config SOC_IMX31 bool "i.MX31 support" select CPU_V6 @@ -68,66 +64,13 @@ config SOC_IMX31 help This enables support for Freescale i.MX31 processor -comment "MX35 platforms:" - -config MACH_IMX35_DT - bool "Support i.MX35 platforms from device tree" - select SOC_IMX35 - help - Include support for Freescale i.MX35 based platforms - using the device tree for discovery. - -config MACH_PCM043 - bool "Support Phytec pcm043 (i.MX35) platforms" - select IMX_HAVE_PLATFORM_FLEXCAN - select IMX_HAVE_PLATFORM_FSL_USB2_UDC - select IMX_HAVE_PLATFORM_IMX2_WDT - select IMX_HAVE_PLATFORM_IMX_I2C - select IMX_HAVE_PLATFORM_IMX_SSI - select IMX_HAVE_PLATFORM_IMX_UART - select IMX_HAVE_PLATFORM_IPU_CORE - select IMX_HAVE_PLATFORM_MXC_EHCI - select IMX_HAVE_PLATFORM_MXC_NAND - select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX - select USB_ULPI_VIEWPORT if USB_ULPI - select SOC_IMX35 - help - Include support for Phytec pcm043 platform. This includes - specific configurations for the board and its peripherals. - -config MACH_MX35_3DS - bool "Support MX35PDK platform" - select IMX_HAVE_PLATFORM_FSL_USB2_UDC - select IMX_HAVE_PLATFORM_IMX2_WDT - select IMX_HAVE_PLATFORM_IMX_FB - select IMX_HAVE_PLATFORM_IMX_I2C - select IMX_HAVE_PLATFORM_IMX_UART - select IMX_HAVE_PLATFORM_IPU_CORE - select IMX_HAVE_PLATFORM_MXC_EHCI - select IMX_HAVE_PLATFORM_MXC_NAND - select IMX_HAVE_PLATFORM_MXC_RTC - select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX - select MXC_DEBUG_BOARD - select SOC_IMX35 - help - Include support for MX35PDK platform. This includes specific - configurations for the board and its peripherals. - -config MACH_VPR200 - bool "Support VPR200 platform" - select IMX_HAVE_PLATFORM_FSL_USB2_UDC - select IMX_HAVE_PLATFORM_GPIO_KEYS - select IMX_HAVE_PLATFORM_IMX2_WDT - select IMX_HAVE_PLATFORM_IMX_I2C - select IMX_HAVE_PLATFORM_IMX_UART - select IMX_HAVE_PLATFORM_IPU_CORE - select IMX_HAVE_PLATFORM_MXC_EHCI - select IMX_HAVE_PLATFORM_MXC_NAND - select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX - select SOC_IMX35 +config SOC_IMX35 + bool "i.MX35 support" + select ARCH_MXC_IOMUX_V3 + select MXC_AVIC + select PINCTRL_IMX35 help - Include support for VPR200 platform. This includes specific - configurations for the board and its peripherals. + This enables support for Freescale i.MX31 processor endif diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 1b3c0cad148b..d6607f3000d9 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -7,7 +7,7 @@ obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o mach-imx27.o obj-$(CONFIG_SOC_IMX27) += mm-imx27.o ehci-imx27.o obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o iomux-imx31.o ehci-imx31.o mach-imx31.o -obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o ehci-imx35.o +obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o ehci-imx35.o mach-imx35.o imx5-pm-$(CONFIG_PM) += pm-imx5.o obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o $(imx5-pm-y) @@ -35,12 +35,6 @@ obj-y += ssi-fiq.o obj-y += ssi-fiq-ksym.o endif -# i.MX35 based machines -obj-$(CONFIG_MACH_PCM043) += mach-pcm043.o -obj-$(CONFIG_MACH_MX35_3DS) += mach-mx35_3ds.o -obj-$(CONFIG_MACH_VPR200) += mach-vpr200.o -obj-$(CONFIG_MACH_IMX35_DT) += imx35-dt.o - obj-$(CONFIG_HAVE_IMX_ANATOP) += anatop.o obj-$(CONFIG_HAVE_IMX_GPC) += gpc.o obj-$(CONFIG_HAVE_IMX_MMDC) += mmdc.o diff --git a/arch/arm/mach-imx/imx35-dt.c b/arch/arm/mach-imx/imx35-dt.c deleted file mode 100644 index ec5c3068715c..000000000000 --- a/arch/arm/mach-imx/imx35-dt.c +++ /dev/null @@ -1,32 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Copyright 2012 Steffen Trumtrar, Pengutronix - * - * based on imx27-dt.c - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "common.h" -#include "mx35.h" - -static const char * const imx35_dt_board_compat[] __initconst = { - "fsl,imx35", - NULL -}; - -DT_MACHINE_START(IMX35_DT, "Freescale i.MX35 (Device Tree Support)") - .l2c_aux_val = 0, - .l2c_aux_mask = ~0, - .map_io = mx35_map_io, - .init_early = imx35_init_early, - .init_irq = mx35_init_irq, - .dt_compat = imx35_dt_board_compat, -MACHINE_END diff --git a/arch/arm/mach-imx/mach-mx35_3ds.c b/arch/arm/mach-imx/mach-mx35_3ds.c deleted file mode 100644 index 802e0abe4568..000000000000 --- a/arch/arm/mach-imx/mach-mx35_3ds.c +++ /dev/null @@ -1,516 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* - * Copyright 2009 Freescale Semiconductor, Inc. All Rights Reserved. - * Copyright (C) 2009 Marc Kleine-Budde, Pengutronix - * - * Author: Fabio Estevam - * - * Copyright (C) 2011 Meprolight, Ltd. - * Alex Gershgorin - * - * Modified from i.MX31 3-Stack Development System - */ - -/* - * This machine is known as: - * - i.MX35 3-Stack Development System - * - i.MX35 Platform Development Kit (i.MX35 PDK) - */ - -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include -#include - -#include