]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'omap-pool'
authorTony Lindgren <tony@atomide.com>
Tue, 7 Apr 2009 22:55:24 +0000 (15:55 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 7 Apr 2009 22:55:24 +0000 (15:55 -0700)
Conflicts:
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/board-overo.c
drivers/regulator/core.c
drivers/regulator/twl4030-regulator.c
include/linux/i2c/twl4030.h
include/linux/regulator/driver.h

20 files changed:
1  2 
Makefile
arch/arm/configs/omap_ldp_defconfig
arch/arm/mach-omap2/board-overo.c
drivers/hwmon/Kconfig
drivers/hwmon/Makefile
drivers/input/touchscreen/ads7846.c
drivers/leds/Kconfig
drivers/leds/Makefile
drivers/mfd/Kconfig
drivers/misc/Kconfig
drivers/mmc/host/Kconfig
drivers/mmc/host/omap_hsmmc.c
drivers/mtd/cmdlinepart.c
drivers/mtd/maps/Kconfig
drivers/mtd/maps/Makefile
drivers/mtd/maps/omap_nor.c
drivers/mtd/nand/Kconfig
drivers/mtd/nand/Makefile
include/linux/connector.h
kernel/printk.c

diff --cc Makefile
Simple merge
Simple merge
index f9cc015d36d869b3c84f3a46a6cbeaaffff216dc,9d36bc946ac49afb13dc229c397e9cf6e8de15e8..f357de9681c7308d43af80837f70c2c608a108e7
@@@ -124,66 -183,7 +183,8 @@@ static inline void __init overo_init_sm
  static inline void __init overo_init_smsc911x(void) { return; }
  #endif
  
- #if defined(CONFIG_TOUCHSCREEN_ADS7846) || \
-       defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)
- #include <mach/mcspi.h>
- #include <linux/spi/spi.h>
- #include <linux/spi/ads7846.h>
- static struct omap2_mcspi_device_config ads7846_mcspi_config = {
-       .turbo_mode     = 0,
-       .single_channel = 1,    /* 0: slave, 1: master */
- };
- static int ads7846_get_pendown_state(void)
- {
-       return !gpio_get_value(OVERO_GPIO_PENDOWN);
- }
  
