From patchwork Mon May 19 06:56:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 350081 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 A137914007F for ; Mon, 19 May 2014 17:01:00 +1000 (EST) 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 1WmHVx-0002Sq-5s; Mon, 19 May 2014 06:57:37 +0000 Received: from mail-bn1bln0107.outbound.protection.outlook.com ([2a01:111:f400:7c10::1:107] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WmHVs-0002RW-Jj for linux-arm-kernel@lists.infradead.org; Mon, 19 May 2014 06:57:33 +0000 Received: from BY2PR03CA070.namprd03.prod.outlook.com (10.141.249.43) by BY2PR03MB348.namprd03.prod.outlook.com (10.141.139.22) with Microsoft SMTP Server (TLS) id 15.0.944.11; Mon, 19 May 2014 06:57:08 +0000 Received: from BN1AFFO11FD042.protection.gbl (2a01:111:f400:7c10::161) by BY2PR03CA070.outlook.office365.com (2a01:111:e400:2c5d::43) with Microsoft SMTP Server (TLS) id 15.0.944.11 via Frontend Transport; Mon, 19 May 2014 06:57:07 +0000 Received: from az84smr01.freescale.net (192.88.158.2) by BN1AFFO11FD042.mail.protection.outlook.com (10.58.52.253) with Microsoft SMTP Server (TLS) id 15.0.949.9 via Frontend Transport; Mon, 19 May 2014 06:57:07 +0000 Received: from dragon.ap.freescale.net ([10.192.185.176]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id s4J6v252020253; Sun, 18 May 2014 23:57:05 -0700 From: Shawn Guo To: Subject: [PATCH 1/4] ARM: imx: move SOC_IMX5 and SOC_IMX51 into 'Device tree only' Date: Mon, 19 May 2014 14:56:43 +0800 Message-ID: <1400482606-8278-2-git-send-email-shawn.guo@freescale.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1400482606-8278-1-git-send-email-shawn.guo@freescale.com> References: <1400482606-8278-1-git-send-email-shawn.guo@freescale.com> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(6009001)(199002)(189002)(92566001)(21056001)(83322001)(74662001)(19580405001)(86362001)(84676001)(81542001)(62966002)(93916002)(44976005)(74502001)(77982001)(77156001)(31966008)(80022001)(48376002)(19580395003)(79102001)(83072002)(76482001)(89996001)(85852003)(81342001)(4396001)(20776003)(81156002)(64706001)(69596002)(68736004)(47776003)(50226001)(6806004)(102836001)(76176999)(46102001)(50466002)(87936001)(36756003)(77096999)(33646001)(50986999)(92726001)(88136002)(99396002)(87286001); DIR:OUT; SFP:; SCL:1; SRVR:BY2PR03MB348; H:az84smr01.freescale.net; FPR:; MLV:sfv; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Forefront-PRVS: 021670B4D2 Received-SPF: Fail (: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=Shawn.Guo@freescale.com; X-OriginatorOrg: freescale.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140518_235732_890560_5D384F71 X-CRM114-Status: UNSURE ( 7.92 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.3.2 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record Cc: Shawn Guo , kernel@pengutronix.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 After moving SOC_IMX51 support over to device tree, all i.MX5 support becomes device tree only now. So options SOC_IMX5 and SOC_IMX51 can just be under 'Device tree only'. Signed-off-by: Shawn Guo --- arch/arm/mach-imx/Kconfig | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index a6ee115..19c609e 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -122,19 +122,6 @@ config SOC_IMX35 select PINCTRL_IMX35 select SMP_ON_UP if SMP -config SOC_IMX5 - bool - select ARCH_HAS_CPUFREQ - select ARCH_HAS_OPP - select ARCH_MXC_IOMUX_V3 - select HAVE_IMX_SRC - select MXC_TZIC - -config SOC_IMX51 - bool - select PINCTRL_IMX51 - select SOC_IMX5 - if ARCH_MULTI_V4T comment "MX1 platforms:" @@ -704,6 +691,19 @@ if ARCH_MULTI_V7 comment "Device tree only" +config SOC_IMX5 + bool + select ARCH_HAS_CPUFREQ + select ARCH_HAS_OPP + select ARCH_MXC_IOMUX_V3 + select HAVE_IMX_SRC + select MXC_TZIC + +config SOC_IMX51 + bool + select PINCTRL_IMX51 + select SOC_IMX5 + config SOC_IMX50 bool "i.MX50 support" select PINCTRL_IMX50