From patchwork Sat Aug 6 04:56:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Shiyan X-Patchwork-Id: 9265861 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BFE0E60754 for ; Sat, 6 Aug 2016 04:59:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A889228455 for ; Sat, 6 Aug 2016 04:59:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9B95B284A0; Sat, 6 Aug 2016 04:59:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8530B28455 for ; Sat, 6 Aug 2016 04:59:36 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bVtgH-0003YL-DC; Sat, 06 Aug 2016 04:57:53 +0000 Received: from smtp19.mail.ru ([94.100.176.156]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bVtfb-0003QH-JQ for linux-arm-kernel@lists.infradead.org; Sat, 06 Aug 2016 04:57:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mail.ru; s=mail2; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=2uqaz7km287kGiPK6+YELb4N9tOSPYwBKfRmRzi3Q8Y=; b=Gg20T1OuGD7gFPyr47ZNoYFDzyAijD40ImuW5U/nfeJG8OVdRbzr/ihWV0T55lsl/sp9NPc35j2xHvWNz5qlpSTtg4aVPfV0ZE3NFgPxcLfDEeAoVMvx8YTsezApQUhBXP/P5OleQFYPaAOFKc7ktB12Fau/Ae8odUYremzB9ZI=; Received: from [5.18.96.7] (port=59108 helo=shc.zet) by smtp19.mail.ru with esmtpa (envelope-from ) id 1bVtfI-0003xq-Jn; Sat, 06 Aug 2016 07:56:52 +0300 From: Alexander Shiyan To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 4/4] ARM: i.MX: Move SOC_IMX1 into 'Device tree only' Date: Sat, 6 Aug 2016 07:56:26 +0300 Message-Id: <1470459386-5197-4-git-send-email-shc_work@mail.ru> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1470459386-5197-1-git-send-email-shc_work@mail.ru> References: <1470459386-5197-1-git-send-email-shc_work@mail.ru> X-Mailru-Sender: 050274E23F23ECC62A697C20888B69DD43C51325D95C8FEEABA52BE3B501098C6BC701AE06E95FB8 X-Mras: OK X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160805_215712_158283_8CC0B557 X-CRM114-Status: GOOD ( 11.04 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexander Shiyan , Arnd Bergmann , Russell King , Sascha Hauer , Fabio Estevam , Shawn Guo MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch moves SOC_IMX1 into 'Device tree only' category and renames imx1-dt.c to mach-imx1.c to align with the name schema of other i.MX DT only platforms. Signed-off-by: Alexander Shiyan --- arch/arm/configs/imx_v4_v5_defconfig | 1 + arch/arm/configs/multi_v4t_defconfig | 2 +- arch/arm/mach-imx/Kconfig | 31 +++++++++++----------------- arch/arm/mach-imx/Makefile | 4 +--- arch/arm/mach-imx/{imx1-dt.c => mach-imx1.c} | 0 5 files changed, 15 insertions(+), 23 deletions(-) rename arch/arm/mach-imx/{imx1-dt.c => mach-imx1.c} (100%) diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig index e70032c..5f013c9f 100644 --- a/arch/arm/configs/imx_v4_v5_defconfig +++ b/arch/arm/configs/imx_v4_v5_defconfig @@ -28,6 +28,7 @@ CONFIG_MACH_MX27_3DS=y CONFIG_MACH_IMX27_VISSTRIM_M10=y CONFIG_MACH_PCA100=y CONFIG_MACH_IMX27_DT=y +CONFIG_SOC_IMX1=y CONFIG_SOC_IMX25=y CONFIG_PREEMPT=y CONFIG_AEABI=y diff --git a/arch/arm/configs/multi_v4t_defconfig b/arch/arm/configs/multi_v4t_defconfig index 141492a..9a6390c 100644 --- a/arch/arm/configs/multi_v4t_defconfig +++ b/arch/arm/configs/multi_v4t_defconfig @@ -20,7 +20,7 @@ CONFIG_INTEGRATOR_CM720T=y CONFIG_INTEGRATOR_CM920T=y CONFIG_INTEGRATOR_CM922T_XA10=y CONFIG_ARCH_MXC=y -CONFIG_MACH_IMX1_DT=y +CONFIG_SOC_IMX1=y CONFIG_ARCH_NSPIRE=y CONFIG_AEABI=y # CONFIG_ATAGS is not set diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index ca7db32..9da3284 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -64,12 +64,6 @@ config IMX_HAVE_IOMUX_V1 config ARCH_MXC_IOMUX_V3 bool -config SOC_IMX1 - bool - select CPU_ARM920T - select MXC_AVIC - select PINCTRL_IMX1 - config SOC_IMX21 bool select CPU_ARM926T @@ -97,19 +91,6 @@ config SOC_IMX35 select PINCTRL_IMX35 select SMP_ON_UP if SMP -if ARCH_MULTI_V4T - -comment "MX1 platforms:" - -config MACH_IMX1_DT - bool "Support i.MX1 platforms from device tree" - select SOC_IMX1 - help - Include support for Freescale i.MX1 based platforms - using the device tree for discovery. - -endif - if ARCH_MULTI_V5 comment "MX21 platforms:" @@ -445,6 +426,18 @@ endif comment "Device tree only" +if ARCH_MULTI_V4T + +config SOC_IMX1 + bool "i.MX1 support" + select CPU_ARM920T + select MXC_AVIC + select PINCTRL_IMX1 + help + This enables support for Freescale i.MX1 processor + +endif + if ARCH_MULTI_V5 config SOC_IMX25 diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 3fa087d..2636adf 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -34,9 +34,6 @@ obj-y += ssi-fiq.o obj-y += ssi-fiq-ksym.o endif -# i.MX1 based machines -obj-$(CONFIG_MACH_IMX1_DT) += imx1-dt.o - # i.MX21 based machines obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o @@ -90,6 +87,7 @@ obj-$(CONFIG_SOC_IMX53) += suspend-imx53.o endif obj-$(CONFIG_SOC_IMX6) += pm-imx6.o +obj-$(CONFIG_SOC_IMX1) += mach-imx1.o obj-$(CONFIG_SOC_IMX50) += mach-imx50.o obj-$(CONFIG_SOC_IMX51) += mach-imx51.o obj-$(CONFIG_SOC_IMX53) += mach-imx53.o diff --git a/arch/arm/mach-imx/imx1-dt.c b/arch/arm/mach-imx/mach-imx1.c similarity index 100% rename from arch/arm/mach-imx/imx1-dt.c rename to arch/arm/mach-imx/mach-imx1.c