From patchwork Fri Mar 6 13:52:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 447311 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4D6D5140161 for ; Sat, 7 Mar 2015 00:56:18 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=Uejr4/hZ; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YTsgv-0005j2-AT; Fri, 06 Mar 2015 13:53:25 +0000 Received: from mail-qc0-x235.google.com ([2607:f8b0:400d:c01::235]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YTsgc-0005GB-09 for linux-arm-kernel@lists.infradead.org; Fri, 06 Mar 2015 13:53:06 +0000 Received: by qcwb13 with SMTP id b13so12845968qcw.9 for ; Fri, 06 Mar 2015 05:52:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IaYxOLBg9oVPCAuJRsKWrFb50ZuqZULLa2G8jHgQyhs=; b=Uejr4/hZgm+GW0dEf1UIqHQQ0xy2yUm1qW2v22aMdc1i0xhJ4FLSdl7HhjlT615HMP pdA5y6n/CpwBSmUit3VKy3lkZoWEeQacykXdVqSNrFwZIB+kqvPtUWiw/5fVpIcyHLBH Csd7/yUT7nhFS97Ajz99rCRs/twwuMWaBCnyyrStpVz6kHLzwsIyG77U7TCGSSU/B7un QvfvZrWAHEFPn5WSozu3qJaUsdi5wcG7xz341gLJbBhEv4F6J4QvYzVXUtH8Qxgq7c4b YPA8nA8YYtcESosHw+R1guaJq/3JET4f/JF+Yeu3F91IuSusXZRZ53pDeB58rshQPYq0 uxZg== X-Received: by 10.55.26.165 with SMTP id l37mr27776126qkh.77.1425649964489; Fri, 06 Mar 2015 05:52:44 -0800 (PST) Received: from localhost.localdomain ([177.194.98.53]) by mx.google.com with ESMTPSA id s7sm5760984qgd.4.2015.03.06.05.52.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 06 Mar 2015 05:52:43 -0800 (PST) From: Fabio Estevam To: shawn.guo@linaro.org Subject: [PATCH 2/3] ARM: mx25: Convert to a dt-only platform Date: Fri, 6 Mar 2015 10:52:27 -0300 Message-Id: <1425649948-451-2-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1425649948-451-1-git-send-email-festevam@gmail.com> References: <1425649948-451-1-git-send-email-festevam@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150306_055306_172120_51B9A045 X-CRM114-Status: GOOD ( 11.36 ) X-Spam-Score: -0.8 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2607:f8b0:400d:c01:0:0:0:235 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.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's 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 Cc: Fabio Estevam , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org From: Fabio Estevam As there is no more mx25 board files, we can turn mx25 into a dt-only platform. Rename imx25-dt.c to mach-imx25.c to be consistent with the other i.MX SoCs. Signed-off-by: Fabio Estevam --- arch/arm/mach-imx/Kconfig | 28 +++++++++++++------------- arch/arm/mach-imx/Makefile | 5 +---- arch/arm/mach-imx/{imx25-dt.c => mach-imx25.c} | 0 3 files changed, 15 insertions(+), 18 deletions(-) rename arch/arm/mach-imx/{imx25-dt.c => mach-imx25.c} (100%) diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 6eec625..ddbb4b8 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -77,13 +77,6 @@ config SOC_IMX21 select IMX_HAVE_IOMUX_V1 select MXC_AVIC -config SOC_IMX25 - bool - select ARCH_MXC_IOMUX_V3 - select CPU_ARM926T - select MXC_AVIC - select PINCTRL_IMX25 - config SOC_IMX27 bool select CPU_ARM926T @@ -149,13 +142,6 @@ config MACH_MX21ADS Include support for MX21ADS platform. This includes specific configurations for the board and its peripherals. -config MACH_IMX25_DT - bool "Support i.MX25 platforms from device tree" - select SOC_IMX25 - help - Include support for Freescale i.MX25 based platforms - using the device tree for discovery - comment "MX27 platforms:" config MACH_MX27ADS @@ -508,6 +494,20 @@ config MACH_VPR200 endif +if ARCH_MULTI_V5 + +comment "Device tree only" + +config SOC_IMX25 + bool "i.MX25 support" + select ARCH_MXC_IOMUX_V3 + select CPU_ARM926T + select MXC_AVIC + select PINCTRL_IMX25 + help + This enables support for Freescale i.MX25 processor +endif + if ARCH_MULTI_V7 comment "Device tree only" diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 724b7fb..45f183a 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -3,7 +3,7 @@ obj-y := time.o cpu.o system.o irq-common.o obj-$(CONFIG_SOC_IMX1) += clk-imx1.o mm-imx1.o obj-$(CONFIG_SOC_IMX21) += clk-imx21.o mm-imx21.o -obj-$(CONFIG_SOC_IMX25) += clk-imx25.o mm-imx25.o ehci-imx25.o cpu-imx25.o +obj-$(CONFIG_SOC_IMX25) += clk-imx25.o mm-imx25.o ehci-imx25.o cpu-imx25.o mach-imx25.o obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o obj-$(CONFIG_SOC_IMX27) += clk-imx27.o mm-imx27.o ehci-imx27.o @@ -48,9 +48,6 @@ obj-$(CONFIG_MACH_IMX1_DT) += imx1-dt.o # i.MX21 based machines obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o -# i.MX25 based machines -obj-$(CONFIG_MACH_IMX25_DT) += imx25-dt.o - # i.MX27 based machines obj-$(CONFIG_MACH_MX27ADS) += mach-mx27ads.o obj-$(CONFIG_MACH_MX27_3DS) += mach-mx27_3ds.o diff --git a/arch/arm/mach-imx/imx25-dt.c b/arch/arm/mach-imx/mach-imx25.c similarity index 100% rename from arch/arm/mach-imx/imx25-dt.c rename to arch/arm/mach-imx/mach-imx25.c