From: Lee Jones <lee.jones@linaro.org>
To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: STEricsson_nomadik_linux@list.st.com,
linus.walleij@stericsson.com, arnd@arndb.de,
broonie@opensource.wolfsonmicro.com,
Lee Jones <lee.jones@linaro.org>
Subject: [PATCH 17/22] ARM: ux500: Remove platform registration of MSP devices
Date: Thu, 9 Aug 2012 16:47:43 +0100 [thread overview]
Message-ID: <1344527268-5964-18-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1344527268-5964-1-git-send-email-lee.jones@linaro.org>
This patch removes platform device registration of all 4 MSP
devices. It also takes care of all redundant infrastructure now
that each of the ux500 audio components have been Device Tree
enabled.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
arch/arm/mach-ux500/board-mop500-msp.c | 14 --------------
arch/arm/mach-ux500/board-mop500.c | 2 --
arch/arm/mach-ux500/board-mop500.h | 2 --
3 files changed, 18 deletions(-)
diff --git a/arch/arm/mach-ux500/board-mop500-msp.c b/arch/arm/mach-ux500/board-mop500-msp.c
index 58768c2..326de5a 100644
--- a/arch/arm/mach-ux500/board-mop500-msp.c
+++ b/arch/arm/mach-ux500/board-mop500-msp.c
@@ -172,20 +172,6 @@ struct msp_i2s_platform_data msp3_platform_data = {
.msp_i2s_dma_tx = NULL,
};
-/* Due for removal once the MSP driver has been fully DT:ed. */
-void mop500_of_msp_init(struct device *parent)
-{
- pr_info("Initialize MSP I2S-devices.\n");
- db8500_add_msp_i2s(parent, 0, U8500_MSP0_BASE, IRQ_DB8500_MSP0,
- &msp0_platform_data);
- db8500_add_msp_i2s(parent, 1, U8500_MSP1_BASE, IRQ_DB8500_MSP1,
- &msp1_platform_data);
- db8500_add_msp_i2s(parent, 2, U8500_MSP2_BASE, IRQ_DB8500_MSP2,
- &msp2_platform_data);
- db8500_add_msp_i2s(parent, 3, U8500_MSP3_BASE, IRQ_DB8500_MSP1,
- &msp3_platform_data);
-}
-
void mop500_msp_init(struct device *parent)
{
pr_info("%s: Register platform-device 'snd-soc-mop500'.\n", __func__);
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 0c141d5..f48d463 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -815,8 +815,6 @@ static void __init u8500_init_machine(void)
mop500_uib_init();
- } else if (of_machine_is_compatible("calaosystems,snowball-a9500")) {
- mop500_of_msp_init(parent);
} else if (of_machine_is_compatible("st-ericsson,hrefv60+")) {
/*
* The HREFv60 board removed a GPIO expander and routed
diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h
index 3fbf48f..e56c983 100644
--- a/arch/arm/mach-ux500/board-mop500.h
+++ b/arch/arm/mach-ux500/board-mop500.h
@@ -98,8 +98,6 @@ void __init mop500_pinmaps_init(void);
void __init snowball_pinmaps_init(void);
void __init hrefv60_pinmaps_init(void);
void mop500_msp_init(struct device *parent);
-/* Due for removal once the MSP driver has been fully DT:ed. */
-void mop500_of_msp_init(struct device *parent);
int __init mop500_uib_init(void);
void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info,
--
1.7.9.5
next prev parent reply other threads:[~2012-08-09 15:50 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-09 15:47 [PATCH 00/22] mop500 related Audio reorganisation and fixups Lee Jones
2012-08-09 15:47 ` [PATCH 01/22] ARM: ux500: Fix merge error, no matching driver name for 'snd_soc_u8500' Lee Jones
2012-08-14 8:38 ` Linus Walleij
2012-08-09 15:47 ` [PATCH 02/22] ARM: ux500: Ensure probing of Audio devices when Device Tree is enabled Lee Jones
2012-08-14 8:40 ` Linus Walleij
2012-08-09 15:47 ` [PATCH 03/22] ASoC: ab8500: Inform SoC Core that we have our own I/O arrangements Lee Jones
2012-08-14 8:40 ` Linus Walleij
2012-08-14 12:17 ` [alsa-devel] " Takashi Iwai
2012-08-15 14:01 ` Mark Brown
2012-08-09 15:47 ` [PATCH 04/22] ASoC: Ux500: Move MSP pinctrl setup into the MSP driver Lee Jones
2012-08-14 8:51 ` Linus Walleij
2012-08-20 8:09 ` Lee Jones
2012-08-20 11:59 ` Lee Jones
2012-08-27 23:09 ` Linus Walleij
2012-08-30 13:18 ` Lee Jones
2012-08-09 15:47 ` [PATCH 05/22] ASoC: Ux500: Enable MOP500 driver for Device Tree Lee Jones
2012-08-14 8:52 ` Linus Walleij
2012-09-10 16:45 ` Lee Jones
2012-08-09 15:47 ` [PATCH 06/22] ASoC: Ux500: Enable ux500 MSP " Lee Jones
2012-08-14 8:55 ` Linus Walleij
2012-09-10 16:45 ` Lee Jones
2012-08-09 15:47 ` [PATCH 07/22] ASoC: Ux500: Initialise PCM from MSP probe rather than as a device Lee Jones
2012-08-14 11:08 ` Linus Walleij
2012-09-19 13:33 ` [RESENDING] " Lee Jones
2012-09-20 9:03 ` Ola Lilja
2012-09-20 12:49 ` Mark Brown
2012-09-20 12:52 ` Lee Jones
2012-11-22 14:05 ` Lee Jones
2012-11-23 1:58 ` Mark Brown
2012-11-23 9:12 ` Lee Jones
2012-11-23 10:09 ` Mark Brown
2012-08-09 15:47 ` [PATCH 08/22] ASoC: codecs: Enable AB8500 CODEC for Device Tree Lee Jones
2012-08-14 11:09 ` Linus Walleij
2012-08-14 12:17 ` [alsa-devel] " Takashi Iwai
2012-08-20 11:34 ` [PATCH 1/1] " Lee Jones
2012-08-20 14:36 ` Mark Brown
2012-08-21 11:51 ` Lee Jones
2012-08-21 12:39 ` Mark Brown
2012-08-21 12:58 ` Lee Jones
2012-08-21 13:40 ` Mark Brown
2012-08-09 15:47 ` [PATCH 09/22] Documentation: Define the MOP500 Audio Machine Driver Device Tree bindings Lee Jones
2012-08-09 15:47 ` [PATCH 10/22] Documentation: Define the MSP " Lee Jones
2012-08-09 15:47 ` [PATCH 11/22] ARM: ux500: Clean-up MSP platform code Lee Jones
2012-08-14 11:12 ` Linus Walleij
2012-08-09 15:47 ` [PATCH 12/22] ARM: ux500: Add AB8500 CODEC node to DB8500 Device Tree Lee Jones
2012-08-20 14:34 ` Linus Walleij
2012-08-09 15:47 ` [PATCH 13/22] ARM: ux500: Fork MSP platform registration for step-by-step DT enablement Lee Jones
2012-08-14 11:13 ` Linus Walleij
2012-08-20 8:06 ` Lee Jones
2012-08-27 23:07 ` Linus Walleij
2012-08-28 7:48 ` Lee Jones
2012-08-30 23:56 ` Linus Walleij
2012-08-09 15:47 ` [PATCH 14/22] ARM: ux500: Pass MSP DMA platform data though AUXDATA Lee Jones
2012-08-14 11:14 ` Linus Walleij
2012-08-09 15:47 ` [PATCH 15/22] ARM: ux500: Stop registering the MOP500 Audio driver from platform code Lee Jones
2012-08-14 11:16 ` Linus Walleij
2012-08-09 15:47 ` [PATCH 16/22] ARM: ux500: Stop registering the PCM " Lee Jones
2012-08-14 11:16 ` Linus Walleij
2012-08-09 15:47 ` Lee Jones [this message]
2012-08-14 11:18 ` [PATCH 17/22] ARM: ux500: Remove platform registration of MSP devices Linus Walleij
2012-08-09 15:47 ` [PATCH 18/22] ARM: ux500: Rename MSP board file to something more meaningful Lee Jones
2012-08-14 11:20 ` Linus Walleij
2012-08-30 12:31 ` Lee Jones
2012-08-09 15:47 ` [PATCH 19/22] ARM: ux500: Rename db8500.dtsi to dbx5x0.dtsi to encompass the u9500, u8540 and u9540 Lee Jones
2012-08-14 11:22 ` Linus Walleij
2012-08-09 15:47 ` [PATCH 20/22] ARM: ux500: Add nodes for the MSP into Device Tree Lee Jones
2012-08-14 11:23 ` Linus Walleij
2012-08-09 15:47 ` [PATCH 21/22] ARM: ux500: Add all encompassing sound node to the Snowball " Lee Jones
2012-08-14 11:23 ` Linus Walleij
2012-08-09 15:47 ` [PATCH 22/22] Documentation: Add the AB8500 CODEC device to the MFD AB8500 doc Lee Jones
2012-08-14 11:24 ` Linus Walleij
2012-08-09 18:50 ` [PATCH 00/22] mop500 related Audio reorganisation and fixups Mark Brown
2012-08-09 19:40 ` Lee Jones
2012-08-10 8:48 ` Linus Walleij
2012-08-10 9:37 ` Lee Jones
2012-08-14 11:34 ` Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1344527268-5964-18-git-send-email-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=STEricsson_nomadik_linux@list.st.com \
--cc=arnd@arndb.de \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linus.walleij@stericsson.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).