| Message ID | 1393490565-26387-2-git-send-email-shawn.guo@linaro.org |
|---|---|
| State | New |
| Headers | show
Return-Path: <patchwork-forward+bncBCV3TM5A74DRBXPVXOMAKGQEZEQRFHY@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f198.google.com (mail-vc0-f198.google.com [209.85.220.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E7E8A201EE for <linaro@patches.linaro.org>; Thu, 27 Feb 2014 08:44:13 +0000 (UTC) Received: by mail-vc0-f198.google.com with SMTP id lf12sf4898771vcb.1 for <linaro@patches.linaro.org>; Thu, 27 Feb 2014 00:44:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:mime-version:cc:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=R4qEQLhAIAw0G1O8BBXmfheDKxS378p4g/ZbvI1T0U4=; b=SL3VgTpezg/9WNKioCgjukMlYZ34oGQyt2ox00vNOmK3sI+1XZDBtlo3y7U6KX0rCj mRJPw325sPrmvZHAqdd5TclNdV1RqWPw3KvBCqeq3xkOqQGsQAy7MASSav12TGrQPqh9 mYaykaTpD07MMbDU8w8KlXCSP2l0YhlJ6PQFoDsrpX7qtaSBA77KF4xgq42gwajE7ppk j8mOMH1AFJx4VnJvu5wDrIlkUVX13OdbQszc4Xh9IRAH0QB55j3sPS/GOqPwpYbewToi /rohQ0i3keDYsD2KOKnxIv/8Z8wWOd74+u2Hqt9ZqJQ+6J48TJQXsRwyvMpdp+GLTOSc 726A== X-Gm-Message-State: ALoCoQn5T0CVWRogkl2dB5qWd9wATg+y8Dio8CKbpRdB30qO6W2s5FVW3P568ngwNh8s3ECAzeFO X-Received: by 10.236.86.77 with SMTP id v53mr4327990yhe.41.1393490653508; Thu, 27 Feb 2014 00:44:13 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.29.134 with SMTP id b6ls554120qgb.91.gmail; Thu, 27 Feb 2014 00:44:13 -0800 (PST) X-Received: by 10.52.248.138 with SMTP id ym10mr8163307vdc.18.1393490653385; Thu, 27 Feb 2014 00:44:13 -0800 (PST) Received: from mail-ve0-f182.google.com (mail-ve0-f182.google.com [209.85.128.182]) by mx.google.com with ESMTPS id dq2si959007veb.31.2014.02.27.00.44.13 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 27 Feb 2014 00:44:13 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.182; Received: by mail-ve0-f182.google.com with SMTP id jy13so3461294veb.41 for <patchwork-forward@linaro.org>; Thu, 27 Feb 2014 00:44:13 -0800 (PST) X-Received: by 10.220.147.16 with SMTP id j16mr348088vcv.28.1393490653252; Thu, 27 Feb 2014 00:44:13 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp1630vcz; Thu, 27 Feb 2014 00:44:12 -0800 (PST) X-Received: by 10.194.2.70 with SMTP id 6mr6289472wjs.25.1393490652080; Thu, 27 Feb 2014 00:44:12 -0800 (PST) Received: from casper.infradead.org (casper.infradead.org. [2001:770:15f::2]) by mx.google.com with ESMTPS id sl4si12193675wic.80.2014.02.27.00.44.11 for <patch@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Feb 2014 00:44:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:770:15f::2 as permitted sender) client-ip=2001:770:15f::2; Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WIwYY-0005h5-0I; Thu, 27 Feb 2014 08:43:02 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WIwYO-0005my-1U; Thu, 27 Feb 2014 08:42:52 +0000 Received: from ch1ehsobe003.messaging.microsoft.com ([216.32.181.183] helo=ch1outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WIwY7-0005jz-2s for linux-arm-kernel@lists.infradead.org; Thu, 27 Feb 2014 08:42:36 +0000 Received: from mail108-ch1-R.bigfish.com (10.43.68.254) by CH1EHSOBE008.bigfish.com (10.43.70.58) with Microsoft SMTP Server id 14.1.225.22; Thu, 27 Feb 2014 08:42:12 +0000 Received: from mail108-ch1 (localhost [127.0.0.1]) by mail108-ch1-R.bigfish.com (Postfix) with ESMTP id 02A01240417; Thu, 27 Feb 2014 08:42:12 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zze0eahzz1f42h2148h208ch1ee6h1de0h1fdah2073h2146h1202h1e76h2189h1d1ah1d2ah21bch1fc6hzz1de098h8275dh1de097hz2dh87h2a8h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1b2fh2222h224fh1fb3h1d0ch1d2eh1d3fh1dfeh1dffh1e23h1fe8h1ff5h2218h2216h226dh22d0h24afh2327h2336h2438h2461h2487h24d7h2516h2545h255eh25cch1151h1155h) X-FB-DOMAIN-IP-MATCH: fail Received: from mail108-ch1 (localhost.localdomain [127.0.0.1]) by mail108-ch1 (MessageSwitch) id 139349053028198_24902; Thu, 27 Feb 2014 08:42:10 +0000 (UTC) Received: from CH1EHSMHS012.bigfish.com (snatpool2.int.messaging.microsoft.com [10.43.68.232]) by mail108-ch1.bigfish.com (Postfix) with ESMTP id 02AFC10008A; Thu, 27 Feb 2014 08:42:10 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CH1EHSMHS012.bigfish.com (10.43.70.12) with Microsoft SMTP Server (TLS) id 14.16.227.3; Thu, 27 Feb 2014 08:42:09 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-004.039d.mgd.msft.net (10.84.1.14) with Microsoft SMTP Server (TLS) id 14.3.158.2; Thu, 27 Feb 2014 08:42:08 +0000 Received: from S2101-09.ap.freescale.net ([10.192.185.165]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id s1R8g442019409; Thu, 27 Feb 2014 01:42:07 -0700 From: Shawn Guo <shawn.guo@linaro.org> To: <linux-arm-kernel@lists.infradead.org> Subject: [PATCH 2/3] ARM: imx6: rename pm-imx6q.c to pm-imx6.c Date: Thu, 27 Feb 2014 16:42:44 +0800 Message-ID: <1393490565-26387-2-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1393490565-26387-1-git-send-email-shawn.guo@linaro.org> References: <1393490565-26387-1-git-send-email-shawn.guo@linaro.org> MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140227_034235_218342_FD2C90B6 X-CRM114-Status: UNSURE ( 7.63 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [216.32.181.183 listed in list.dnswl.org] 0.7 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Shawn Guo <shawn.guo@linaro.org>, kernel@pengutronix.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: <patchwork-forward.linaro.org> List-Unsubscribe: <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe>, <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: shawn.guo@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit |
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 9c776a0..19a6d0e 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -104,9 +104,7 @@ obj-$(CONFIG_SOC_IMX6SL) += clk-imx6sl.o mach-imx6sl.o AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a obj-$(CONFIG_SUSPEND) += suspend-imx6.o -obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o -# i.MX6SL reuses i.MX6Q code -obj-$(CONFIG_SOC_IMX6SL) += pm-imx6q.o +obj-$(CONFIG_SOC_IMX6) += pm-imx6.o # i.MX5 based machines obj-$(CONFIG_MACH_MX51_BABBAGE) += mach-mx51_babbage.o
The pm-imx6q.c works for all i.MX6 SoCs, so let's rename it to pm-imx6.c and have the build controlled by option CONFIG_SOC_IMX6. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> --- arch/arm/mach-imx/Makefile | 4 +--- arch/arm/mach-imx/{pm-imx6q.c => pm-imx6.c} | 0 2 files changed, 1 insertion(+), 3 deletions(-) rename arch/arm/mach-imx/{pm-imx6q.c => pm-imx6.c} (100%) diff --git a/arch/arm/mach-imx/pm-imx6q.c b/arch/arm/mach-imx/pm-imx6.c similarity index 100% rename from arch/arm/mach-imx/pm-imx6q.c rename to arch/arm/mach-imx/pm-imx6.c