From: Jaikumar Ganesh Date: Sat, 20 Nov 2010 02:25:18 +0000 (-0800) Subject: [ARM] tegra: stingray: Delete platform data for hsuart. X-Git-Tag: firefly_0821_release~9834^2~312 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1580b6796ee94653e4841fda97cea7ece15ab426;p=firefly-linux-kernel-4.4.55.git [ARM] tegra: stingray: Delete platform data for hsuart. Use resources to feed data to tegra_hsuart instead. Signed-off-by: Jaikumar Ganesh --- diff --git a/arch/arm/mach-tegra/board-stingray.c b/arch/arm/mach-tegra/board-stingray.c index aa2f03453b1b..9207eaa3c99a 100644 --- a/arch/arm/mach-tegra/board-stingray.c +++ b/arch/arm/mach-tegra/board-stingray.c @@ -101,82 +101,6 @@ __tagtable(ATAG_NVIDIA, parse_tag_nvidia); static unsigned long ramconsole_start = SZ_512M - SZ_1M; static unsigned long ramconsole_size = SZ_1M; -static struct plat_serial8250_port hs_uarta_platform_data[] = { - { - .mapbase = TEGRA_UARTA_BASE, - .membase = IO_ADDRESS(TEGRA_UARTA_BASE), - .irq = INT_UARTA, - }, { - .flags = 0 - } -}; - -static struct platform_device hs_uarta = { - .name = "tegra_uart", - .id = 0, - .dev = { - .platform_data = hs_uarta_platform_data, - .coherent_dma_mask = 0xffffffff, - }, -}; - -static struct plat_serial8250_port hs_uartc_platform_data[] = { - { - .mapbase = TEGRA_UARTC_BASE, - .membase = IO_ADDRESS(TEGRA_UARTC_BASE), - .irq = INT_UARTC, - }, { - .flags = 0 - } -}; - -static struct platform_device hs_uartc = { - .name = "tegra_uart", - .id = 2, - .dev = { - .platform_data = hs_uartc_platform_data, - .coherent_dma_mask = 0xffffffff, - }, -}; - -static struct plat_serial8250_port hs_uartd_platform_data[] = { - { - .mapbase = TEGRA_UARTD_BASE, - .membase = IO_ADDRESS(TEGRA_UARTD_BASE), - .irq = INT_UARTD, - }, { - .flags = 0 - } -}; - -static struct platform_device hs_uartd = { - .name = "tegra_uart", - .id = 3, - .dev = { - .platform_data = hs_uartd_platform_data, - .coherent_dma_mask = 0xffffffff, - }, -}; - -static struct plat_serial8250_port hs_uarte_platform_data[] = { - { - .mapbase = TEGRA_UARTE_BASE, - .membase = IO_ADDRESS(TEGRA_UARTE_BASE), - .irq = INT_UARTE, - }, { - .flags = 0 - } -}; - -static struct platform_device hs_uarte = { - .name = "tegra_uart", - .id = 4, - .dev = { - .platform_data = hs_uarte_platform_data, - .coherent_dma_mask = 0xffffffff, - }, -}; - static struct resource mdm6600_resources[] = { [0] = { .flags = IORESOURCE_IRQ, @@ -608,10 +532,10 @@ static struct platform_device *stingray_devices[] __initdata = { &cpcap_otg, &bq24617_device, &bcm4329_rfkill, - &hs_uarta, - &hs_uartc, - &hs_uartd, - &hs_uarte, + &tegra_uarta_device, + &tegra_uartc_device, + &tegra_uartd_device, + &tegra_uarte_device, &tegra_spi_device1, &tegra_spi_device2, &tegra_spi_device3,