| Message ID | 20140305051543.GB23980@S2101-09.ap.freescale.net |
|---|---|
| State | New |
| Headers | show
Return-Path: <patchwork-forward+bncBCV3TM5A74DRBNXG3KMAKGQEUERW5AI@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f69.google.com (mail-pa0-f69.google.com [209.85.220.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 322BA20540 for <linaro@patches.linaro.org>; Wed, 5 Mar 2014 05:16:39 +0000 (UTC) Received: by mail-pa0-f69.google.com with SMTP id fb1sf1336437pad.0 for <linaro@patches.linaro.org>; Tue, 04 Mar 2014 21:16:38 -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:date:from:to:subject:message-id :mime-version:user-agent: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-disposition:content-type:content-transfer-encoding; bh=Y6sjwZueWRsljLU7ERZ0NVcf6awxnq5hrEV4fk+tSHs=; b=W2tWqxY07RmUTiV8RCnPSY+VXZaduu5Ia55CbxmsAb6mBWdjW8OTftlSunzrF3q5Du tmCQuVxq4MS4Sc197/a0v1N9WYdwDgItNan5dnVwwfS7IQwbvTA1Cz072QLq/wbQnOAd EeWrvUzCtONxUFK61yj35XlXmriqX8/PsWbkXdI43pzPcILxUPxa3ngZkjL891WFCKDn ozy1k94Uwor9NAWka6deM1MsKBjXw1JfAEdg7LPnUiw/Of30y9gffqb7We5Dq5SQn6Tk VwQixESCEBQycumlU1hmVoXDf2rPizzNevSZrj7c5XoJCbZHkYOXPYTHvw57sRYLNKwv yrlw== X-Gm-Message-State: ALoCoQnczTjkkVLflqT9l4TulQycmlJxR0Hmftdk1kmL9yU0avO+k2j0p6wu1UC2zlP6oKtj2T9K X-Received: by 10.66.137.8 with SMTP id qe8mr1689467pab.46.1393996598337; Tue, 04 Mar 2014 21:16:38 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.40.165 with SMTP id x34ls153572qgx.53.gmail; Tue, 04 Mar 2014 21:16:38 -0800 (PST) X-Received: by 10.52.27.9 with SMTP id p9mr2462655vdg.28.1393996598182; Tue, 04 Mar 2014 21:16:38 -0800 (PST) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id t4si375712vcz.133.2014.03.04.21.16.38 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Mar 2014 21:16:38 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.178; Received: by mail-vc0-f178.google.com with SMTP id ik5so517842vcb.23 for <patchwork-forward@linaro.org>; Tue, 04 Mar 2014 21:16:38 -0800 (PST) X-Received: by 10.220.164.80 with SMTP id d16mr2792509vcy.15.1393996598083; Tue, 04 Mar 2014 21:16:38 -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.130.193 with SMTP id u1csp177941vcs; Tue, 4 Mar 2014 21:16:37 -0800 (PST) X-Received: by 10.194.174.197 with SMTP id bu5mr4893107wjc.71.1393996597203; Tue, 04 Mar 2014 21:16:37 -0800 (PST) Received: from casper.infradead.org (casper.infradead.org. [2001:770:15f::2]) by mx.google.com with ESMTPS id j8si1434310wjz.101.2014.03.04.21.16.36 for <patch@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Mar 2014 21:16:37 -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 1WL4Bo-00050s-4q; Wed, 05 Mar 2014 05:16:20 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WL4Bl-0002Y8-N3; Wed, 05 Mar 2014 05:16:17 +0000 Received: from va3ehsobe003.messaging.microsoft.com ([216.32.180.13] helo=va3outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WL4Bj-0002XI-21 for linux-arm-kernel@lists.infradead.org; Wed, 05 Mar 2014 05:16:15 +0000 Received: from mail157-va3-R.bigfish.com (10.7.14.229) by VA3EHSOBE007.bigfish.com (10.7.40.11) with Microsoft SMTP Server id 14.1.225.22; Wed, 5 Mar 2014 05:15:53 +0000 Received: from mail157-va3 (localhost [127.0.0.1]) by mail157-va3-R.bigfish.com (Postfix) with ESMTP id 1E21140180; Wed, 5 Mar 2014 05:15:53 +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: -1 X-BigFish: VS-1(zz936eIe0eahzz1f42h2148h208ch1ee6h1de0h1fdah2073h2146h1202h1e76h2189h1d1ah1d2ah21bch1fc6hzz8275dh1de097hz2dh87h2a8h839h944hd25hf0ah1220h1288h12a5h12a9h12bdh137ah13b6h1441h1504h1537h153bh162dh1631h1758h18e1h1946h19b5h1ad9h1b0ah1b2fh2222h224fh1fb3h1d0ch1d2eh1d3fh1dc1h1dfeh1dffh1fe8h1ff5h209eh2216h22d0h2336h2438h2461h2487h24d7h2516h2545h255eh25cch25f6h1151h1155h) X-FB-DOMAIN-IP-MATCH: fail Received: from mail157-va3 (localhost.localdomain [127.0.0.1]) by mail157-va3 (MessageSwitch) id 1393996550351615_24460; Wed, 5 Mar 2014 05:15:50 +0000 (UTC) Received: from VA3EHSMHS002.bigfish.com (unknown [10.7.14.252]) by mail157-va3.bigfish.com (Postfix) with ESMTP id 3FBD0480057; Wed, 5 Mar 2014 05:15:50 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by VA3EHSMHS002.bigfish.com (10.7.99.12) with Microsoft SMTP Server (TLS) id 14.16.227.3; Wed, 5 Mar 2014 05:15:46 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-003.039d.mgd.msft.net (10.84.1.16) with Microsoft SMTP Server (TLS) id 14.3.158.2; Wed, 5 Mar 2014 05:15:44 +0000 Received: from S2101-09.ap.freescale.net ([10.192.185.196]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id s255Fg1g030245; Tue, 4 Mar 2014 22:15:43 -0700 Date: Wed, 5 Mar 2014 13:15:45 +0800 From: Shawn Guo <shawn.guo@linaro.org> To: <arm@kernel.org> Subject: [GIT PULL] ARM: imx: soc changes for 3.15 Message-ID: <20140305051543.GB23980@S2101-09.ap.freescale.net> MIME-Version: 1.0 User-Agent: Mutt/1.5.21 (2010-09-15) 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-20140305_001615_176377_375EA36B X-CRM114-Status: GOOD ( 13.90 ) 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.180.13 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>, linux-arm-kernel@lists.infradead.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.220.178 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-Disposition: inline Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit |
On Wed, Mar 05, 2014 at 01:15:45PM +0800, Shawn Guo wrote: > Hi, > > This is the imx soc changes I collected for 3.15. To avoid quite a few > annoying conflicts, I have to base the change set on 3.14-rc4 and Rob's > kconfig-cleanup-for-3.15. Please be noted, there is conflict between > 3.14-rc4 and kconfig-cleanup-for-3.15 on arch/arm/mach-omap2/Kconfig. > The conflict is quite obvious and easy to resolve though. > > Shawn > > The following changes since commit c1b2a174c33ae2bd453e40199de4f93c684500e6: > > Merge tag 'kconfig-cleanup-for-3.15' into imx/soc (2014-03-05 10:31:54 +0800) > > are available in the git repository at: > > > git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-soc-3.15 Pulled, thanks. -Olof
Hi, This is the imx soc changes I collected for 3.15. To avoid quite a few annoying conflicts, I have to base the change set on 3.14-rc4 and Rob's kconfig-cleanup-for-3.15. Please be noted, there is conflict between 3.14-rc4 and kconfig-cleanup-for-3.15 on arch/arm/mach-omap2/Kconfig. The conflict is quite obvious and easy to resolve though. Shawn The following changes since commit c1b2a174c33ae2bd453e40199de4f93c684500e6: Merge tag 'kconfig-cleanup-for-3.15' into imx/soc (2014-03-05 10:31:54 +0800) are available in the git repository at: git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-soc-3.15 for you to fetch changes up to c8ae7e9bfc8caf679e891c4f0a04f2435b45e2da: ARM: imx6: drop .text.head section annotation from headsmp.S (2014-03-05 10:48:26 +0800) ---------------------------------------------------------------- i.MX SoC changes for 3.15: - Support suspend from ocram (DDR IO floating) for imx6 platforms - Add cpuidle support for imx6sl - Sparse warning fixes for imx6sl and vf610 clock code - Remove PWM platform code - Support ptp and rmii clock from pad - Support WEIM CS GPR configuration - Random cleanups and defconfig updates ---------------------------------------------------------------- Anson Huang (8): ARM: imx: AHB rate must be set to 132MHz on i.mx6sl ARM: imx: add cpuidle support for i.mx6sl ARM: imx: add suspend in ocram support for i.mx6q ARM: imx: add suspend in ocram support for i.mx6dl ARM: imx: add suspend in ocram support for i.mx6sl ARM: imx: add always-on clock array for i.mx6sl to maintain correct usecount ARM: imx: avoid calling clk APIs in idle thread which may cause schedule ARM: imx: add speed grading check for i.mx6 soc Denis Carikli (3): ARM: imx_v6_v7_defconfig: Enable backlight gpio support. ARM i.MX35: build in pinctrl support. ARM: imx_v6_v7_defconfig: Enable some drivers used on the cpuimx35. Fabio Estevam (7): ARM: imx_v6_v7_defconfig: Select PCI support ARM: imx: Use INT_MEM_CLK_LPM as the bit name ARM: imx_v4_v5_defconfig: Select CONFIG_MMC_UNSAFE_RESUME ARM: imx_v6_v7_defconfig: Select CONFIG_MMC_UNSAFE_RESUME ARM: mach-imx: Select CONFIG_SRAM at ARCH_MXC level ARM: imx_v6_v7_defconfig: Select CONFIG_DEBUG_FS ARM: mach-imx: Kconfig: Remove IMX_HAVE_PLATFORM_IMX2_WDT from SOC_IMX53 John Tobias (1): ARM: imx: add select on ARCH_MXC for cpufreq support Liu Ying (2): ARM: imx: clk-imx6sl: Suppress duplicate const sparse warning ARM: imx: clk-vf610: Suppress duplicate const sparse warning Philipp Zabel (2): ARM: imx6q: Add GPR6 and GPR7 register definitions for iomuxc gpr ARM i.MX6q: Mark VPU and IPU AXI transfers as cacheable, increase IPU priority Sascha Hauer (1): ARM i.MX: remove PWM platform support Sebastian Andrzej Siewior (1): ARM: imx: enable delaytimer on the imx timer Shawn Guo (11): ARM: imx6q: remove unneeded clk lookups ARM: imx6q: support ptp and rmii clock from pad bus: imx-weim: support CS GPR configuration ARM: imx6: move v7_cpu_resume() into suspend-imx6.S ARM: imx6: build headsmp.o only on CONFIG_SMP ARM: imx6: call suspend_set_ops() from suspend routine ARM: imx6: do not call imx6q_suspend_init() with !CONFIG_SUSPEND ARM: imx6: introduce CONFIG_SOC_IMX6 for i.MX6 common stuff ARM: imx6: rename pm-imx6q.c to pm-imx6.c ARM: imx6: build suspend-imx6.o with CONFIG_SOC_IMX6 ARM: imx6: drop .text.head section annotation from headsmp.S Documentation/devicetree/bindings/bus/imx-weim.txt | 28 +- arch/arm/configs/imx_v4_v5_defconfig | 1 + arch/arm/configs/imx_v6_v7_defconfig | 7 + arch/arm/mach-imx/Kconfig | 43 +- arch/arm/mach-imx/Makefile | 9 +- arch/arm/mach-imx/clk-imx21.c | 1 - arch/arm/mach-imx/clk-imx25.c | 8 - arch/arm/mach-imx/clk-imx27.c | 1 - arch/arm/mach-imx/clk-imx51-imx53.c | 2 - arch/arm/mach-imx/clk-imx6q.c | 7 +- arch/arm/mach-imx/clk-imx6sl.c | 159 +++++- arch/arm/mach-imx/clk-vf610.c | 36 +- arch/arm/mach-imx/common.h | 17 +- arch/arm/mach-imx/cpuidle-imx6q.c | 4 +- arch/arm/mach-imx/cpuidle-imx6sl.c | 57 ++ arch/arm/mach-imx/cpuidle.h | 5 + arch/arm/mach-imx/devices-imx25.h | 4 - arch/arm/mach-imx/devices-imx51.h | 4 - arch/arm/mach-imx/devices/Kconfig | 3 - arch/arm/mach-imx/devices/Makefile | 1 - arch/arm/mach-imx/devices/devices-common.h | 9 - arch/arm/mach-imx/devices/platform-mxc_pwm.c | 69 --- arch/arm/mach-imx/hardware.h | 4 +- arch/arm/mach-imx/headsmp.S | 40 -- arch/arm/mach-imx/mach-imx6q.c | 98 +++- arch/arm/mach-imx/mach-imx6sl.c | 6 +- arch/arm/mach-imx/pm-imx6.c | 552 ++++++++++++++++++++ arch/arm/mach-imx/pm-imx6q.c | 241 --------- arch/arm/mach-imx/suspend-imx6.S | 361 +++++++++++++ arch/arm/mach-imx/time.c | 12 + drivers/bus/imx-weim.c | 58 ++ include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 18 + 32 files changed, 1394 insertions(+), 471 deletions(-) create mode 100644 arch/arm/mach-imx/cpuidle-imx6sl.c delete mode 100644 arch/arm/mach-imx/devices/platform-mxc_pwm.c create mode 100644 arch/arm/mach-imx/pm-imx6.c delete mode 100644 arch/arm/mach-imx/pm-imx6q.c create mode 100644 arch/arm/mach-imx/suspend-imx6.S