From patchwork Sat Sep 6 04:34:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Shiyan X-Patchwork-Id: 4857011 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D5EBC9F32F for ; Sat, 6 Sep 2014 04:38:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B0A6520256 for ; Sat, 6 Sep 2014 04:38:08 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A8EFD20251 for ; Sat, 6 Sep 2014 04:38:07 +0000 (UTC) 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 1XQ7ij-0005EV-Af; Sat, 06 Sep 2014 04:35:29 +0000 Received: from smtp43.i.mail.ru ([94.100.177.103]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XQ7iT-00045R-Qr for linux-arm-kernel@lists.infradead.org; Sat, 06 Sep 2014 04:35:16 +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=h4XK0B44wprT+lJxuY9KCUOGhRrDJYgG8Q1C0x/HbeU=; b=XpOOceYl/EjcyOlUM37lPPLRjm728hW6ODYhta1BdcK/TDGRW/SJNV4gBnMhEgqLraUWeytN/fCqGGaVwU0Zund4+SNQZ7iX72eNPNuaQSOEWRtDd0i5gi9fUJ4z/DQh5cVChWc94ofZyvz0RCoud/8AijEJP9l88K9rNTDO9PE=; Received: from [5.18.98.7] (port=58763 helo=shc.zet) by smtp43.i.mail.ru with esmtpa (envelope-from ) id 1XQ7i7-0000DR-9I; Sat, 06 Sep 2014 08:34:51 +0400 From: Alexander Shiyan To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 4/4] ARM: i.MX: Move SOC_IMX1 into 'Device tree only' Date: Sat, 6 Sep 2014 08:34:43 +0400 Message-Id: <1409978083-20047-4-git-send-email-shc_work@mail.ru> X-Mailer: git-send-email 1.8.5.5 In-Reply-To: <1409978083-20047-1-git-send-email-shc_work@mail.ru> References: <1409978083-20047-1-git-send-email-shc_work@mail.ru> X-Mras: Ok X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140905_213514_514254_FC5A4B46 X-CRM114-Status: GOOD ( 16.71 ) X-Spam-Score: -0.1 (/) Cc: Alexander Shiyan , Sascha Hauer , Shawn Guo X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-3.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,RP_MATCHES_RCVD,T_DKIM_INVALID, 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 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 | 3 +-- arch/arm/mach-imx/Kconfig | 49 +++++++++++++----------------------- arch/arm/mach-imx/Makefile | 5 +--- arch/arm/mach-imx/imx1-dt.c | 45 --------------------------------- arch/arm/mach-imx/mach-imx1.c | 45 +++++++++++++++++++++++++++++++++ 5 files changed, 65 insertions(+), 82 deletions(-) delete mode 100644 arch/arm/mach-imx/imx1-dt.c create mode 100644 arch/arm/mach-imx/mach-imx1.c diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig index a3fb866..69ddc41 100644 --- a/arch/arm/configs/imx_v4_v5_defconfig +++ b/arch/arm/configs/imx_v4_v5_defconfig @@ -22,8 +22,6 @@ CONFIG_ARCH_MULTI_V5=y # CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_MXC=y CONFIG_MXC_IRQ_PRIOR=y -CONFIG_MACH_SCB9328=y -CONFIG_MACH_APF9328=y CONFIG_MACH_MX21ADS=y CONFIG_MACH_MX25_3DS=y CONFIG_MACH_EUKREA_CPUIMX25SD=y @@ -34,6 +32,7 @@ CONFIG_MACH_IMX27_VISSTRIM_M10=y CONFIG_MACH_PCA100=y CONFIG_MACH_MXT_TD60=y CONFIG_MACH_IMX27_DT=y +CONFIG_SOC_IMX1=y CONFIG_PREEMPT=y CONFIG_AEABI=y CONFIG_ZBOOT_ROM_TEXT=0x0 diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 6333d30..e8d34f0 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 @@ -105,19 +99,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:" @@ -553,35 +534,43 @@ config MACH_VPR200 endif -if ARCH_MULTI_V7 - comment "Device tree only" +config SOC_IMX1 + bool "i.MX1 support" + depends on ARCH_MULTI_V4T + select CPU_ARM920T + select MXC_AVIC + select PINCTRL_IMX1 + help + This enables support for Freescale i.MX1 processor. + config SOC_IMX5 bool select HAVE_IMX_SRC select MXC_TZIC -config SOC_IMX50 +config SOC_IMX50 bool "i.MX50 support" + depends on ARCH_MULTI_V7 select PINCTRL_IMX50 select SOC_IMX5 - help This enables support for Freescale i.MX50 processor. config SOC_IMX51 bool "i.MX51 support" + depends on ARCH_MULTI_V7 select PINCTRL_IMX51 select SOC_IMX5 help This enables support for Freescale i.MX51 processor -config SOC_IMX53 +config SOC_IMX53 bool "i.MX53 support" + depends on ARCH_MULTI_V7 select PINCTRL_IMX53 select SOC_IMX5 - help This enables support for Freescale i.MX53 processor. @@ -599,44 +588,42 @@ config SOC_IMX6 config SOC_IMX6Q bool "i.MX6 Quad/DualLite support" + depends on ARCH_MULTI_V7 select ARM_ERRATA_764369 if SMP select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP select PCI_DOMAINS if PCI select PINCTRL_IMX6Q select SOC_IMX6 - help This enables support for Freescale i.MX6 Quad processor. config SOC_IMX6SL bool "i.MX6 SoloLite support" + depends on ARCH_MULTI_V7 select PINCTRL_IMX6SL select SOC_IMX6 - help This enables support for Freescale i.MX6 SoloLite processor. config SOC_IMX6SX bool "i.MX6 SoloX support" + depends on ARCH_MULTI_V7 select PINCTRL_IMX6SX select SOC_IMX6 - help This enables support for Freescale i.MX6 SoloX processor. config SOC_VF610 bool "Vybrid Family VF610 support" + depends on ARCH_MULTI_V7 select ARM_GIC select PINCTRL_VF610 select VF_PIT_TIMER select PL310_ERRATA_769419 if CACHE_L2X0 - help This enable support for Freescale Vybrid VF610 processor. -endif - source "arch/arm/mach-imx/devices/Kconfig" endif diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index ce7e05fb..ec165e2 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -1,6 +1,5 @@ obj-y := time.o cpu.o system.o irq-common.o -obj-$(CONFIG_SOC_IMX1) += clk-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 @@ -40,9 +39,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 @@ -102,6 +98,7 @@ obj-$(CONFIG_SOC_IMX6) += suspend-imx6.o endif obj-$(CONFIG_SOC_IMX6) += pm-imx6.o +obj-$(CONFIG_SOC_IMX1) += mach-imx1.o clk-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/imx1-dt.c deleted file mode 100644 index de5ab8d..0000000 --- a/arch/arm/mach-imx/imx1-dt.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2014 Alexander Shiyan - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ - -#include -#include -#include - -#include "common.h" -#include "hardware.h" - -#define MX1_AVIC_ADDR 0x00223000 - -static void __init imx1_init_early(void) -{ - mxc_set_cpu_type(MXC_CPU_MX1); -} - -static void __init imx1_init_irq(void) -{ - void __iomem *avic_addr; - - avic_addr = ioremap(MX1_AVIC_ADDR, SZ_4K); - WARN_ON(!avic_addr); - - mxc_init_irq(avic_addr); -} - -static const char * const imx1_dt_board_compat[] __initconst = { - "fsl,imx1", - NULL -}; - -DT_MACHINE_START(IMX1_DT, "Freescale i.MX1 (Device Tree Support)") - .map_io = debug_ll_io_init, - .init_early = imx1_init_early, - .init_irq = imx1_init_irq, - .dt_compat = imx1_dt_board_compat, - .restart = mxc_restart, -MACHINE_END diff --git a/arch/arm/mach-imx/mach-imx1.c b/arch/arm/mach-imx/mach-imx1.c new file mode 100644 index 0000000..de5ab8d --- /dev/null +++ b/arch/arm/mach-imx/mach-imx1.c @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2014 Alexander Shiyan + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#include +#include +#include + +#include "common.h" +#include "hardware.h" + +#define MX1_AVIC_ADDR 0x00223000 + +static void __init imx1_init_early(void) +{ + mxc_set_cpu_type(MXC_CPU_MX1); +} + +static void __init imx1_init_irq(void) +{ + void __iomem *avic_addr; + + avic_addr = ioremap(MX1_AVIC_ADDR, SZ_4K); + WARN_ON(!avic_addr); + + mxc_init_irq(avic_addr); +} + +static const char * const imx1_dt_board_compat[] __initconst = { + "fsl,imx1", + NULL +}; + +DT_MACHINE_START(IMX1_DT, "Freescale i.MX1 (Device Tree Support)") + .map_io = debug_ll_io_init, + .init_early = imx1_init_early, + .init_irq = imx1_init_irq, + .dt_compat = imx1_dt_board_compat, + .restart = mxc_restart, +MACHINE_END