Merge branch 'ti-u-boot-2016.05' of git://git.ti.com/ti-u-boot/ti-u-boot into p-ti-u-boot-2016.05

* 'ti-u-boot-2016.05' of git://git.ti.com/ti-u-boot/ti-u-boot:
  drivers: mmc: omap_hsmmc: update phase delay value per latest TRM
  drivers: block: Fixed capacity message

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>

2 files changed, 3 insertions, 3 deletions

diff --git a/disk/part.c b/disk/part.c
index 543cab8103..d93a643067 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -241,13 +241,13 @@ void dev_print (struct blk_desc *dev_desc)
                         printf ("            Supports 48-bit addressing\n");
 #endif
 #if defined(CONFIG_SYS_64BIT_LBA)
-                printf ("            Capacity: %ld.%ld MB = %ld.%ld GB (%Ld x %ld)\n",
+                printf ("            Capacity: %lu.%lu MB = %lu.%lu GB (%llu x %lu)\n",
                         mb_quot, mb_rem,
                         gb_quot, gb_rem,
                         lba,
                         dev_desc->blksz);
 #else
-                printf ("            Capacity: %ld.%ld MB = %ld.%ld GB (%ld x %ld)\n",
+                printf ("            Capacity: %lu.%lu MB = %lu.%lu GB (%lu x %lu)\n",
                         mb_quot, mb_rem,
                         gb_quot, gb_rem,
                         (ulong)lba,
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index e3c64bb05b..2849519a58 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -633,7 +633,7 @@ static int omap_hsmmc_execute_tuning(struct mmc *mmc, uint opcode)
                 goto tuning_error;
         }
 
-        phase_delay = max_window + 4 * (max_len >> 1);
+        phase_delay = max_window + 4 * ((3 * max_len) >> 2);
         omap_hsmmc_set_dll(mmc, phase_delay);
 
         mmc_reset_controller_fsm(mmc_base, SYSCTL_SRD);