diff --git a/sys/arm/ti/ti_sdhci.c b/sys/arm/ti/ti_sdhci.c
index 63aeb9bdf6ab..024c830ad9d0 100644
--- a/sys/arm/ti/ti_sdhci.c
+++ b/sys/arm/ti/ti_sdhci.c
@@ -494,13 +494,21 @@ ti_sdhci_attach(device_t dev)
 	 * Set the offset from the device's memory start to the MMCHS registers.
 	 * Also for OMAP4 disable high speed mode due to erratum ID i626.
 	 */
-	if (ti_chip() == CHIP_OMAP_4) {
+	switch (ti_chip()) {
+#ifdef SOC_OMAP4
+	case CHIP_OMAP_4:
 		sc->mmchs_reg_off = OMAP4_MMCHS_REG_OFFSET;
 		sc->disable_highspeed = true;
-        } else if (ti_chip() == CHIP_AM335X)
+		break;
+#endif
+#ifdef SOC_TI_AM335X
+	case CHIP_AM335X:
 		sc->mmchs_reg_off = AM335X_MMCHS_REG_OFFSET;
-	else
+		break;
+#endif
+	default:
 		panic("Unknown OMAP device\n");
+	}
 
 	/*
 	 * The standard SDHCI registers are at a fixed offset (the same on all