]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
REMOVE OMAP LEGACY CODE: Remove board-h4-mmc.c
authorTony Lindgren <tony@atomide.com>
Tue, 31 Mar 2009 21:40:46 +0000 (14:40 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 31 Mar 2009 21:40:46 +0000 (14:40 -0700)
Patches welcome against the mainline kernel to add back
the necessary functionality.

Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/board-h4-mmc.c [deleted file]
arch/arm/mach-omap2/board-h4.c

index 9b270d86fc364094c286feea872d1fab40a83c55..c95332bf30cb7a6097e715a52470299b70f44a7e 100644 (file)
@@ -40,7 +40,7 @@ mailbox_mach-objs             := mailbox.o
 
 # Specific board support
 obj-$(CONFIG_MACH_OMAP_GENERIC)                += board-generic.o
-obj-$(CONFIG_MACH_OMAP_H4)             += board-h4.o board-h4-mmc.o
+obj-$(CONFIG_MACH_OMAP_H4)             += board-h4.o
 obj-$(CONFIG_MACH_OMAP_2430SDP)                += board-2430sdp.o \
                                           board-2430sdp-flash.o \
                                           mmc-twl4030.o
diff --git a/arch/arm/mach-omap2/board-h4-mmc.c b/arch/arm/mach-omap2/board-h4-mmc.c
deleted file mode 100644 (file)
index 48c0358..0000000
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * linux/arch/arm/mach-omap2/board-h4-mmc.c
- *
- * Copyright (C) 2007 Instituto Nokia de Tecnologia - INdT
- * Authors: David Cohen <david.cohen@indt.org.br>
- *          Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
- *
- * This code is based on linux/arch/arm/mach-omap2/board-n800-mmc.c, which is:
- * Copyright (C) 2006 Nokia Corporation
- * Author: Juha Yrjola
- *
- * 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/delay.h>
-#include <linux/platform_device.h>
-#include <linux/i2c/menelaus.h>
-
-#include <asm/mach-types.h>
-
-#include <mach/mmc.h>
-
-#ifdef CONFIG_MMC_OMAP
-
-/* Bit mask for slots detection interrupts */
-#define SD1_CD_ST      (1 << 0)
-#define SD2_CD_ST      (1 << 1)
-
-static int slot1_cover_open;
-static int slot2_cover_open;
-static struct device *mmc_device;
-
-/*
- * VMMC --> slot 1
- * VDCDC3_APE, VMCS2_APE --> slot 2
- */
-
-static int h4_mmc_switch_slot(struct device *dev, int slot)
-{
-       int r = 0;
-
-#ifdef CONFIG_MMC_DEBUG
-       dev_dbg(dev, "Choose slot %d\n", slot + 1);
-#endif
-       if (slot == 0) {
-               r = menelaus_enable_slot(2, 0);
-               r |= menelaus_enable_slot(1, 1);
-       } else {
-               r = menelaus_enable_slot(1, 0);
-               r |= menelaus_enable_slot(2, 1);
-       }
-
-       return r ? -ENODEV : 0;
-}
-
-static int h4_mmc_set_power(struct device *dev, int slot, int power_on,
-                               int vdd)
-{
-       int mV = 0;
-
-#ifdef CONFIG_MMC_DEBUG
-       dev_dbg(dev, "Set slot %d power: %s (vdd %d)\n", slot + 1,
-               power_on ? "on" : "off", vdd);
-#endif
-       if (slot == 0) {
-               if (!power_on)
-                       return menelaus_set_vmmc(3000);
-               switch (1 << vdd) {
-                       case MMC_VDD_33_34:
-                       case MMC_VDD_32_33:
-                       case MMC_VDD_31_32:
-                               mV = 3100;
-                               break;
-                       case MMC_VDD_30_31:
-                               mV = 3000;
-                               break;
-                       case MMC_VDD_28_29:
-                               mV = 2800;
-                               break;
-                       case MMC_VDD_165_195:
-                               mV = 1850;
-                               break;
-                       default:
-                               BUG();
-               }
-               return menelaus_set_vmmc(mV);
-       } else {
-               if (!power_on)
-                       return menelaus_set_vdcdc(3, 3000);
-               switch (1 << vdd) {
-                       case MMC_VDD_33_34:
-                       case MMC_VDD_32_33:
-                               mV = 3300;
-                               break;
-                       case MMC_VDD_30_31:
-                       case MMC_VDD_29_30:
-                               mV = 3000;
-                               break;
-                       case MMC_VDD_28_29:
-                       case MMC_VDD_27_28:
-                               mV = 2800;
-                               break;
-                       case MMC_VDD_24_25:
-                       case MMC_VDD_23_24:
-                               mV = 2400;
-                               break;
-                       case MMC_VDD_22_23:
-                       case MMC_VDD_21_22:
-                               mV = 2200;
-                               break;
-                       case MMC_VDD_20_21:
-                               mV = 2000;
-                               break;
-                       case MMC_VDD_165_195:
-                               mV = 1800;
-                               break;
-                       default:
-                               BUG();
-               }
-               return menelaus_set_vdcdc(3, mV);
-       }
-       return 0;
-}
-
-static int h4_mmc_set_bus_mode(struct device *dev, int slot, int bus_mode)
-{
-       int r = 0;
-
-#ifdef CONFIG_MMC_DEBUG
-       dev_dbg(dev, "Set slot %d bus mode %s\n", slot + 1,
-               bus_mode == MMC_BUSMODE_OPENDRAIN ? "open-drain" : "push-pull");
-#endif
-       BUG_ON(slot != 0 && slot != 1);
-       slot++;
-       switch (bus_mode) {
-       case MMC_BUSMODE_OPENDRAIN:
-               r = menelaus_set_mmc_opendrain(slot, 1);
-               break;
-       case MMC_BUSMODE_PUSHPULL:
-               r = menelaus_set_mmc_opendrain(slot, 0);
-               break;
-       default:
-               BUG();
-       }
-       if (r != 0 && printk_ratelimit()) {
-               dev_err(dev, "MMC: unable to set bus mode for slot %d\n",
-                       slot);
-       }
-       return r;
-}
-
-static int h4_mmc_slot1_cover_state(struct device *dev, int slot)
-{
-       BUG_ON(slot != 0);
-       return slot1_cover_open;
-}
-
-static int h4_mmc_slot2_cover_state(struct device *dev, int slot)
-{
-       BUG_ON(slot != 1);
-       return slot2_cover_open;
-}
-
-static void h4_mmc_slot_callback(void *data, u8 card_mask)
-{
-       int cover_open;
-
-       cover_open = (card_mask & SD1_CD_ST) ? 0 : 1;
-       if (cover_open != slot1_cover_open) {
-               slot1_cover_open = cover_open;
-               omap_mmc_notify_cover_event(mmc_device, 0, slot1_cover_open);
-       }
-
-       cover_open = (card_mask & SD2_CD_ST) ? 0 : 1;
-       if (cover_open != slot2_cover_open) {
-               slot2_cover_open = cover_open;
-               omap_mmc_notify_cover_event(mmc_device, 1, slot2_cover_open);
-       }
-}
-
-static int h4_mmc_late_init(struct device *dev)
-{
-       int r;
-
-       mmc_device = dev;
-
-       r = menelaus_set_mmc_slot(1, 0, 0, 1);
-       if (r < 0)
-               goto out;
-       r = menelaus_set_mmc_slot(2, 0, 0, 1);
-       if (r < 0)
-               goto out;
-
-       r = menelaus_get_slot_pin_states();
-       if (r < 0)
-               goto out;
-
-       if (r & SD1_CD_ST)
-               slot1_cover_open = 1;
-       else
-               slot1_cover_open = 0;
-
-       /* Slot pin bits seem to be inversed until first swith change,
-        * but just for slot 2
-        */
-       if ((r == 0xf) || (r == (0xf & ~SD2_CD_ST)))
-               r = ~r;
-
-       if (r & SD2_CD_ST)
-               slot2_cover_open = 1;
-       else
-               slot2_cover_open = 0;
-
-       r = menelaus_register_mmc_callback(h4_mmc_slot_callback, NULL);
-
-out:
-       return r;
-}
-
-static void h4_mmc_cleanup(struct device *dev)
-{
-       menelaus_unregister_mmc_callback();
-}
-
-static struct omap_mmc_platform_data mmc1_data = {
-       .nr_slots               = 2,
-       .switch_slot            = h4_mmc_switch_slot,
-       .init                   = h4_mmc_late_init,
-       .cleanup                = h4_mmc_cleanup,
-       .dma_mask               = 0xffffffff,
-       .slots[0] = {
-               .wires          = 4,
-               .set_power      = h4_mmc_set_power,
-               .set_bus_mode   = h4_mmc_set_bus_mode,
-               .get_cover_state= h4_mmc_slot1_cover_state,
-               .ocr_mask       = MMC_VDD_165_195 |
-                                 MMC_VDD_28_29 | MMC_VDD_30_31 |
-                                 MMC_VDD_32_33 | MMC_VDD_33_34,
-               .name           = "slot1",
-       },
-       .slots[1] = {
-               .wires          = 4,
-               .set_power      = h4_mmc_set_power,
-               .set_bus_mode   = h4_mmc_set_bus_mode,
-               .get_cover_state= h4_mmc_slot2_cover_state,
-               .ocr_mask       = MMC_VDD_165_195 | MMC_VDD_20_21 |
-                                 MMC_VDD_21_22 | MMC_VDD_22_23 | MMC_VDD_23_24 |
-                                 MMC_VDD_24_25 | MMC_VDD_27_28 | MMC_VDD_28_29 |
-                                 MMC_VDD_29_30 | MMC_VDD_30_31 | MMC_VDD_32_33 |
-                                 MMC_VDD_33_34,
-               .name           = "slot2",
-       },
-};
-
-static struct omap_mmc_platform_data *mmc_data[OMAP24XX_NR_MMC];
-
-void __init h4_mmc_init(void)
-{
-       mmc_data[0] = &mmc1_data;
-       omap2_init_mmc(mmc_data, OMAP24XX_NR_MMC);
-}
-
-#else
-
-void __init h4_mmc_init(void)
-{
-}
-
-#endif
-
index dd55149a8b89d499447b9deff9755bc552090099..cbca22a0199a27de88333a054db3c4cc54e2d67f 100644 (file)
@@ -97,8 +97,6 @@
        /* 5, 6 not connected */
 #      define H4_GPIO_CAM_RST          (H4_U193_GPIO_BASE + 7)
 
-extern void h4_mmc_init(void);
-
 static unsigned int row_gpios[6] = { 88, 89, 124, 11, 6, 96 };
 static unsigned int col_gpios[7] = { 90, 91, 100, 36, 12, 97, 98 };
 
@@ -793,7 +791,6 @@ static void __init omap_h4_init(void)
        omap_board_config_size = ARRAY_SIZE(h4_config);
        omap_serial_init();
        omap_usb_init(&h4_usb_config);
-       h4_mmc_init();
        omap_register_i2c_bus(1, 100, h4_i2c_board_info,
                              ARRAY_SIZE(h4_i2c_board_info));