- static struct ads7846_platform_data ads7846_config = {
-       .x_max                  = 0x0fff,
-       .y_max                  = 0x0fff,
-       .x_plate_ohms           = 180,
-       .pressure_max           = 255,
-       .debounce_max           = 10,
-       .debounce_tol           = 3,
-       .debounce_rep           = 1,
-       .get_pendown_state      = ads7846_get_pendown_state,
-       .keep_vref_on           = 1,
- };
- static struct spi_board_info overo_spi_board_info[] __initdata = {
-       {
-               .modalias               = "ads7846",
-               .bus_num                = 1,
-               .chip_select            = 0,
-               .max_speed_hz           = 1500000,
-               .controller_data        = &ads7846_mcspi_config,
-               .irq                    = OMAP_GPIO_IRQ(OVERO_GPIO_PENDOWN),
-               .platform_data          = &ads7846_config,
-       }
- };
- static void __init overo_ads7846_init(void)
- {
-       if ((gpio_request(OVERO_GPIO_PENDOWN, "ADS7846_PENDOWN") == 0) &&
-           (gpio_direction_input(OVERO_GPIO_PENDOWN) == 0)) {
-               gpio_export(OVERO_GPIO_PENDOWN, 0);
-       } else {
-               printk(KERN_ERR "could not obtain gpio for ADS7846_PENDOWN\n");
-               return;
-       }
-       spi_register_board_info(overo_spi_board_info,
-                       ARRAY_SIZE(overo_spi_board_info));
- }
- #else
- static inline void __init overo_ads7846_init(void) { return; }
- #endif
 +
  static struct mtd_partition overo_nand_partitions[] = {
        {
                .name           = "xloader",
@@@ -393,11 -393,12 +394,12 @@@ static void __init overo_init(void
        omap_board_config = overo_config;
        omap_board_config_size = ARRAY_SIZE(overo_config);
        omap_serial_init();
 -      twl4030_mmc_init(mmc);
 -      overo_flash_init();
        usb_musb_init();
        usb_ehci_init();
 +      overo_flash_init();
 +      overo_init_smsc911x();
        overo_ads7846_init();
+       overo_init_smsc911x();
  
        if ((gpio_request(OVERO_GPIO_W2W_NRESET,
                          "OVERO_GPIO_W2W_NRESET") == 0) &&
Simple merge
Simple merge
Simple merge
index 5c34aef3e9a2f029ce13fb1c6699c2489c023b36,9b60b6b684d9cd7c5a62c843d827e6071491a51f..788f48cf921a6c2cb319bdffd3ac4a5dae629e03
@@@ -132,21 -124,40 +139,50 @@@ config LEDS_GPI
        help
          This option enables support for the LEDs connected to GPIO
          outputs. To be useful the particular board must have LEDs
-         and they must be connected to the GPIO lines.
+         and they must be connected to the GPIO lines.  The LEDs must be
+         defined as platform devices and/or OpenFirmware platform devices.
+         The code to use these bindings can be selected below.
+ config LEDS_GPIO_PLATFORM
+       bool "Platform device bindings for GPIO LEDs"
+       depends on LEDS_GPIO
+       default y
+       help
+         Let the leds-gpio driver drive LEDs which have been defined as
+         platform devices.  If you don't know what this means, say yes.
+ config LEDS_GPIO_OF
+       bool "OpenFirmware platform device bindings for GPIO LEDs"
+       depends on LEDS_GPIO && OF_DEVICE
+       default y
+       help
+         Let the leds-gpio driver drive LEDs which have been defined as
+         of_platform devices.  For instance, LEDs which are listed in a "dts"
+         file.
+ config LEDS_LP5521
+       tristate "LED Support for the LP5521 LEDs"
+       depends on LEDS_CLASS && I2C
+       help
+         If you say 'Y' here you get support for the National Semiconductor
+         LP5521 LED driver used in n8x0 boards.
+         This driver can be built as a module by choosing 'M'. The module
+         will be called leds-lp5521.
  
 +config LEDS_LP5521
 +      tristate "LED Support for the LP5521 LEDs"
 +      depends on LEDS_CLASS && I2C
 +      help
 +        If you say 'Y' here you get support for the National Semiconductor
 +        LP5521 LED driver used in n8x0 boards.
 +
 +        This driver can be built as a module by choosing 'M'. The module
 +        will be called leds-lp5521.
 +
  config LEDS_CLEVO_MAIL
-       tristate "Mail LED on Clevo notebook (EXPERIMENTAL)"
-       depends on LEDS_CLASS && X86 && SERIO_I8042 && DMI && EXPERIMENTAL
+       tristate "Mail LED on Clevo notebook"
+       depends on LEDS_CLASS && X86 && SERIO_I8042 && DMI
        help
          This driver makes the mail LED accessible from userspace
          programs through the leds subsystem. This LED have three
Simple merge
Simple merge
Simple merge
index ff8836306e77176cee4c3ddef4b458726b76a0dd,b4cf691f3f64ec9cdbbc2792d32ae35bbf37bbfe..5e7ef789c828735754e25275a60f54ac9c3d9a86
@@@ -65,11 -72,21 +72,22 @@@ config MMC_RICOH_MM
  
          If unsure, say Y.
  
+ config MMC_SDHCI_OF
+       tristate "SDHCI support on OpenFirmware platforms"
+       depends on MMC_SDHCI && PPC_OF
+       select MMC_SDHCI_IO_ACCESSORS
+       help
+         This selects the OF support for Secure Digital Host Controller
+         Interfaces. So far, only the Freescale eSDHC controller is known
+         to exist on OF platforms.
+         If unsure, say N.
  config MMC_OMAP
        tristate "TI OMAP Multimedia Card Interface support"
 -      depends on ARCH_OMAP
 +      depends on ARCH_OMAP1 || (ARCH_OMAP2 && ARCH_OMAP2420)
        select TPS65010 if MACH_OMAP_H2
 +      select OMAP_GPIO_SWITCH if MACH_NOKIA_N800
        help
          This selects the TI OMAP Multimedia card Interface.
          If you have an OMAP board with a Multimedia Card slot,
index ac51f0b4954d2cf9270367b79b71df5e7a617ab1,d183be6f2a5f7ab369ef8b60c5cfd25815db110f..63a06266828edb21fda7fefe8172b704bcb1a236
@@@ -1006,33 -1070,34 +1071,33 @@@ static int __init omap_mmc_probe(struc
        mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count;
        mmc->max_seg_size = mmc->max_req_size;
  
 -      mmc->ocr_avail = mmc_slot(host).ocr_mask;
        mmc->caps |= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED;
  
-       if (pdata->slots[host->slot_id].wires >= 4)
+       if (pdata->slots[host->slot_id].wires >= 8)
+               mmc->caps |= MMC_CAP_8_BIT_DATA;
+       else if (pdata->slots[host->slot_id].wires >= 4)
                mmc->caps |= MMC_CAP_4_BIT_DATA;
  
-       /* Only MMC1 supports 3.0V */
-       if (host->id == OMAP_MMC1_DEVID) {
-               hctl = SDVS30;
-               capa = VS30 | VS18;
-       } else {
-               hctl = SDVS18;
-               capa = VS18;
-       }
-       OMAP_HSMMC_WRITE(host->base, HCTL,
-                       OMAP_HSMMC_READ(host->base, HCTL) | hctl);
-       OMAP_HSMMC_WRITE(host->base, CAPA,
-                       OMAP_HSMMC_READ(host->base, CAPA) | capa);
-       /* Set the controller to AUTO IDLE mode */
-       OMAP_HSMMC_WRITE(host->base, SYSCONFIG,
-                       OMAP_HSMMC_READ(host->base, SYSCONFIG) | AUTOIDLE);
+       omap_hsmmc_init(host);
  
-       /* Set SD bus power bit */
-       OMAP_HSMMC_WRITE(host->base, HCTL,
-                       OMAP_HSMMC_READ(host->base, HCTL) | SDBP);
+       /* Select DMA lines */
+       switch (host->id) {
+       case OMAP_MMC1_DEVID:
+               host->dma_line_tx = OMAP24XX_DMA_MMC1_TX;
+               host->dma_line_rx = OMAP24XX_DMA_MMC1_RX;
+               break;
+       case OMAP_MMC2_DEVID:
+               host->dma_line_tx = OMAP24XX_DMA_MMC2_TX;
+               host->dma_line_rx = OMAP24XX_DMA_MMC2_RX;
+               break;
+       case OMAP_MMC3_DEVID:
+               host->dma_line_tx = OMAP34XX_DMA_MMC3_TX;
+               host->dma_line_rx = OMAP34XX_DMA_MMC3_RX;
+               break;
+       default:
+               dev_err(mmc_dev(host->mmc), "Invalid MMC id\n");
+               goto err_irq;
+       }
  
        /* Request IRQ for MMC operations */
        ret = request_irq(host->irq, mmc_omap_irq, IRQF_DISABLED,
                        goto err_irq_cd_init;
                }
        }
 +      mmc->ocr_avail = mmc_slot(host).ocr_mask;
  
        /* Request IRQ for card detect */
-       if ((mmc_slot(host).card_detect_irq) && (mmc_slot(host).card_detect)) {
+       if ((mmc_slot(host).card_detect_irq)) {
                ret = request_irq(mmc_slot(host).card_detect_irq,
                                  omap_mmc_cd_handler,
                                  IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/printk.c
Simple merge