diff --git a/src/mraa.c b/src/mraa.c
index 11c21ac..d35c9ee 100644
--- a/src/mraa.c
+++ b/src/mraa.c
@@ -274,6 +274,11 @@ mraa_setup_spi(int bus)
         if (mraa_setup_mux_mapped(plat->pins[pos].spi) != MRAA_SUCCESS)
              return NULL;
 
+    pos = plat->spi_bus[bus].cs;
+    if (plat->pins[pos].spi.mux_total > 0)
+        if (mraa_setup_mux_mapped(plat->pins[pos].spi) != MRAA_SUCCESS)
+             return NULL;
+
     mraa_spi_bus_t *spi = &(plat->spi_bus[bus]);
     return spi;
 }