From patchwork Fri Dec 14 22:06:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 206848 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 34C902C008F for ; Mon, 17 Dec 2012 23:23:16 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TkZfQ-0004ws-SU; Mon, 17 Dec 2012 12:19:33 +0000 Received: from mail-pb0-f49.google.com ([209.85.160.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TjdOS-00024C-05 for linux-arm-kernel@lists.infradead.org; Fri, 14 Dec 2012 22:06:12 +0000 Received: by mail-pb0-f49.google.com with SMTP id un15so2458556pbc.36 for ; Fri, 14 Dec 2012 14:06:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent :x-gm-message-state; bh=ylBqAdYrGiSV2TA8t5EF6jCHbchrGdnAi7lMxuhCIQo=; b=Nv9KpuYupb7AJWg5GJHVEe7FS0KcTvUNwxPUNVdr8HCMzXE8aTyeZ29hiF5DxCuLQI KhhO763zUO0YPlMqdbwOuA6uCq+AEmeFwEfY4btJGpxhSn2xhuA8HjyyzbU6tfWbCuxa 1AlmVTfP+uAXU+DiUW9ev/fWCW/00kEp5sCRebMCCk9Gd/zd4MI5E8DzBzYTXMRbMqWs IKJpDrXwbpLkXep97yzfZ+V+1zpri1BtDwI1x4DpMjN2kMD8Xnr7gEBEzMWXkhcLdM9s bGn3PuGnWlRGAfE1ukW+6QvxuMCE1Yt8bPb6XdtDLPf7C7ArUN46SxiyvwdlR4Pc5960 ERdQ== Received: by 10.66.88.99 with SMTP id bf3mr19410019pab.62.1355522765776; Fri, 14 Dec 2012 14:06:05 -0800 (PST) Received: from localhost (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by mx.google.com with ESMTPS id ix9sm3569542pbc.7.2012.12.14.14.06.04 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 14 Dec 2012 14:06:04 -0800 (PST) Date: Fri, 14 Dec 2012 14:06:04 -0800 From: Olof Johansson To: torvalds@linux-foundation.org Subject: [GIT PULL 2/3] ARM: arm-soc: Device-tree updates, take 2 Message-ID: <20121214220604.GC11363@quad.lixom.net> References: <20121214220441.GA11363@quad.lixom.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20121214220441.GA11363@quad.lixom.net> User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQmRMHEnXRmD4w4Of3yA36Sp4vN8c6FwoGxiFTmBhDngHmyyzGla9HqHsy+h02qHs9dOeUgO X-Bad-Reply: References and In-Reply-To but no 'Re:' in Subject. X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121214_170608_176604_F65C0FBF X-CRM114-Status: GOOD ( 13.51 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Mailman-Approved-At: Mon, 17 Dec 2012 07:18:55 -0500 Cc: arm@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Hi Linus, This branch contains device-tree updates for the SPEAr platform. They had dependencies on earlier branches from this merge window, which is why they were broken out in a separate branch. Conflicts seen with this merge: None. ---------------------------------------------------------------- The following changes since commit b035668887bb39bc76d14a5898b597e43b3c5710: Merge branch 'next/soc2' into HEAD are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/dt2 for you to fetch changes up to eabc5fa51c1fae4b66cf883e3a3c2b3ca794494c: Merge branch 'spear-for-3.8' of git://git.linaro.org/people/vireshk/linux into next/dt2 ---------------------------------------------------------------- Arnd Bergmann (1): Merge branch 'spear-for-3.8' of git://git.linaro.org/people/vireshk/linux into next/dt2 Deepak Sikri (1): ARM: SPEAr: DT: Modify DT bindings for STMMAC Shiraz Hashim (6): ARM: SPEAr13xx: DT: Add spics gpio controller nodes ARM: SPEAr: DT: Update device nodes ARM: SPEAr13xx: Remove fields not required for ssp controller ARM: SPEAr3xx: shirq: simplify and move the shared irq multiplexor to DT ARM: SPEAr3xx: DT: add shirq node for interrupt multiplexor ARM: SPEAr320: DT: Add SPEAr 320 HMI board support Vipin Kumar (1): ARM: SPEAr: DT: Update partition info for MTD devices Vipul Kumar Samar (5): ARM: SPEAr: DT: Update pinctrl list ARM: SPEAr: DT: Fix existing DT support ARM: SPEAr: DT: add uart state to fix warning ARM: SPEAr1310: Move 1310 specific misc register into machine specific files ARM: SPEAr1310: Fix AUXDATA for compact flash controller Viresh Kumar (3): Merge commit 'pinctrl/devel 4ddb1c2' into spear-for-3.8 Merge commit 'gpio-lw/devel' into spear-for-3.8 ARM: SPEAr3xx: Shirq: Move shirq controller out of plat/ .../devicetree/bindings/arm/spear/shirq.txt | 48 +++ arch/arm/boot/dts/Makefile | 3 +- arch/arm/boot/dts/spear1310-evb.dts | 165 ++++++++-- arch/arm/boot/dts/spear1310.dtsi | 32 +- arch/arm/boot/dts/spear1340-evb.dts | 253 +++++++++++++-- arch/arm/boot/dts/spear1340.dtsi | 61 ++++ arch/arm/boot/dts/spear13xx.dtsi | 72 ++++- arch/arm/boot/dts/spear300-evb.dts | 20 +- arch/arm/boot/dts/spear300.dtsi | 14 +- arch/arm/boot/dts/spear310-evb.dts | 30 +- arch/arm/boot/dts/spear310.dtsi | 18 ++ arch/arm/boot/dts/spear320-evb.dts | 35 +- arch/arm/boot/dts/spear320-hmi.dts | 305 ++++++++++++++++++ arch/arm/boot/dts/spear320.dtsi | 39 ++- arch/arm/boot/dts/spear3xx.dtsi | 5 +- arch/arm/boot/dts/spear600-evb.dts | 46 ++- arch/arm/boot/dts/spear600.dtsi | 16 + arch/arm/mach-spear13xx/include/mach/spear.h | 8 - arch/arm/mach-spear13xx/spear1310.c | 16 +- arch/arm/mach-spear13xx/spear13xx.c | 2 - arch/arm/mach-spear3xx/include/mach/irqs.h | 10 +- arch/arm/mach-spear3xx/spear300.c | 103 ------ arch/arm/mach-spear3xx/spear310.c | 202 ------------ arch/arm/mach-spear3xx/spear320.c | 205 +----------- arch/arm/mach-spear3xx/spear3xx.c | 4 + arch/arm/plat-spear/Makefile | 2 +- arch/arm/plat-spear/shirq.c | 118 ------- drivers/clk/spear/spear1310_clock.c | 1 + drivers/irqchip/Makefile | 1 + drivers/irqchip/spear-shirq.c | 316 +++++++++++++++++++ .../linux/irqchip/spear-shirq.h | 49 ++- 31 files changed, 1425 insertions(+), 774 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/spear/shirq.txt create mode 100644 arch/arm/boot/dts/spear320-hmi.dts delete mode 100644 arch/arm/plat-spear/shirq.c create mode 100644 drivers/irqchip/spear-shirq.c rename arch/arm/plat-spear/include/plat/shirq.h => include/linux/irqchip/spear-shirq.h (60%)