diff --git a/libsdhcdrivers/plat_include/imx6/sdhc/plat/sdio.h b/libsdhcdrivers/plat_include/imx6/sdhc/plat/sdio.h
index 972fb1f..6d21dce 100644
--- a/libsdhcdrivers/plat_include/imx6/sdhc/plat/sdio.h
+++ b/libsdhcdrivers/plat_include/imx6/sdhc/plat/sdio.h
@@ -28,7 +28,7 @@
 #define SDHC4_IRQ   57
 
 enum sdio_id {
-    SDHC1,
+    SDHC1 = 1,
     SDHC2,
     SDHC3,
     SDHC4,
diff --git a/libsdhcdrivers/src/plat/exynos4/sdio.c b/libsdhcdrivers/src/plat/exynos4/sdio.c
index 106bdf1..eb93218 100644
--- a/libsdhcdrivers/src/plat/exynos4/sdio.c
+++ b/libsdhcdrivers/src/plat/exynos4/sdio.c
@@ -55,7 +55,7 @@
         return -1;
     }
 
-    ret = sdhc_init(iobase, &_sdhc_irq_table[id], 1, io_ops, dev);
+    ret = sdhc_init(iobase, _sdhc_irq_table, NSDHC, io_ops, dev);
     if (ret) {
         LOG_ERROR("Failed to initialise SDHC\n");
         return -1;
diff --git a/libsdhcdrivers/src/plat/imx6/sdio.c b/libsdhcdrivers/src/plat/imx6/sdio.c
index a5d1b2b..b958e47 100644
--- a/libsdhcdrivers/src/plat/imx6/sdio.c
+++ b/libsdhcdrivers/src/plat/imx6/sdio.c
@@ -51,7 +51,7 @@
         return -1;
     }
 
-    ret = sdhc_init(iobase, &_sdhc_irq_table[id], 1, io_ops, dev);
+    ret = sdhc_init(iobase, _sdhc_irq_table, NSDHC, io_ops, dev);
     if (ret) {
         LOG_ERROR("Failed to initialise SDHC\n");
         return -1;