Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / arch / arm / mach-lpc32xx / phy3250.c

diff --git a/arch/arm/mach-lpc32xx/phy3250.c b/arch/arm/mach-lpc32xx/phy3250.c
index e6f03783ad7385d7cb9b899650e7a62aa3f7ac3b..b2f9e226febeee970b0594c8be030a4838735e7c 100644 (file)
--- a/arch/arm/mach-lpc32xx/phy3250.c
+++ b/arch/arm/mach-lpc32xx/phy3250.c
@@ -36,7 +36,6 @@
 #include <linux/clk.h>
 #include <linux/mtd/lpc32xx_slc.h>
 #include <linux/mtd/lpc32xx_mlc.h>
-#include <linux/platform_data/gpio-lpc32xx.h>
 
 #include <asm/setup.h>
 #include <asm/mach-types.h>
@@ -47,13 +46,6 @@
 #include <mach/board.h>
 #include "common.h"
 
-/*
- * Mapped GPIOLIB GPIOs
- */
-#define LCD_POWER_GPIO         LPC32XX_GPIO(LPC32XX_GPO_P3_GRP, 0)
-#define BKL_POWER_GPIO         LPC32XX_GPIO(LPC32XX_GPO_P3_GRP, 4)
-#define MMC_PWR_ENABLE_GPIO    LPC32XX_GPIO(LPC32XX_GPO_P3_GRP, 5)
-
 /*
  * AMBA LCD controller
  */
@@ -97,20 +89,6 @@ static int lpc32xx_clcd_setup(struct clcd_fb *fb)
        fb->fb.fix.smem_len = PANEL_SIZE;
        fb->panel = &conn_lcd_panel;
 
-       if (gpio_request(LCD_POWER_GPIO, "LCD power"))
-               printk(KERN_ERR "Error requesting gpio %u",
-                       LCD_POWER_GPIO);
-       else if (gpio_direction_output(LCD_POWER_GPIO, 1))
-               printk(KERN_ERR "Error setting gpio %u to output",
-                       LCD_POWER_GPIO);
-
-       if (gpio_request(BKL_POWER_GPIO, "LCD backlight power"))
-               printk(KERN_ERR "Error requesting gpio %u",
-                       BKL_POWER_GPIO);
-       else if (gpio_direction_output(BKL_POWER_GPIO, 1))
-               printk(KERN_ERR "Error setting gpio %u to output",
-                       BKL_POWER_GPIO);
-
        return 0;
 }
 
@@ -126,29 +104,10 @@ static void lpc32xx_clcd_remove(struct clcd_fb *fb)
                    fb->fb.fix.smem_start);
 }
 
-/*
- * On some early LCD modules (1307.0), the backlight logic is inverted.
- * For those board variants, swap the disable and enable states for
- * BKL_POWER_GPIO.
-*/
-static void clcd_disable(struct clcd_fb *fb)
-{
-       gpio_set_value(BKL_POWER_GPIO, 0);
-       gpio_set_value(LCD_POWER_GPIO, 0);
-}
-
-static void clcd_enable(struct clcd_fb *fb)
-{
-       gpio_set_value(BKL_POWER_GPIO, 1);
-       gpio_set_value(LCD_POWER_GPIO, 1);
-}
-
 static struct clcd_board lpc32xx_clcd_data = {
        .name           = "Phytec LCD",
        .check          = clcdfb_check,
        .decode         = clcdfb_decode,
-       .disable        = clcd_disable,
-       .enable         = clcd_enable,
        .setup          = lpc32xx_clcd_setup,
        .mmap           = lpc32xx_clcd_mmap,
        .remove         = lpc32xx_clcd_remove,
@@ -187,20 +146,9 @@ static struct pl08x_platform_data pl08x_pd = {
        .mem_buses = PL08X_AHB1,
 };
 
-static int mmc_handle_ios(struct device *dev, struct mmc_ios *ios)
-{
-       /* Only on and off are supported */
-       if (ios->power_mode == MMC_POWER_OFF)
-               gpio_set_value(MMC_PWR_ENABLE_GPIO, 0);
-       else
-               gpio_set_value(MMC_PWR_ENABLE_GPIO, 1);
-       return 0;
-}
-
 static struct mmci_platform_data lpc32xx_mmci_data = {
        .ocr_mask       = MMC_VDD_30_31 | MMC_VDD_31_32 |
                          MMC_VDD_32_33 | MMC_VDD_33_34,
-       .ios_handler    = mmc_handle_ios,
 };
 
 static struct lpc32xx_slc_platform_data lpc32xx_slc_data = {
@@ -259,7 +207,6 @@ DT_MACHINE_START(LPC32XX_DT, "LPC32XX SoC (Flattened Device Tree)")
        .atag_offset    = 0x100,
        .map_io         = lpc32xx_map_io,
        .init_irq       = lpc32xx_init_irq,
-       .init_time      = lpc32xx_timer_init,
        .init_machine   = lpc3250_machine_init,
        .dt_compat      = lpc32xx_dt_compat,
 MACHINE_END