Merge branch 'omap-for-v3.8/fixes-for-merge-window' into omap-for-v3.8/fixes-for-merge-window-v2

4 files changed, 0 insertions, 146 deletions

diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
index 8d885848600a..9d9aa2f55129 100644
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@ -11,7 +11,6 @@ obj-  :=
 # omap_device support (OMAP2+ only at the moment)
 
 obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o
-obj-$(CONFIG_OMAP_DEBUG_DEVICES) += debug-devices.o
 obj-$(CONFIG_OMAP_DEBUG_LEDS) += debug-leds.o
 i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o
 obj-y += $(i2c-omap-m) $(i2c-omap-y)
diff --git a/arch/arm/plat-omap/debug-devices.c b/arch/arm/plat-omap/debug-devices.c
deleted file mode 100644
index a609e2161817..000000000000
--- a/arch/arm/plat-omap/debug-devices.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * linux/arch/arm/plat-omap/debug-devices.c
- *
- * Copyright (C) 2005 Nokia Corporation
- * Modified from mach-omap2/board-h4.c
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <linux/gpio.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/io.h>
-#include <linux/smc91x.h>
-
-#include <plat/debug-devices.h>
-
-/* Many OMAP development platforms reuse the same "debug board"; these
- * platforms include H2, H3, H4, and Perseus2.
- */
-
-static struct smc91x_platdata smc91x_info = {
-        .flags  = SMC91X_USE_16BIT | SMC91X_NOWAIT,
-        .leda   = RPC_LED_100_10,
-        .ledb   = RPC_LED_TX_RX,
-};
-
-static struct resource smc91x_resources[] = {
-        [0] = {
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE,
-        },
-};
-
-static struct platform_device smc91x_device = {
-        .name           = "smc91x",
-        .id             = -1,
-        .dev            = {
-                .platform_data = &smc91x_info,
-        },
-        .num_resources  = ARRAY_SIZE(smc91x_resources),
-        .resource       = smc91x_resources,
-};
-
-static struct resource led_resources[] = {
-        [0] = {
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device led_device = {
-        .name           = "omap_dbg_led",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(led_resources),
-        .resource       = led_resources,
-};
-
-static struct platform_device *debug_devices[] __initdata = {
-        &smc91x_device,
-        &led_device,
-        /* ps2 kbd + mouse ports */
-        /* 4 extra uarts */
-        /* 6 input dip switches */
-        /* 8 output pins */
-};
-
-int __init debug_card_init(u32 addr, unsigned gpio)
-{
-        int     status;
-
-        smc91x_resources[0].start = addr + 0x300;
-        smc91x_resources[0].end   = addr + 0x30f;
-
-        smc91x_resources[1].start = gpio_to_irq(gpio);
-        smc91x_resources[1].end   = gpio_to_irq(gpio);
-
-        status = gpio_request(gpio, "SMC91x irq");
-        if (status < 0) {
-                printk(KERN_ERR "GPIO%d unavailable for smc91x IRQ\n", gpio);
-                return status;
-        }
-        gpio_direction_input(gpio);
-
-        led_resources[0].start = addr;
-        led_resources[0].end   = addr + SZ_4K - 1;
-
-        return platform_add_devices(debug_devices, ARRAY_SIZE(debug_devices));
-}
diff --git a/arch/arm/plat-omap/include/plat/debug-devices.h b/arch/arm/plat-omap/include/plat/debug-devices.h
deleted file mode 100644
index 8fc4287222dd..000000000000
--- a/arch/arm/plat-omap/include/plat/debug-devices.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* for TI reference platforms sharing the same debug card */
-extern int debug_card_init(u32 addr, unsigned gpio);
diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/arch/arm/plat-omap/include/plat/omap-serial.h
deleted file mode 100644
index ff9b0aab5281..000000000000
--- a/arch/arm/plat-omap/include/plat/omap-serial.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Driver for OMAP-UART controller.
- * Based on drivers/serial/8250.c
- *
- * Copyright (C) 2010 Texas Instruments.
- *
- * Authors:
- *      Govindraj R     <govindraj.raja@ti.com>
- *      Thara Gopinath  <thara@ti.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#ifndef __OMAP_SERIAL_H__
-#define __OMAP_SERIAL_H__
-
-#include <linux/serial_core.h>
-#include <linux/device.h>
-#include <linux/pm_qos.h>
-
-#define DRIVER_NAME     "omap_uart"
-
-/*
- * Use tty device name as ttyO, [O -> OMAP]
- * in bootargs we specify as console=ttyO0 if uart1
- * is used as console uart.
- */
-#define OMAP_SERIAL_NAME        "ttyO"
-
-struct omap_uart_port_info {
-        bool                    dma_enabled;    /* To specify DMA Mode */
-        unsigned int            uartclk;        /* UART clock rate */
-        upf_t                   flags;          /* UPF_* flags */
-        unsigned int            dma_rx_buf_size;
-        unsigned int            dma_rx_timeout;
-        unsigned int            autosuspend_timeout;
-        unsigned int            dma_rx_poll_rate;
-        int                     DTR_gpio;
-        int                     DTR_inverted;
-        int                     DTR_present;
-
-        int (*get_context_loss_count)(struct device *);
-        void (*set_forceidle)(struct device *);
-        void (*set_noidle)(struct device *);
-        void (*enable_wakeup)(struct device *, bool);
-};
-
-#endif /* __OMAP_SERIAL_H__ */