From: Lee Jones <lee.jones@linaro.org>
To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: arnd@arndb.de, linus.walleij@linaro.org,
Lee Jones <lee.jones@linaro.org>
Subject: [PATCH 18/40] ARM: ux500: Purge SDI support for ATAG booting
Date: Fri, 23 Aug 2013 13:23:18 +0100 [thread overview]
Message-ID: <1377260620-18829-19-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-sdi.c | 39 ----------------------------------
arch/arm/mach-ux500/board-mop500.c | 3 ---
arch/arm/mach-ux500/board-mop500.h | 3 ---
arch/arm/mach-ux500/devices-common.h | 10 ---------
arch/arm/mach-ux500/devices-db8500.h | 19 -----------------
5 files changed, 74 deletions(-)
diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c
index 1ae5999..26600a1 100644
--- a/arch/arm/mach-ux500/board-mop500-sdi.c
+++ b/arch/arm/mach-ux500/board-mop500-sdi.c
@@ -65,12 +65,6 @@ struct mmci_platform_data mop500_sdi0_data = {
#endif
};
-static void sdi0_configure(struct device *parent)
-{
- /* Add the device, force v2 to subrevision 1 */
- db8500_add_sdi0(parent, &mop500_sdi0_data, U8500_SDI_V2_PERIPHID);
-}
-
/*
* SDI1 (SDIO WLAN)
*/
@@ -172,36 +166,3 @@ struct mmci_platform_data mop500_sdi4_data = {
.dma_tx_param = &mop500_sdi4_dma_cfg_tx,
#endif
};
-
-void __init mop500_sdi_init(struct device *parent)
-{
- /* PoP:ed eMMC */
- db8500_add_sdi2(parent, &mop500_sdi2_data, U8500_SDI_V2_PERIPHID);
- /* On-board eMMC */
- db8500_add_sdi4(parent, &mop500_sdi4_data, U8500_SDI_V2_PERIPHID);
-}
-
-void __init snowball_sdi_init(struct device *parent)
-{
- /* On Snowball MMC_CAP_SD_HIGHSPEED isn't supported (Hardware issue?) */
- mop500_sdi0_data.capabilities &= ~MMC_CAP_SD_HIGHSPEED;
- /* On-board eMMC */
- db8500_add_sdi4(parent, &mop500_sdi4_data, U8500_SDI_V2_PERIPHID);
- /* External Micro SD slot */
- mop500_sdi0_data.gpio_cd = SNOWBALL_SDMMC_CD_GPIO;
- mop500_sdi0_data.cd_invert = true;
- sdi0_configure(parent);
-}
-
-void __init hrefv60_sdi_init(struct device *parent)
-{
- /* PoP:ed eMMC */
- db8500_add_sdi2(parent, &mop500_sdi2_data, U8500_SDI_V2_PERIPHID);
- /* On-board eMMC */
- db8500_add_sdi4(parent, &mop500_sdi4_data, U8500_SDI_V2_PERIPHID);
- /* External Micro SD slot */
- mop500_sdi0_data.gpio_cd = HREFV60_SDMMC_CD_GPIO;
- sdi0_configure(parent);
- /* WLAN SDIO channel */
- db8500_add_sdi1(parent, &mop500_sdi1_data, U8500_SDI_V2_PERIPHID);
-}
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 447d37d..d53d672 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -165,7 +165,6 @@ static void __init mop500_init_machine(void)
mop500_pinmaps_init();
parent = u8500_init_devices();
- mop500_sdi_init(parent);
mop500_spi_init(parent);
mop500_uart_init(parent);
@@ -182,7 +181,6 @@ static void __init snowball_init_machine(void)
snowball_pinmaps_init();
parent = u8500_init_devices();
- snowball_sdi_init(parent);
mop500_spi_init(parent);
mop500_uart_init(parent);
@@ -199,7 +197,6 @@ static void __init hrefv60_init_machine(void)
hrefv60_pinmaps_init();
parent = u8500_init_devices();
- hrefv60_sdi_init(parent);
mop500_spi_init(parent);
mop500_uart_init(parent);
diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h
index 341fad1..06eb894 100644
--- a/arch/arm/mach-ux500/board-mop500.h
+++ b/arch/arm/mach-ux500/board-mop500.h
@@ -94,9 +94,6 @@ extern struct amba_pl011_data uart2_plat;
extern struct pl022_ssp_controller ssp0_plat;
extern struct stedma40_platform_data dma40_plat_data;
-extern void mop500_sdi_init(struct device *parent);
-extern void snowball_sdi_init(struct device *parent);
-extern void hrefv60_sdi_init(struct device *parent);
void __init mop500_u8500uib_init(void);
void __init mop500_stuib_init(void);
void __init mop500_pinmaps_init(void);
diff --git a/arch/arm/mach-ux500/devices-common.h b/arch/arm/mach-ux500/devices-common.h
index 34ec2f7..030f5a0 100644
--- a/arch/arm/mach-ux500/devices-common.h
+++ b/arch/arm/mach-ux500/devices-common.h
@@ -24,16 +24,6 @@ dbx500_add_spi(struct device *parent, const char *name, resource_size_t base,
pdata, periphid);
}
-struct mmci_platform_data;
-
-static inline struct amba_device *
-dbx500_add_sdi(struct device *parent, const char *name, resource_size_t base,
- int irq, struct mmci_platform_data *pdata, u32 periphid)
-{
- return amba_ahb_device_add(parent, name, base, SZ_4K, irq, 0,
- pdata, periphid);
-}
-
struct amba_pl011_data;
static inline struct amba_device *
diff --git a/arch/arm/mach-ux500/devices-db8500.h b/arch/arm/mach-ux500/devices-db8500.h
index 64667f6..e47039b 100644
--- a/arch/arm/mach-ux500/devices-db8500.h
+++ b/arch/arm/mach-ux500/devices-db8500.h
@@ -49,25 +49,6 @@ db8500_add_ssp(struct device *parent, const char *name, resource_size_t base,
ux500_add_usb(parent, U8500_USBOTG_BASE, \
IRQ_DB8500_USBOTG, rx_cfg, tx_cfg)
-#define db8500_add_sdi0(parent, pdata, pid) \
- dbx500_add_sdi(parent, "sdi0", U8500_SDI0_BASE, \
- IRQ_DB8500_SDMMC0, pdata, pid)
-#define db8500_add_sdi1(parent, pdata, pid) \
- dbx500_add_sdi(parent, "sdi1", U8500_SDI1_BASE, \
- IRQ_DB8500_SDMMC1, pdata, pid)
-#define db8500_add_sdi2(parent, pdata, pid) \
- dbx500_add_sdi(parent, "sdi2", U8500_SDI2_BASE, \
- IRQ_DB8500_SDMMC2, pdata, pid)
-#define db8500_add_sdi3(parent, pdata, pid) \
- dbx500_add_sdi(parent, "sdi3", U8500_SDI3_BASE, \
- IRQ_DB8500_SDMMC3, pdata, pid)
-#define db8500_add_sdi4(parent, pdata, pid) \
- dbx500_add_sdi(parent, "sdi4", U8500_SDI4_BASE, \
- IRQ_DB8500_SDMMC4, pdata, pid)
-#define db8500_add_sdi5(parent, pdata, pid) \
- dbx500_add_sdi(parent, "sdi5", U8500_SDI5_BASE, \
- IRQ_DB8500_SDMMC5, pdata, pid)
-
#define db8500_add_ssp0(parent, pdata) \
db8500_add_ssp(parent, "ssp0", U8500_SSP0_BASE, \
IRQ_DB8500_SSP0, pdata)
--
1.8.1.2
next prev parent reply other threads:[~2013-08-23 12:30 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 ` [PATCH 01/40] ARM: ux500: Remove Audio/MSP support when booting with ATAGs Lee Jones
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 ` Lee Jones [this message]
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-19-git-send-email-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=arnd@arndb.de \
--cc=linus.walleij@linaro.org \
--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
all inboxes | Powered by JetHome®