1. 25 Mar, 2009 5 commits
  2. 24 Mar, 2009 2 commits
    • Ladislav Michl's avatar
      omap mmc: Remove power_pin · ed39a47f
      Ladislav Michl authored
      On Tue, Jan 13, 2009 at 03:43:44PM +0200, Tony Lindgren wrote:
      > > diff --git a/arch/arm/plat-omap/include/mach/mmc.h b/arch/arm/plat-omap/include/mach/mmc.h
      > > index 031250f..1129e97 100644
      > > --- a/arch/arm/plat-omap/include/mach/mmc.h
      > > +++ b/arch/arm/plat-omap/include/mach/mmc.h
      > > @@ -51,7 +51,6 @@ struct omap_mmc_platform_data {
      > >  	 * not supported */
      > >  	int (* init)(struct device *dev);
      > >  	void (* cleanup)(struct device *dev);
      > > -	void (* shutdown)(struct device *dev);
      > >
      > >  	/* To handle board related suspend/resume functionality for MMC */
      > >  	int (*suspend)(struct device *dev, int slot);
      > > @@ -77,10 +76,6 @@ struct omap_mmc_platform_data {
      > >
      > >  		/* use the internal clock */
      > >  		unsigned internal_clock:1;
      > > -		s16 power_pin;
      > > -
      > > -		int switch_pin;			/* gpio (card detect) */
      > > -		int gpio_wp;			/* gpio (write protect) */
      > >
      > >  		int (* set_bus_mode)(struct device *dev, int slot, int bus_mode);
      > >  		int (* set_power)(struct device *dev, int slot, int power_on, int vdd);
      >
      > Hmm, aren't switch_pin and gpio_wp  used at least in the
      > mmc-twl4030.c?
      
      Yes, they are. I missed them completely. Sorry.
      
      > I guess they could be internal to mmc-twl4030.c if not used
      > in the drivers directly.
      
      They could, but that's a bit more complicated. Will look at it later.
      
      > > diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
      > > index 67d7b7f..84de289 100644
      > > --- a/drivers/mmc/host/omap.c
      > > +++ b/drivers/mmc/host/omap.c
      > > @@ -157,8 +157,6 @@ struct mmc_omap_host {
      > >  	struct timer_list	dma_timer;
      > >  	unsigned		dma_len;
      > >
      > > -	short			power_pin;
      > > -
      > >  	struct mmc_omap_slot    *slots[OMAP_MMC_MAX_SLOTS];
      > >  	struct mmc_omap_slot    *current_slot;
      > >  	spinlock_t              slot_lock;
      > >
      >
      > Looks like power_pin could go though.
      
      Updated patch follows
      Signed-off-by: default avatarLadislav Michl <ladis@linux-mips.org>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      ed39a47f
    • Tony Lindgren's avatar
      Merge current mainline tree into linux-omap tree · 90e758af
      Tony Lindgren authored
      Merge branches 'master' and 'linus'
      
      Conflicts:
      	arch/arm/mach-omap2/board-omap3beagle.c
      	arch/arm/plat-omap/include/mach/common.h
      	arch/arm/plat-omap/include/mach/pm.h
      90e758af
  3. 23 Mar, 2009 14 commits
  4. 22 Mar, 2009 6 commits
  5. 21 Mar, 2009 2 commits
  6. 20 Mar, 2009 10 commits
  7. 19 Mar, 2009 1 commit