From patchwork Wed Mar 5 02:57:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Barry Song <21cnbao@gmail.com> X-Patchwork-Id: 326565 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B4F352C00CE for ; Wed, 5 Mar 2014 13:58:25 +1100 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WL22B-00077k-CM; Wed, 05 Mar 2014 02:58:15 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WL228-0006Yz-S1; Wed, 05 Mar 2014 02:58:12 +0000 Received: from mail-pa0-x229.google.com ([2607:f8b0:400e:c03::229]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WL225-0006YI-Oj for linux-arm-kernel@lists.infradead.org; Wed, 05 Mar 2014 02:58:10 +0000 Received: by mail-pa0-f41.google.com with SMTP id fa1so447697pad.28 for ; Tue, 04 Mar 2014 18:57:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:from:date:message-id:subject:to:cc:content-type; bh=soBA2tHDs9m7TWEyEhGIdoZmrdGYzogL1ONnXuG2Zj0=; b=mTDNnrz+jyHCsqZDSxrdgzcNmR8UODgYqX1fzDo+YdQToM1rWB2O2NhUIyEVyONKE4 u7JmRAAVU/iPLwQY3DvAbTUdIq7wZbzwj9i0cMZMp4qOjHvsTbX0R11KNjBXJIyVWPwu YedDdYhrmN73tp4hVdrCUHao7Wb3ZRu9a9eFG5IGhMJjcJMocREG5ReNaS9JpmyZrMwD 8reOzeB70mPLOfWXw7S0pQmnvzgxQJrp1TZ6WbgFldnZqK6bdb50hbZsCMDZRvoIwnxt yGGMF6rLko9PAovefWKuMYa2J/Q4mLMT4P4GonQlBZ1RkXDPdMBhs18Leru5AtLuXQQs ohvg== X-Received: by 10.66.250.161 with SMTP id zd1mr3748333pac.136.1393988265692; Tue, 04 Mar 2014 18:57:45 -0800 (PST) MIME-Version: 1.0 Received: by 10.66.237.173 with HTTP; Tue, 4 Mar 2014 18:57:24 -0800 (PST) From: Barry Song <21cnbao@gmail.com> Date: Wed, 5 Mar 2014 10:57:24 +0800 Message-ID: Subject: [GIT PULL]ARM: sirf: machine update for 3.15 To: Arnd Bergmann , Kevin Hilman , Olof Johansson , "arm@kernel.org" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140304_215809_874857_A3AC57C4 X-CRM114-Status: UNSURE ( 9.73 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (21cnbao[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: DL-SHA-WorkGroupLinux , "linux-arm-kernel@lists.infradead.org" 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 Hi Guys, most of the below are some minor fixes for coding style. "ARM: prima2: move to generic reset controller driver framework" has been ready near 3.14 merge window, but it was late to merge in 3.14, so move this one to 3.15. Thanks barry The following changes since commit 38dbfb59d1175ef458d006556061adeaa8751b72: Linus 3.14-rc1 (2014-02-02 16:42:13 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux.git tags/sirf-soc-for-3.15 for you to fetch changes up to e7eda91f6323bd7dc85598c639f5e4709efc2309: ARM: prima2: move to generic reset controller driver framework (2014-03-05 10:33:47 +0800) ---------------------------------------------------------------- ARM: sirf: machine update for 3.15 Among them: ARM: prima2: l2x0: fix checkpatch issues ARM: prima2: platsmp: fix checkpatch issues ARM: prima2: common: fix checkpatch issues ARM: prima2: rtciobrg: fix the typo about license ARM: prima2: staticize sirfsoc_init_late function ARM: prima2: move to generic reset controller driver framework ---------------------------------------------------------------- Barry Song (6): ARM: prima2: l2x0: fix checkpatch issues ARM: prima2: platsmp: fix checkpatch issues ARM: prima2: common: fix checkpatch issues ARM: prima2: rtciobrg: fix the typo about license ARM: prima2: staticize sirfsoc_init_late function ARM: prima2: move to generic reset controller driver framework .../devicetree/bindings/reset/sirf,rstc.txt | 42 +++++++++ arch/arm/boot/dts/atlas6.dtsi | 3 +- arch/arm/boot/dts/marco.dtsi | 3 +- arch/arm/boot/dts/prima2.dtsi | 3 +- arch/arm/mach-prima2/Kconfig | 1 + arch/arm/mach-prima2/common.c | 8 +- arch/arm/mach-prima2/l2x0.c | 9 +- arch/arm/mach-prima2/platsmp.c | 6 +- arch/arm/mach-prima2/rstc.c | 93 +++++++++++++------- arch/arm/mach-prima2/rtciobrg.c | 2 +- 10 files changed, 120 insertions(+), 50 deletions(-) create mode 100644 Documentation/devicetree/bindings/reset/sirf,rstc.txt -barry