From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 01/40] ARM: ux500: Remove Audio/MSP support when booting with ATAGs
Date: Fri, 23 Aug 2013 13:23:01 +0100 [thread overview]
Message-ID: <1377260620-18829-2-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1377260620-18829-1-git-send-email-lee.jones@linaro.org>
It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
arch/arm/mach-ux500/board-mop500-audio.c | 50 --------------------------------
arch/arm/mach-ux500/board-mop500.c | 3 --
arch/arm/mach-ux500/board-mop500.h | 1 -
arch/arm/mach-ux500/devices-common.h | 9 ------
arch/arm/mach-ux500/devices-db8500.h | 13 ---------
5 files changed, 76 deletions(-)
diff --git a/arch/arm/mach-ux500/board-mop500-audio.c b/arch/arm/mach-ux500/board-mop500-audio.c
index bfe443d..89f7f92 100644
--- a/arch/arm/mach-ux500/board-mop500-audio.c
+++ b/arch/arm/mach-ux500/board-mop500-audio.c
@@ -69,40 +69,6 @@ static struct stedma40_chan_cfg msp2_dma_tx = {
.phy_channel = 1,
};
-static struct platform_device *db8500_add_msp_i2s(struct device *parent,
- int id,
- resource_size_t base, int irq,
- struct msp_i2s_platform_data *pdata)
-{
- struct platform_device *pdev;
- struct resource res[] = {
- DEFINE_RES_MEM(base, SZ_4K),
- DEFINE_RES_IRQ(irq),
- };
-
- pr_info("Register platform-device 'ux500-msp-i2s', id %d, irq %d\n",
- id, irq);
- pdev = platform_device_register_resndata(parent, "ux500-msp-i2s", id,
- res, ARRAY_SIZE(res),
- pdata, sizeof(*pdata));
- if (!pdev) {
- pr_err("Failed to register platform-device 'ux500-msp-i2s.%d'!\n",
- id);
- return NULL;
- }
-
- return pdev;
-}
-
-/* Platform device for ASoC MOP500 machine */
-static struct platform_device snd_soc_mop500 = {
- .name = "snd-soc-mop500",
- .id = 0,
- .dev = {
- .platform_data = NULL,
- },
-};
-
struct msp_i2s_platform_data msp2_platform_data = {
.id = MSP_I2S_2,
.msp_i2s_dma_rx = &msp2_dma_rx,
@@ -114,19 +80,3 @@ struct msp_i2s_platform_data msp3_platform_data = {
.msp_i2s_dma_rx = &msp1_dma_rx,
.msp_i2s_dma_tx = NULL,
};
-
-void mop500_audio_init(struct device *parent)
-{
- pr_info("%s: Register platform-device 'snd-soc-mop500'.\n", __func__);
- platform_device_register(&snd_soc_mop500);
-
- 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);
-}
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index df5d27a..4fe6aa0 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -586,7 +586,6 @@ static void __init mop500_init_machine(void)
mop500_i2c_init(parent);
mop500_sdi_init(parent);
mop500_spi_init(parent);
- mop500_audio_init(parent);
mop500_uart_init(parent);
u8500_cryp1_hash1_init(parent);
@@ -623,7 +622,6 @@ static void __init snowball_init_machine(void)
mop500_i2c_init(parent);
snowball_sdi_init(parent);
mop500_spi_init(parent);
- mop500_audio_init(parent);
mop500_uart_init(parent);
u8500_cryp1_hash1_init(parent);
@@ -661,7 +659,6 @@ static void __init hrefv60_init_machine(void)
mop500_i2c_init(parent);
hrefv60_sdi_init(parent);
mop500_spi_init(parent);
- mop500_audio_init(parent);
mop500_uart_init(parent);
i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices);
diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h
index d6fab16..3bd9b6e 100644
--- a/arch/arm/mach-ux500/board-mop500.h
+++ b/arch/arm/mach-ux500/board-mop500.h
@@ -104,7 +104,6 @@ void __init mop500_stuib_init(void);
void __init mop500_pinmaps_init(void);
void __init snowball_pinmaps_init(void);
void __init hrefv60_pinmaps_init(void);
-void mop500_audio_init(struct device *parent);
int __init mop500_uib_init(void);
void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info,
diff --git a/arch/arm/mach-ux500/devices-common.h b/arch/arm/mach-ux500/devices-common.h
index 96fa4ac..7eb1272 100644
--- a/arch/arm/mach-ux500/devices-common.h
+++ b/arch/arm/mach-ux500/devices-common.h
@@ -18,15 +18,6 @@
struct spi_master_cntlr;
static inline struct amba_device *
-dbx500_add_msp_spi(struct device *parent, const char *name,
- resource_size_t base, int irq,
- struct spi_master_cntlr *pdata)
-{
- return amba_ahb_device_add(parent, name, base, SZ_4K, irq, 0,
- pdata, 0);
-}
-
-static inline struct amba_device *
dbx500_add_spi(struct device *parent, const char *name, resource_size_t base,
int irq, struct spi_master_cntlr *pdata,
u32 periphid)
diff --git a/arch/arm/mach-ux500/devices-db8500.h b/arch/arm/mach-ux500/devices-db8500.h
index 3219983..c393932 100644
--- a/arch/arm/mach-ux500/devices-db8500.h
+++ b/arch/arm/mach-ux500/devices-db8500.h
@@ -53,19 +53,6 @@ db8500_add_ssp(struct device *parent, const char *name, resource_size_t base,
#define db8500_add_i2c4(parent, pdata) \
dbx500_add_i2c(parent, 4, U8500_I2C4_BASE, IRQ_DB8500_I2C4, pdata)
-#define db8500_add_msp0_spi(parent, pdata) \
- dbx500_add_msp_spi(parent, "msp0", U8500_MSP0_BASE, \
- IRQ_DB8500_MSP0, pdata)
-#define db8500_add_msp1_spi(parent, pdata) \
- dbx500_add_msp_spi(parent, "msp1", U8500_MSP1_BASE, \
- IRQ_DB8500_MSP1, pdata)
-#define db8500_add_msp2_spi(parent, pdata) \
- dbx500_add_msp_spi(parent, "msp2", U8500_MSP2_BASE, \
- IRQ_DB8500_MSP2, pdata)
-#define db8500_add_msp3_spi(parent, pdata) \
- dbx500_add_msp_spi(parent, "msp3", U8500_MSP3_BASE, \
- IRQ_DB8500_MSP1, pdata)
-
#define db8500_add_rtc(parent) \
dbx500_add_rtc(parent, U8500_RTC_BASE, IRQ_DB8500_RTC);
--
1.8.1.2
next prev parent reply other threads:[~2013-08-23 12:23 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-23 12:23 [PATCH 0/40] ARM: ux500: Convert to Device Tree only platform Lee Jones
2013-08-23 12:23 ` Lee Jones [this message]
2013-08-23 12:23 ` [PATCH 02/40] ARM: ux500: Remove TPS61052 High Power White LED Driver ATAG support Lee Jones
2013-08-23 12:23 ` [PATCH 03/40] ARM: ux500: Remove ATAG support for LP5521 Programmable Three-Channel LED driver Lee Jones
2013-08-23 12:23 ` [PATCH 04/40] ARM: ux500: Remove ATAG booting support for Snowball's heatbeat LED Lee Jones
2013-08-23 12:23 ` [PATCH 05/40] ARM: ux500: Purge support for Snowball user buttons when booting with ATAGs Lee Jones
2013-08-23 12:23 ` [PATCH 06/40] ARM: ux500: Disable Snowball's SMSC911x Ethernet " Lee Jones
2013-08-23 12:23 ` [PATCH 07/40] ARM: ux500: Remove support for Snowball's Ethernet regulator " Lee Jones
2013-08-23 12:23 ` [PATCH 08/40] ARM: ux500: Disable Snowball's CPUFreq functionality when booting with ATAGs enabled Lee Jones
2013-08-23 12:23 ` [PATCH 09/40] ARM: ux500: Purge SDI regulator support when booting with ATAGs enable Lee Jones
2013-08-23 12:23 ` [PATCH 10/40] ARM: ux500: Deactivate Crypt support when booting with ATAGs Lee Jones
2013-08-23 12:23 ` [PATCH 11/40] ARM: ux500: Rip out Hash " Lee Jones
2013-08-23 12:23 ` [PATCH 12/40] ARM: ux500: Prevent CODEC platform data from being passed when booting ATAGs Lee Jones
2013-08-23 12:23 ` [PATCH 13/40] ARM: ux500: Stop passing GPIO pdata when booitng with ATAGs enabled Lee Jones
2013-08-23 12:23 ` [PATCH 14/40] ARM: ux500: Remove TC35892 Flexible IO Expander when booting ATAGs Lee Jones
2013-08-23 12:23 ` [PATCH 15/40] ARM: ux500: Remove Light sensor Rohm BH1780GLI when booting with ATAGs Lee Jones
2013-08-23 12:23 ` [PATCH 16/40] ARM: ux500: Purge SFH7741 Proximity Sensor support " Lee Jones
2013-08-23 12:23 ` [PATCH 17/40] ARM: ux500: Remove I2C support when booting with ATAG support Lee Jones
2013-08-23 12:23 ` [PATCH 18/40] ARM: ux500: Purge SDI support for ATAG booting Lee Jones
2013-08-23 12:23 ` [PATCH 19/40] ARM: ux500: Rip out keypad initialisation which is no longer used Lee Jones
2013-08-23 12:23 ` [PATCH 20/40] ARM: ux500: Remove USB support when booting using ATAGs Lee Jones
2013-08-23 12:23 ` [PATCH 21/40] ARM: ux500: Purge support for registering the RTC when booting with ATAGs Lee Jones
2013-08-23 12:23 ` [PATCH 22/40] ARM: ux500: Stop registering Pinctrl when booting with ATAG support Lee Jones
2013-08-23 12:23 ` [PATCH 23/40] ARM: ux500: Stop enabling GPIOs when not booting with Device Tree Lee Jones
2013-08-23 12:23 ` [PATCH 24/40] ARM: ux500: Deactivate enablement of DMA40 during ATAG booting Lee Jones
2013-08-23 12:23 ` [PATCH 25/40] ARM: ux500: Do not register the PMU device if booting with ATAGs Lee Jones
2013-08-23 12:23 ` [PATCH 26/40] ARM: ux500: Rip out SSP/SPI registration when not booting with Device Tree Lee Jones
2013-08-23 12:23 ` [PATCH 27/40] ARM: ux500: Stop initialising the pinmaps when booting with ATAGs Lee Jones
2013-08-23 12:23 ` [PATCH 28/40] ARM: ux500: Remove UART support when booting without Device Tree Lee Jones
2013-08-23 12:23 ` [PATCH 29/40] ARM: ux500: Stop requesting the SoC device to play 'parent' role Lee Jones
2013-08-23 12:23 ` [PATCH 30/40] ARM: ux500: Purge DB8500 PRCMU registration when not booting with DT Lee Jones
2013-08-23 12:23 ` [PATCH 31/40] ARM: ux500: Don't register Synaptics RMI4 TS when booting with ATAGs Lee Jones
2013-08-23 12:23 ` [PATCH 32/40] ARM: ux500: Delete U8500 UIB support " Lee Jones
2013-08-23 12:53 ` Linus Walleij
2013-08-23 13:03 ` Linus Walleij
2013-08-27 7:52 ` Lee Jones
2013-08-23 12:23 ` [PATCH 33/40] ARM: ux500: Don't register the STMPE/SKE when booting with ATAG support Lee Jones
2013-08-23 12:55 ` Linus Walleij
2013-08-23 13:05 ` Linus Walleij
2013-08-23 14:50 ` Lee Jones
2013-08-23 12:23 ` [PATCH 34/40] ARM: ux500: Remove BU21013 ROHM TS support when booting with only ATAGs Lee Jones
2013-08-23 12:23 ` [PATCH 35/40] ARM: ux500: Take out STUIB support when not booting with Device Tree Lee Jones
2013-08-23 12:23 ` [PATCH 36/40] ARM: ux500: Purge UIB framework when booting with ATAGs Lee Jones
2013-08-23 12:23 ` [PATCH 37/40] ARM: ux500: Remove ATAG booting support for MOP500 Lee Jones
2013-08-23 12:23 ` [PATCH 38/40] ARM: ux500: Remove ATAG booting support for U8520 Lee Jones
2013-08-23 12:23 ` [PATCH 39/40] ARM: ux500: Remove ATAG booting support for HREF Lee Jones
2013-08-23 12:23 ` [PATCH 40/40] ARM: ux500: Remove ATAG booting support for Snowball Lee Jones
2013-08-23 13:26 ` [PATCH 0/40] ARM: ux500: Convert to Device Tree only platform Linus Walleij
2013-08-23 14:46 ` 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=1377260620-18829-2-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).