Clean up patch dir; synchronize patches with kernel-power v48

[kernel-bfs] / kernel-bfs-2.6.28 / debian / patches / class10sd_dto14_fix.diff

diff --git a/kernel-bfs-2.6.28/debian/patches/class10sd_dto14_fix.diff b/kernel-bfs-2.6.28/debian/patches/class10sd_dto14_fix.diff
index 300621b..45b8f25 100644 (file)
--- a/kernel-bfs-2.6.28/debian/patches/class10sd_dto14_fix.diff
+++ b/kernel-bfs-2.6.28/debian/patches/class10sd_dto14_fix.diff
@@ -1,13 +1,14 @@
 --- kernel-2.6.28/drivers/mmc/host/omap_hsmmc.c        2011-04-28 23:06:37.000000000 +0200
 +++ kernel-2.6.28.new/drivers/mmc/host/omap_hsmmc.c    2011-05-05 22:18:25.174891197 +0200
-@@ -958,36 +958,9 @@ static void set_data_timeout(struct omap
+@@ -958,34 +958,9 @@ static void set_data_timeout(struct omap
                             unsigned int timeout_ns,
                             unsigned int timeout_clks)
  {
 -      unsigned int timeout, cycle_ns;
 -      uint32_t reg, clkd, dto = 0;
--
--      reg = OMAP_HSMMC_READ(host->base, SYSCTL);
++      uint32_t reg, dto = 14;
+ 
+       reg = OMAP_HSMMC_READ(host->base, SYSCTL);
 -      clkd = (reg & CLKD_MASK) >> CLKD_SHIFT;
 -      if (clkd == 0)
 -              clkd = 1;
@@ -32,10 +33,6 @@
 -                      dto = 14;
 -      }
 -
-+      uint32_t reg = OMAP_HSMMC_READ(host->base, SYSCTL);
        reg &= ~DTO_MASK;
--      reg |= dto << DTO_SHIFT;
-+      reg |= DTO << DTO_SHIFT;
+       reg |= dto << DTO_SHIFT;
        OMAP_HSMMC_WRITE(host->base, SYSCTL, reg);
- }
-