| Submitter | Jason |
|---|---|
| Date | Sept. 22, 2012, 5:31 p.m. |
| Message ID | <20120922173145.GJ5469@titan.lakedaemon.net> |
| Download | mbox |
| Permalink | /patch/186413/ |
| 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 1F2782C007D for <incoming-imx@patchwork.ozlabs.org>; Tue, 25 Sep 2012 00:07:11 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TG9GH-0002A2-RT; Mon, 24 Sep 2012 14:03:50 +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 1TFTYU-0005wy-4u for linux-arm-kernel@lists.infradead.org; Sat, 22 Sep 2012 17:31:50 +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 1TFTYR-00045E-9f; Sat, 22 Sep 2012 17:31:47 +0000 Received: from titan.lakedaemon.net (localhost [127.0.0.1]) by titan (Postfix) with ESMTP id 7963B38161B; Sat, 22 Sep 2012 13:31:45 -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: U2FsdGVkX18Hyc1dWGFkDYncQQNQFDPdOqg3qAjNLQc= Date: Sat, 22 Sep 2012 13:31:45 -0400 From: Jason Cooper <jason@lakedaemon.net> To: Arnd Bergmann <arnd@arndb.de>, Olof Johansson <olof@lixom.net>, Andrew Lunn <andrew@lunn.ch>, Gregory CLEMENT <gregory.clement@free-electrons.com> Subject: [GIT PULL V5 5/7] ARM: kirkwood platform_data changes for v3.7 Message-ID: <20120922173145.GJ5469@titan.lakedaemon.net> References: <20120922171554.GE5469@titan.lakedaemon.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20120922171554.GE5469@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:23 -0400 Cc: 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 may conflict with work Rob Herring and others are doing regarding platform_data conversion. If so, just drop this branch. Nothing depends on it, intentionally ;-) Depends: - Based on v3.6-rc5 - Depends on branches: - kirkwood/cleanup which depends on: - kirkwood/dt - kirkwood/boards Misc: - move kirkwood/orion headers to platform_data The following changes since commit 1265d613af1a25f44119bfb03b2bff9c665977ba: Merge branch 'kirkwood/boards' into kirkwood/platform_data (2012-09-22 15:53:21 +0000) are available in the git repository at: git://git.infradead.org/users/jcooper/linux.git kirkwood/platform_data Jason Cooper (2): 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 Thomas Petazzoni (8): 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> arch/arm/mach-dove/cm-a510.c | 2 +- arch/arm/mach-dove/common.c | 2 +- arch/arm/mach-dove/dove-db-setup.c | 2 +- arch/arm/mach-kirkwood/board-dnskw.c | 2 +- arch/arm/mach-kirkwood/board-dockstar.c | 4 ++-- arch/arm/mach-kirkwood/board-dreamplug.c | 4 ++-- 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 | 2 +- arch/arm/mach-kirkwood/board-km_kirkwood.c | 2 +- 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/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 - 75 files changed, 108 insertions(+), 117 deletions(-) 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%)