diff --git a/src/arch/armv7/lib/cache.c b/src/arch/armv7/lib/cache.c
index c7283f14cf..04eaa88c7c 100644
--- a/src/arch/armv7/lib/cache.c
+++ b/src/arch/armv7/lib/cache.c
@@ -237,37 +237,9 @@ void dcache_clean_invalidate_by_mva(unsigned long addr, unsigned long len)
 
 void dcache_mmu_disable(void)
 {
-	uint32_t sctlr, clidr;
-	int level;
-
-	clidr = read_clidr();
-	for (level = 0; level < 7; level++) {
-		unsigned int ctype = (clidr >> (level * 3)) & 0x7;
-		uint32_t csselr;
-
-		switch(ctype) {
-		case 0x0:
-			/* no cache */
-			break;
-		case 0x2:
-		case 0x4:
-			/* dcache only or unified cache */
-			csselr = level << 1;
-			write_csselr(csselr);
-			dcache_clean_invalidate_all();
-			break;
-		case 0x3:
-			/* separate icache and dcache */
-			csselr = level << 1;
-			write_csselr(csselr);
-			dcache_clean_invalidate_all();
-			break;
-		default:
-			/* reserved */
-			break;
-		}
-	}
+	uint32_t sctlr;
 
+	dcache_clean_invalidate_all();
 	sctlr = read_sctlr();
 	sctlr &= ~(SCTLR_C | SCTLR_M);
 	write_sctlr(sctlr);