From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 12/19] ARM: ux500: Remove platform registration of MSP devices
Date: Tue, 31 Jul 2012 14:39:06 +0100 [thread overview]
Message-ID: <1343741953-17828-13-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1343741953-17828-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 7af2dce..19473f7 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-u8500'.\n", __func__);
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index d455a61..2ef26c8 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -810,8 +810,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-07-31 13:39 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-31 13:38 [PATCH 01/19] Configure ux500 Audio Drivers for Device Tree Lee Jones
2012-07-31 13:38 ` [PATCH 01/19] ASoC: Ux500: Move MSP pinctrl setup into the MSP driver Lee Jones
2012-07-31 13:38 ` [PATCH 02/19] ASoC: Ux500: Enable MOP500 driver for Device Tree Lee Jones
2012-07-31 13:38 ` [PATCH 03/19] ASoC: Ux500: Enable ux500 MSP " Lee Jones
2012-07-31 13:38 ` [PATCH 04/19] ASoC: Ux500: Initialise PCM from MSP probe rather than as a device Lee Jones
2012-07-31 13:38 ` [PATCH 05/19] ASoC: codecs: Enable AB8500 CODEC for Device Tree Lee Jones
2012-07-31 13:39 ` [PATCH 06/19] ARM: ux500: Clean-up MSP platform code Lee Jones
2012-07-31 13:39 ` [PATCH 07/19] ARM: ux500: Add AB8500 CODEC node to DB8500 Device Tree Lee Jones
2012-07-31 13:39 ` [PATCH 08/19] ARM: ux500: Fork MSP platform registration for step-by-step DT enablement Lee Jones
2012-07-31 13:39 ` [PATCH 09/19] ARM: ux500: Pass MSP DMA platform data though AUXDATA Lee Jones
2012-07-31 13:39 ` [PATCH 10/19] ARM: ux500: Stop registering the MOP500 Audio driver from platform code Lee Jones
2012-07-31 13:39 ` [PATCH 11/19] ARM: ux500: Stop registering the PCM " Lee Jones
2012-07-31 13:39 ` Lee Jones [this message]
2012-07-31 13:39 ` [PATCH 13/19] ARM: ux500: Rename MSP board file to something more meaningful Lee Jones
2012-07-31 13:39 ` [PATCH 14/19] ARM: ux500: Rename db8500.dtsi to dbx5x0.dtsi to encompass the u9500, u8540 and u9540 Lee Jones
2012-07-31 13:39 ` [PATCH 15/19] ARM: ux500: Add nodes for the MSP into Device Tree Lee Jones
2012-07-31 13:39 ` [PATCH 16/19] ARM: ux500: Add all encompassing sound node to the Snowball " Lee Jones
2012-07-31 13:39 ` [PATCH 17/19] Documentation: Define the MOP500 Audio Machine Driver Device Tree bindings Lee Jones
2012-07-31 13:53 ` Mark Brown
2012-07-31 15:00 ` Lee Jones
2012-08-02 12:12 ` Lee Jones
2012-07-31 13:39 ` [PATCH 18/19] Documentation: Define the MSP " Lee Jones
2012-07-31 13:55 ` Mark Brown
2012-07-31 14:59 ` Lee Jones
2012-07-31 15:10 ` Mark Brown
2012-08-02 12:45 ` Lee Jones
2012-07-31 13:39 ` [PATCH 19/19] Documentation: Add the AB8500 CODEC device to the MFD AB8500 doc Lee Jones
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=1343741953-17828-13-git-send-email-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.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).