| Submitter | Jason |
|---|---|
| Date | Sept. 21, 2012, 7:57 p.m. |
| Message ID | <20120921195714.GY5469@titan.lakedaemon.net> |
| Download | mbox |
| Permalink | /patch/186408/ |
| State | New |
| Headers | show
Return-Path: <linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org> X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (unknown [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 EEDA52C0082 for <incoming-imx@patchwork.ozlabs.org>; Tue, 25 Sep 2012 00:03:31 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TG9Cj-0008QB-BC; Mon, 24 Sep 2012 14:00:10 +0000 Received: from mho-03-ewr.mailhop.org ([204.13.248.66] helo=mho-01-ewr.mailhop.org) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TF9Li-0007cb-Pu for linux-arm-kernel@lists.infradead.org; Fri, 21 Sep 2012 19:57:20 +0000 Received: from pool-72-84-113-162.nrflva.fios.verizon.net ([72.84.113.162] helo=titan) by mho-01-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from <jason@lakedaemon.net>) id 1TF9Lg-000Ih3-4o; Fri, 21 Sep 2012 19:57:16 +0000 Received: from titan.lakedaemon.net (localhost [127.0.0.1]) by titan (Postfix) with ESMTP id 07E8F380D7A; Fri, 21 Sep 2012 15:57:14 -0400 (EDT) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 72.84.113.162 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1/eL3WI7mfKCfSRkjVu1bLcAdaFnzX4uew= Date: Fri, 21 Sep 2012 15:57:14 -0400 From: Jason Cooper <jason@lakedaemon.net> To: Arnd Bergmann <arnd@arndb.de>, Olof Johansson <olof@lixom.net> Subject: [GIT PULL V3 4/5] ARM: Kirkwood: cleanup for v3.7 Message-ID: <20120921195714.GY5469@titan.lakedaemon.net> References: <20120829001129.GO19437@titan.lakedaemon.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20120829001129.GO19437@titan.lakedaemon.net> User-Agent: Mutt/1.5.20 (2009-06-14) X-Bad-Reply: References and In-Reply-To but no 'Re:' in Subject. X-Spam-Note: CRM114 invocation failed 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.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [204.13.248.66 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, 24 Sep 2012 09:57:22 -0400 Cc: Gregory CLEMENT <gregory.clement@free-electrons.com>, Andrew Lunn <andrew@lunn.ch>, Thomas Petazzoni <thomas.petazzoni@free-electrons.com>, Linux ARM Kernel <linux-arm-kernel@lists.infradead.org> X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 |
NOTE: This branch depends on both kirkwood/boards and kirkwood/dt (and, by extension, kirkwood/addr_decode). Some of that got pulled into this summary (kirkwood/boards). Is this correct? Sould I be basing the pullreq on v3.6-rc5? That would summarize all three branches. Doesn't seem as useful. If it isn't clear, please ask. thx, Jason. The following changes since commit 81d143f47f12368ab4be0cde10aaf379994f3594: ARM: kirkwood: Use devicetree to define DNS-32[05] fan (2012-09-21 18:27:09 +0000) are available in the git repository at: git://git.infradead.org/users/jcooper/linux.git kirkwood/cleanup Alan M Butler (1): ARM: Kirkwood: Iomega ix2-200 DT support Jamie Lentin (1): ARM: kirkwood: Trim excess #includes in board-dnskw.c Jason Cooper (4): Merge branch 'kirkwood/boards' into kirkwood/cleanup ARM: Kirkwood: ehci now specified in kirkwood.dtsi. remove legacy platform init ARM: Kirkwood: board-dockstar: use linux/platform_data/mvsdio.h instead of plat/mvsdio.h ARM: Kirkwood: use linux/platform_data/mv643xx.h instead of linux/mv643xx.h Russell King (1): ARM: Dove: allow PCI to be disabled Sebastian Hesselbarth (8): ARM: kirkwood: DT board setup for Seagate FreeAgent Dockstar ARM: kirkwood: DT descriptor for Seagate FreeAgent Dockstar ARM: dove: unify clock setup ARM: dove: add clock gating control ARM: dove: add crypto engine ARM: dove: add device tree based machine descriptor ARM: dove: add device tree descriptors ARM: dove: SolidRun CuBox DT Thomas Petazzoni (9): arm: add documentation describing Marvell families of SoC sound: kirkwood: remove useless <plat/audio.h> include sound: kirkwood: move <plat/audio.h> to <linux/platform_data/kirkwood-audio.h> usb: ehci-orion: move <plat/ehci-orion.h> to <linux/platform_data/ehci-orion.h> mmc: mvsdio: move <plat/mvsdio.h> to <linux/platform_data/mvsdio.h> dma: mv_xor: move <plat/mv_xor.h> to <linux/platform_data/mv_xor.h> mtd: orion_nand: move <plat/orion_nand.h> to <linux/platform_data/orion_nand.h> i2c: mv643xx: move <linux/mv643xx_i2c.h> to <linux/platform_data/mv643xx_i2c.h> net: mv643xx_eth: move <linux/mv643xx_eth.h> to <linux/platform_data/mv643xx_eth.h> Valentin Longchamp (1): ARM: initial DTS support for km_kirkwood Documentation/arm/Marvell/README | 232 ++++++++++++++++++++ arch/arm/Kconfig | 3 +- arch/arm/boot/dts/dove-cm-a510.dts | 38 ++++ arch/arm/boot/dts/dove-cubox.dts | 42 ++++ arch/arm/boot/dts/dove-dove-db.dts | 38 ++++ arch/arm/boot/dts/dove.dtsi | 143 ++++++++++++ arch/arm/boot/dts/kirkwood-dockstar.dts | 57 +++++ arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 105 +++++++++ arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 29 +++ arch/arm/mach-dove/Kconfig | 7 + arch/arm/mach-dove/Makefile | 4 +- arch/arm/mach-dove/Makefile.boot | 4 + arch/arm/mach-dove/cm-a510.c | 2 +- arch/arm/mach-dove/common.c | 155 ++++++++++++- arch/arm/mach-dove/common.h | 4 + arch/arm/mach-dove/dove-db-setup.c | 2 +- arch/arm/mach-dove/include/mach/pm.h | 54 +++-- arch/arm/mach-kirkwood/Kconfig | 21 ++ arch/arm/mach-kirkwood/Makefile | 3 + arch/arm/mach-kirkwood/Makefile.boot | 3 + arch/arm/mach-kirkwood/board-dnskw.c | 11 +- arch/arm/mach-kirkwood/board-dockstar.c | 60 +++++ arch/arm/mach-kirkwood/board-dreamplug.c | 4 +- arch/arm/mach-kirkwood/board-dt.c | 12 + arch/arm/mach-kirkwood/board-goflexnet.c | 4 +- arch/arm/mach-kirkwood/board-ib62x0.c | 2 +- arch/arm/mach-kirkwood/board-iconnect.c | 3 +- arch/arm/mach-kirkwood/board-iomega_ix2_200.c | 55 +++++ arch/arm/mach-kirkwood/board-km_kirkwood.c | 56 +++++ arch/arm/mach-kirkwood/board-lsxl.c | 2 +- arch/arm/mach-kirkwood/board-ts219.c | 2 +- arch/arm/mach-kirkwood/common.c | 12 +- arch/arm/mach-kirkwood/common.h | 18 ++ arch/arm/mach-kirkwood/d2net_v2-setup.c | 2 +- arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 4 +- arch/arm/mach-kirkwood/dockstar-setup.c | 4 +- arch/arm/mach-kirkwood/guruplug-setup.c | 4 +- arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c | 2 +- arch/arm/mach-kirkwood/netspace_v2-setup.c | 2 +- arch/arm/mach-kirkwood/netxbig_v2-setup.c | 2 +- arch/arm/mach-kirkwood/openrd-setup.c | 4 +- arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 2 +- arch/arm/mach-kirkwood/rd88f6281-setup.c | 4 +- arch/arm/mach-kirkwood/sheevaplug-setup.c | 4 +- arch/arm/mach-kirkwood/t5325-setup.c | 2 +- arch/arm/mach-kirkwood/ts219-setup.c | 2 +- arch/arm/mach-kirkwood/ts41x-setup.c | 2 +- arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 2 +- arch/arm/mach-mv78xx0/common.c | 4 +- arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 2 +- arch/arm/mach-mv78xx0/rd78x00-masa-setup.c | 2 +- arch/arm/mach-orion5x/common.c | 6 +- arch/arm/mach-orion5x/d2net-setup.c | 2 +- arch/arm/mach-orion5x/db88f5281-setup.c | 4 +- arch/arm/mach-orion5x/dns323-setup.c | 2 +- arch/arm/mach-orion5x/edmini_v2-setup.c | 2 +- arch/arm/mach-orion5x/kurobox_pro-setup.c | 4 +- arch/arm/mach-orion5x/ls-chl-setup.c | 2 +- arch/arm/mach-orion5x/ls_hgl-setup.c | 2 +- arch/arm/mach-orion5x/lsmini-setup.c | 2 +- arch/arm/mach-orion5x/mss2-setup.c | 2 +- arch/arm/mach-orion5x/mv2120-setup.c | 2 +- arch/arm/mach-orion5x/net2big-setup.c | 2 +- arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 2 +- arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 2 +- arch/arm/mach-orion5x/rd88f5182-setup.c | 2 +- arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 2 +- arch/arm/mach-orion5x/terastation_pro2-setup.c | 2 +- arch/arm/mach-orion5x/ts209-setup.c | 2 +- arch/arm/mach-orion5x/ts409-setup.c | 2 +- arch/arm/mach-orion5x/ts78xx-setup.c | 2 +- arch/arm/mach-orion5x/tsx09-common.c | 2 +- arch/arm/mach-orion5x/wnr854t-setup.c | 2 +- arch/arm/mach-orion5x/wrt350n-v2-setup.c | 2 +- arch/arm/plat-orion/common.c | 8 +- arch/arm/plat-orion/include/plat/audio.h | 7 - arch/arm/plat-orion/include/plat/common.h | 2 +- drivers/dma/mv_xor.c | 2 +- drivers/i2c/busses/i2c-mv64xxx.c | 2 +- drivers/mmc/host/mvsdio.c | 2 +- drivers/mtd/nand/orion_nand.c | 2 +- drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +- drivers/usb/host/ehci-orion.c | 2 +- include/linux/mv643xx.h | 4 +- .../linux/platform_data}/ehci-orion.h | 6 +- include/linux/platform_data/kirkwood-audio.h | 7 + include/linux/{ => platform_data}/mv643xx_eth.h | 4 +- include/linux/{ => platform_data}/mv643xx_i2c.h | 4 +- .../plat => include/linux/platform_data}/mv_xor.h | 6 +- .../plat => include/linux/platform_data}/mvsdio.h | 6 +- .../linux/platform_data}/orion_nand.h | 6 +- sound/soc/kirkwood/kirkwood-i2s.c | 2 +- sound/soc/kirkwood/kirkwood-openrd.c | 1 - sound/soc/kirkwood/kirkwood-t5325.c | 1 - 94 files changed, 1212 insertions(+), 155 deletions(-) create mode 100644 Documentation/arm/Marvell/README create mode 100644 arch/arm/boot/dts/dove-cm-a510.dts create mode 100644 arch/arm/boot/dts/dove-cubox.dts create mode 100644 arch/arm/boot/dts/dove-dove-db.dts create mode 100644 arch/arm/boot/dts/dove.dtsi create mode 100644 arch/arm/boot/dts/kirkwood-dockstar.dts create mode 100644 arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts create mode 100644 arch/arm/boot/dts/kirkwood-km_kirkwood.dts create mode 100644 arch/arm/mach-kirkwood/board-dockstar.c create mode 100644 arch/arm/mach-kirkwood/board-iomega_ix2_200.c create mode 100644 arch/arm/mach-kirkwood/board-km_kirkwood.c delete mode 100644 arch/arm/plat-orion/include/plat/audio.h rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/ehci-orion.h (78%) create mode 100644 include/linux/platform_data/kirkwood-audio.h rename include/linux/{ => platform_data}/mv643xx_eth.h (96%) rename include/linux/{ => platform_data}/mv643xx_i2c.h (89%) rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/mv_xor.h (77%) rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/mvsdio.h (77%) rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/orion_nand.h (82%)