diff --git a/drivers/mmc/bvd_mmc.c b/drivers/mmc/bvd_mmc.c
index 4930c17..5688bea 100644
--- a/drivers/mmc/bvd_mmc.c
+++ b/drivers/mmc/bvd_mmc.c
@@ -619,16 +619,22 @@ void bvd_mmc_send_command(struct mmc_request *request)
 			return;
 		}
 	}
-	if (request->cmd == SD_SEND_OP_COND) {
-		DEBUG(3, "Have an SD card\n");
-		bvd_mmc_data.sd = 1;
-	}
-	if (request->cmd == MMC_SEND_OP_COND) {
-		DEBUG(3, "Have an MMC card\n");
-		bvd_mmc_data.sd = 0;
-		/* always use 1bit for MMC */
-		bvd_mmc_data.use_4bit = 0;
-	}
+
+        switch(request->cmd) {
+          case SD_SEND_IF_COND:
+          case SD_SEND_OP_COND:
+                  DEBUG(3, "Have an SD card\n");
+                  bvd_mmc_data.sd = 1;
+                  break;
+
+          case MMC_SEND_OP_COND:
+                  DEBUG(3, "Have an MMC card\n");
+                  bvd_mmc_data.sd = 0;
+                  /* always use 1bit for MMC */
+                  bvd_mmc_data.use_4bit = 0;
+                  break;
+        }
+
 	if (request->cmd == SET_BUS_WIDTH) {
 		if (request->arg == 0x2) {
 			DEBUG(2, "Use 4-bit bus width\n");
diff --git a/drivers/mmc/mmc_core.c b/drivers/mmc/mmc_core.c
index e441e84..acca5f9 100644
--- a/drivers/mmc/mmc_core.c
+++ b/drivers/mmc/mmc_core.c
@@ -170,40 +170,68 @@ static inline char * card_state_to_string( int i )
 int mmc_unpack_csd( struct mmc_request *request, struct mmc_csd *csd )
 {
 	u8 *buf = request->response;
-    int num = 0;
-	
+        int num = 0;
+
 	if ( request->result ) return request->result;
 
 	csd->csd_structure      = (buf[1] & 0xc0) >> 6;
 	csd->spec_vers          = (buf[1] & 0x3c) >> 2;
-	csd->taac               = buf[2];
-	csd->nsac               = buf[3];
 	csd->tran_speed         = buf[4];
 	csd->ccc                = (((u16)buf[5]) << 4) | ((buf[6] & 0xf0) >> 4);
-	csd->read_bl_len        = buf[6] & 0x0f;
-    /* for support 2GB card*/
-	if ( csd->read_bl_len >= 10) 
-	{
-	     num = csd->read_bl_len - 9;
-	     csd->read_bl_len = 9;
-	}
+	csd->dsr_imp            = (buf[7] & 0x10) ? 1 : 0;
+
+        switch (csd->csd_structure) {
+          case CSD_STRUCT_VER_1_0:
+	    csd->taac               = buf[2];
+            csd->nsac               = buf[3];
+            // blkbits
+            csd->read_bl_len        = buf[6] & 0x0f;
+            if ( csd->read_bl_len >= 10)
+            {
+                 num = csd->read_bl_len - 9;
+                 csd->read_bl_len = 9;
+            }
+
+            csd->read_bl_partial    = (buf[7] & 0x80) ? 1 : 0;
+            csd->write_blk_misalign = (buf[7] & 0x40) ? 1 : 0;
+	    csd->read_blk_misalign  = (buf[7] & 0x20) ? 1 : 0;
+            // use offset from read_bl_len
+            csd->c_size = ( (((u16)buf[7] & 0x03) << 10) | ((u16)buf[8] << 2) | ((u16)buf[9] & 0xc0) >> 6 ) << num;
+            csd->c_size_mult        = ((buf[10] & 0x03) << 1) | ((buf[11] & 0x80) >> 7);
+            csd->r2w_factor         = (buf[13] & 0x1c) >> 2;
+            csd->write_bl_len       = ((buf[13] & 0x03) << 2) | ((buf[14] & 0xc0) >> 6);
+            // hack
+            if (csd->write_bl_len >= 10)
+	        csd->write_bl_len = 9;
+
+            csd->write_bl_partial   = (buf[14] & 0x20) ? 1 : 0;
+
+
+            break;
+          case CSD_STRUCT_VER_1_1: // SDHC
+            csd->taac               = 0;
+            csd->nsac               = 0;
+
+            csd->read_bl_len        = 9;
+            csd->read_bl_partial    = 0;
+            csd->write_blk_misalign = 0;
+            csd->read_blk_misalign  = 0;
+
+            csd->c_size = (u16)buf[10] | (u16)buf[9] << 8 | ((u16)buf[8] & 0x3f)<< 16;
+            csd->c_size_mult        = 8;
+            csd->r2w_factor         = 4;
+            csd->write_bl_len       = 9;
+            csd->write_bl_partial   = 0;
+
+            break;
+        }
 
 
-	csd->read_bl_partial    = (buf[7] & 0x80) ? 1 : 0;
-	csd->write_blk_misalign = (buf[7] & 0x40) ? 1 : 0;
-	csd->read_blk_misalign  = (buf[7] & 0x20) ? 1 : 0;
-	csd->dsr_imp            = (buf[7] & 0x10) ? 1 : 0;
-	csd->c_size             = ((((u16)buf[7]) & 0x03) << 10) | (((u16)buf[8]) << 2) | (((u16)buf[9]) & 0xc0) >> 6;
-	if (num)
-	{
-		csd->c_size = csd->c_size << num;
-	}	
 	
 	csd->vdd_r_curr_min     = (buf[9] & 0x38) >> 3;
 	csd->vdd_r_curr_max     = buf[9] & 0x07;
 	csd->vdd_w_curr_min     = (buf[10] & 0xe0) >> 5;
 	csd->vdd_w_curr_max     = (buf[10] & 0x1c) >> 2;
-	csd->c_size_mult        = ((buf[10] & 0x03) << 1) | ((buf[11] & 0x80) >> 7);
 	switch ( csd->csd_structure ) {
 	case CSD_STRUCT_VER_1_0:
 	case CSD_STRUCT_VER_1_1:
@@ -219,12 +247,6 @@ int mmc_unpack_csd( struct mmc_request *request, struct mmc_csd *csd )
 	csd->wp_grp_size        = buf[12] & 0x1f;
 	csd->wp_grp_enable      = (buf[13] & 0x80) ? 1 : 0;
 	csd->default_ecc        = (buf[13] & 0x60) >> 5;
-	csd->r2w_factor         = (buf[13] & 0x1c) >> 2;
-	csd->write_bl_len       = ((buf[13] & 0x03) << 2) | ((buf[14] & 0xc0) >> 6);
-	if (csd->write_bl_len >= 10)
-	    csd->write_bl_len = 9;
-
-	csd->write_bl_partial   = (buf[14] & 0x20) ? 1 : 0;
 	csd->file_format_grp    = (buf[15] & 0x80) ? 1 : 0;
 	csd->copy               = (buf[15] & 0x40) ? 1 : 0;
 	csd->perm_write_protect = (buf[15] & 0x20) ? 1 : 0;
diff --git a/drivers/mmc/mmc_media.c b/drivers/mmc/mmc_media.c
index ad62fd9..2b324f9 100644
--- a/drivers/mmc/mmc_media.c
+++ b/drivers/mmc/mmc_media.c
@@ -393,7 +393,6 @@ static struct mmc_media_dev * mmc_media_locate_device(const struct request *req)
 	if ( num >= MMC_MAX_SLOTS) {
 		static int count = 0;
 		if (count++ < 5) /* print the message at most five times */
-			printk(KERN_WARNING "mmc: request for unknown device\n");
 		return NULL;
 	}
 	return &g_media_dev[num];
diff --git a/drivers/mmc/mmc_media.h b/drivers/mmc/mmc_media.h
index 31ce672..0b3f2ce 100644
--- a/drivers/mmc/mmc_media.h
+++ b/drivers/mmc/mmc_media.h
@@ -71,6 +71,7 @@ struct mmc_slot {
 	enum card_state state;  /* empty, ident, ready, whatever */
 	int             flags;  /* Ejected, inserted */
         int             sd;     /* MMC or SD card */
+        int             sd2;    /* SD or SDHC */
         int             rca;    /* RCA */
         u32             scr;    /* SCR 63:32*/        
 	/* Assigned media driver */
diff --git a/drivers/mmc/mmc_protocol.c b/drivers/mmc/mmc_protocol.c
index 99c7128..fb8adb8 100644
--- a/drivers/mmc/mmc_protocol.c
+++ b/drivers/mmc/mmc_protocol.c
@@ -189,6 +189,7 @@ static void * mmc_cim_read_write_block( struct mmc_dev *dev, int first )
 	struct mmc_slot *slot = dev->slot + t->id;
 	int    retval = 0;
 	int    i;
+        int    adress_mult = t->block_len;
 
 	DEBUG(2," first=%d\n",first);
 
@@ -210,6 +211,11 @@ static void * mmc_cim_read_write_block( struct mmc_dev *dev, int first )
 		return NULL;
 	}
 
+        if ( slot->csd.csd_structure ) {
+          printk("sdhc address fix\n");
+          adress_mult = 1;
+        }
+
 	switch (dev->request.cmd) {
 	case MMC_SELECT_CARD:
 		if ( (retval = mmc_unpack_r1( &dev->request, &r1, slot->state )) )
@@ -291,10 +297,10 @@ static void * mmc_cim_read_write_block( struct mmc_dev *dev, int first )
 
 		if (t->nr_sectors > 1)
 			mmc_send_cmd(dev, (t->cmd == MMC_IO_READ ? MMC_READ_MULTIPLE_BLOCK : MMC_WRITE_MULTIPLE_BLOCK), 
-			     t->sector * t->block_len, t->nr_sectors, t->block_len, RESPONSE_R1 );
+			     t->sector * adress_mult, t->nr_sectors, t->block_len, RESPONSE_R1 );
 		else
 			mmc_send_cmd(dev, (t->cmd == MMC_IO_READ ? MMC_READ_SINGLE_BLOCK : MMC_WRITE_BLOCK),
-		             t->sector * t->block_len, 1, t->block_len, RESPONSE_R1 );
+		             t->sector * adress_mult, 1, t->block_len, RESPONSE_R1 );
 		
 		break;
 
@@ -346,7 +352,7 @@ static void * mmc_cim_read_write_block( struct mmc_dev *dev, int first )
 
 		if ( t->nr_sectors ) {
 			mmc_send_cmd(dev, (t->cmd == MMC_IO_READ ? MMC_READ_SINGLE_BLOCK : MMC_WRITE_BLOCK), 
-				     t->sector * t->block_len, 1, t->block_len, RESPONSE_R1 );
+				     t->sector * adress_mult, 1, t->block_len, RESPONSE_R1 );
 		}
 		else {
 			mmc_finish_io_request( dev, 1 );
@@ -636,11 +642,33 @@ static void * mmc_cim_single_card_acq( struct mmc_dev *dev, int first )
 		if ( (dev->sdrive->flags & MMC_SDFLAG_VOLTAGE ))
 			DEBUG(0,": error - current driver doesn't do OCR\n");
 		if (slot->sd) 
-			mmc_simple_cmd(dev, MMC_APP_CMD,  0, RESPONSE_R1);
+			mmc_simple_cmd(
+                          dev,
+                          SD_SEND_IF_COND,
+                          ((dev->sdrive->ocr & 0xFF8000) != 0) << 8 | 0xAA,
+                          RESPONSE_R6
+                        );
 		else
 			mmc_simple_cmd(dev, MMC_SEND_OP_COND, dev->sdrive->ocr, RESPONSE_R3);
 		break;
 
+        case SD_SEND_IF_COND:
+                printk("if_cond\n");
+
+                if (dev->request.response[4] == 0xAA){
+                  printk("sdhc found\n");
+                  slot->sd2 = 1;
+                } else {
+                  slot->sd2 = 0;
+                }
+
+                retval = mmc_unpack_r6(&dev->request,&r1,slot->state,&slot->rca);
+                if ( retval )
+                  printk("if_cond failed %d (%s)\n",retval , mmc_result_to_string(retval) );
+
+                mmc_simple_cmd(dev, MMC_APP_CMD, 0, RESPONSE_R1);
+		break;
+
         case MMC_APP_CMD:
         	retval = mmc_unpack_r1(&dev->request,&r1,slot->state);
 		if ( retval ) {
@@ -651,7 +679,7 @@ static void * mmc_cim_single_card_acq( struct mmc_dev *dev, int first )
 			slot->sd = 0;
 		}
                 else { 
-	            mmc_simple_cmd(dev, SD_SEND_OP_COND, 0x00ff8000, RESPONSE_R3);
+	            mmc_simple_cmd(dev, SD_SEND_OP_COND, 0x00ff8000 | (slot->sd2 << 30), RESPONSE_R3);
                 }
 		break;
 
diff --git a/include/linux/mmc/mmc_ll.h b/include/linux/mmc/mmc_ll.h
index 854ec9e..5d0063f 100644
--- a/include/linux/mmc/mmc_ll.h
+++ b/include/linux/mmc/mmc_ll.h
@@ -81,6 +81,7 @@ struct mmc_request {
 #define MMC_SDFLAG_MMC_MODE   (1<<1)    /* Can use MMC mode */
 #define MMC_SDFLAG_SD_MODE    (1<<2)    /* Can use SD mode */
 #define MMC_SDFLAG_VOLTAGE    (1<<3)    /* Can change voltage range */
+#define MMC_SDFLAG_BLOCKADDR  (1<<4)    /* Uses block address */
 
 struct module;
 
diff --git a/include/linux/mmc/mmc_protocol.h b/include/linux/mmc/mmc_protocol.h
index 0451ae5..9129d9a 100644
--- a/include/linux/mmc/mmc_protocol.h
+++ b/include/linux/mmc/mmc_protocol.h
@@ -94,6 +94,7 @@
 #define MMC_SEND_OP_COND          1   /* bcr  [31:0] OCR         R3  */
 #define MMC_ALL_SEND_CID          2   /* bcr                     R2  */
 #define MMC_SET_RELATIVE_ADDR     3   /* ac   [31:16] RCA        R1  */
+#define SD_SEND_IF_COND           8   /* bcr  [11:0] See below   R7  */
 #define MMC_SET_DSR               4   /* bc   [31:16] RCA            */
 #define MMC_SELECT_CARD           7   /* ac   [31:16] RCA        R1  */
 #define MMC_SEND_CSD              9   /* ac   [31:16] RCA        R2  */
@@ -155,8 +156,16 @@ enum mmc_rsp_t {
 	RESPONSE_R4      = 6,
 	RESPONSE_R5      = 7,
         RESPONSE_R6      = 8,
+        RESPONSE_R7      = 9,
 };
 
+/*
+* SD_SEND_IF_COND argument format:
+*
+*     [31:12] Reserved (0)
+*     [11:8] Host Voltage Supply Flags
+*     [7:0] Check Pattern (0xAA)
+*/
 
 /*
   MMC status in R1
@@ -238,7 +247,7 @@ struct mmc_csd {
 	u8  write_blk_misalign;
 	u8  read_blk_misalign;
 	u8  dsr_imp;
-	u16 c_size;
+	u32 c_size;
 	u8  vdd_r_curr_min;
 	u8  vdd_r_curr_max;
 	u8  vdd_w_curr_min;