From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 28/40] ARM: ux500: Remove UART support when booting without Device Tree
Date: Fri, 23 Aug 2013 13:23:28 +0100 [thread overview]
Message-ID: <1377260620-18829-29-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.c | 76 ------------------------------------
arch/arm/mach-ux500/board-mop500.h | 3 --
arch/arm/mach-ux500/devices-common.h | 10 -----
arch/arm/mach-ux500/devices-db8500.h | 10 -----
4 files changed, 99 deletions(-)
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 0ae083b..db6908a 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -17,7 +17,6 @@
#include <linux/platform_data/db8500_thermal.h>
#include <linux/amba/bus.h>
#include <linux/amba/pl022.h>
-#include <linux/amba/serial.h>
#include <linux/mfd/abx500/ab8500.h>
#include <linux/regulator/ab8500.h>
#include <linux/regulator/fixed.h>
@@ -79,75 +78,6 @@ struct pl022_ssp_controller ssp0_plat = {
.num_chipselect = 5,
};
-#ifdef CONFIG_STE_DMA40
-static struct stedma40_chan_cfg uart0_dma_cfg_rx = {
- .mode = STEDMA40_MODE_LOGICAL,
- .dir = DMA_DEV_TO_MEM,
- .dev_type = DB8500_DMA_DEV13_UART0,
-};
-
-static struct stedma40_chan_cfg uart0_dma_cfg_tx = {
- .mode = STEDMA40_MODE_LOGICAL,
- .dir = DMA_MEM_TO_DEV,
- .dev_type = DB8500_DMA_DEV13_UART0,
-};
-
-static struct stedma40_chan_cfg uart1_dma_cfg_rx = {
- .mode = STEDMA40_MODE_LOGICAL,
- .dir = DMA_DEV_TO_MEM,
- .dev_type = DB8500_DMA_DEV12_UART1,
-};
-
-static struct stedma40_chan_cfg uart1_dma_cfg_tx = {
- .mode = STEDMA40_MODE_LOGICAL,
- .dir = DMA_MEM_TO_DEV,
- .dev_type = DB8500_DMA_DEV12_UART1,
-};
-
-static struct stedma40_chan_cfg uart2_dma_cfg_rx = {
- .mode = STEDMA40_MODE_LOGICAL,
- .dir = DMA_DEV_TO_MEM,
- .dev_type = DB8500_DMA_DEV11_UART2,
-};
-
-static struct stedma40_chan_cfg uart2_dma_cfg_tx = {
- .mode = STEDMA40_MODE_LOGICAL,
- .dir = DMA_MEM_TO_DEV,
- .dev_type = DB8500_DMA_DEV11_UART2,
-};
-#endif
-
-struct amba_pl011_data uart0_plat = {
-#ifdef CONFIG_STE_DMA40
- .dma_filter = stedma40_filter,
- .dma_rx_param = &uart0_dma_cfg_rx,
- .dma_tx_param = &uart0_dma_cfg_tx,
-#endif
-};
-
-struct amba_pl011_data uart1_plat = {
-#ifdef CONFIG_STE_DMA40
- .dma_filter = stedma40_filter,
- .dma_rx_param = &uart1_dma_cfg_rx,
- .dma_tx_param = &uart1_dma_cfg_tx,
-#endif
-};
-
-struct amba_pl011_data uart2_plat = {
-#ifdef CONFIG_STE_DMA40
- .dma_filter = stedma40_filter,
- .dma_rx_param = &uart2_dma_cfg_rx,
- .dma_tx_param = &uart2_dma_cfg_tx,
-#endif
-};
-
-static void __init mop500_uart_init(struct device *parent)
-{
- db8500_add_uart0(parent, &uart0_plat);
- db8500_add_uart1(parent, &uart1_plat);
- db8500_add_uart2(parent, &uart2_plat);
-}
-
static void __init mop500_init_machine(void)
{
struct device *parent = NULL;
@@ -156,8 +86,6 @@ static void __init mop500_init_machine(void)
parent = u8500_init_devices();
- mop500_uart_init(parent);
-
/* This board has full regulator constraints */
regulator_has_full_constraints();
}
@@ -170,8 +98,6 @@ static void __init snowball_init_machine(void)
parent = u8500_init_devices();
- mop500_uart_init(parent);
-
/* This board has full regulator constraints */
regulator_has_full_constraints();
}
@@ -184,8 +110,6 @@ static void __init hrefv60_init_machine(void)
parent = u8500_init_devices();
- mop500_uart_init(parent);
-
/* This board has full regulator constraints */
regulator_has_full_constraints();
}
diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h
index 2cced8b..cf6b304 100644
--- a/arch/arm/mach-ux500/board-mop500.h
+++ b/arch/arm/mach-ux500/board-mop500.h
@@ -87,9 +87,6 @@ extern struct msp_i2s_platform_data msp0_platform_data;
extern struct msp_i2s_platform_data msp1_platform_data;
extern struct msp_i2s_platform_data msp2_platform_data;
extern struct msp_i2s_platform_data msp3_platform_data;
-extern struct amba_pl011_data uart0_plat;
-extern struct amba_pl011_data uart1_plat;
-extern struct amba_pl011_data uart2_plat;
extern struct pl022_ssp_controller ssp0_plat;
void __init mop500_u8500uib_init(void);
diff --git a/arch/arm/mach-ux500/devices-common.h b/arch/arm/mach-ux500/devices-common.h
index 15bf1ab..f3f7349 100644
--- a/arch/arm/mach-ux500/devices-common.h
+++ b/arch/arm/mach-ux500/devices-common.h
@@ -11,15 +11,5 @@
#include <linux/platform_device.h>
#include <linux/dma-mapping.h>
#include <linux/sys_soc.h>
-#include <linux/amba/bus.h>
-
-struct amba_pl011_data;
-
-static inline struct amba_device *
-dbx500_add_uart(struct device *parent, const char *name, resource_size_t base,
- int irq, struct amba_pl011_data *pdata)
-{
- return amba_ahb_device_add(parent, name, base, SZ_4K, irq, 0, pdata, 0);
-}
#endif
diff --git a/arch/arm/mach-ux500/devices-db8500.h b/arch/arm/mach-ux500/devices-db8500.h
index e6ac6d2..fc4048f 100644
--- a/arch/arm/mach-ux500/devices-db8500.h
+++ b/arch/arm/mach-ux500/devices-db8500.h
@@ -18,14 +18,4 @@ extern struct ab8500_platform_data ab8500_platdata;
extern struct prcmu_pdata db8500_prcmu_pdata;
extern struct platform_device db8500_prcmu_device;
-#define db8500_add_uart0(parent, pdata) \
- dbx500_add_uart(parent, "uart0", U8500_UART0_BASE, \
- IRQ_DB8500_UART0, pdata)
-#define db8500_add_uart1(parent, pdata) \
- dbx500_add_uart(parent, "uart1", U8500_UART1_BASE, \
- IRQ_DB8500_UART1, pdata)
-#define db8500_add_uart2(parent, pdata) \
- dbx500_add_uart(parent, "uart2", U8500_UART2_BASE, \
- IRQ_DB8500_UART2, pdata)
-
#endif
--
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 ` [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 ` [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 ` Lee Jones [this message]
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-29-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).