diff --git a/drivers/marvell/ap807_clocks_init.c b/drivers/marvell/ap807_clocks_init.c
index 5604453..d6a97b2 100644
--- a/drivers/marvell/ap807_clocks_init.c
+++ b/drivers/marvell/ap807_clocks_init.c
@@ -46,11 +46,6 @@
 	int i;
 
 	for (i = 0 ; i < AP807_CLUSTER_NUM ; i++) {
-		mmio_write_32(AP807_CPU_PLL_CFG(i),
-			      AP807_CPU_PLL_CFG_USE_REG_FILE);
-		mmio_write_32(AP807_CPU_PLL_CFG(i),
-			      AP807_CPU_PLL_CFG_USE_REG_FILE |
-			      AP807_CPU_PLL_CFG_BYPASS_MODE);
 		mmio_write_32(AP807_CPU_PLL_PARAM(i), freq_val);
 		mmio_write_32(AP807_CPU_PLL_CFG(i),
 			      AP807_CPU_PLL_CFG_USE_REG_FILE);
@@ -84,24 +79,16 @@
  */
 void ap807_clocks_init(unsigned int freq_option)
 {
-	/* Switch from ARO to PLL */
-	aro_to_pll();
-
 	/* Modifications in frequency table:
 	 * 0x0: 764x: change to 2000 MHz.
 	 * 0x2: 744x change to 1800 MHz, 764x change to 2200/2400.
 	 * 0x3: 3900/744x/764x change to 1200 MHz.
 	 */
-	switch (freq_option) {
-	case CPU_2000_DDR_1200_RCLK_1200:
-		pll_set_freq(PLL_FREQ_2000);
-		break;
-#ifdef MVEBU_SOC_AP807
-	case CPU_2200_DDR_1200_RCLK_1200:
+
+	if (freq_option == CPU_2200_DDR_1200_RCLK_1200)
 		pll_set_freq(PLL_FREQ_2200);
-		break;
-#endif
-	default:
-		break;
-	}
+
+	/* Switch from ARO to PLL */
+	aro_to_pll();
+
 }
diff --git a/include/drivers/marvell/aro.h b/include/drivers/marvell/aro.h
index c9dd36e..4d1094a 100644
--- a/include/drivers/marvell/aro.h
+++ b/include/drivers/marvell/aro.h
@@ -27,11 +27,7 @@
 	CPU_2000_DDR_1200_RCLK_1200 = 0x0,
 	CPU_2000_DDR_1050_RCLK_1050 = 0x1,
 	CPU_1600_DDR_800_RCLK_800   = 0x4,
-#ifdef MVEBU_SOC_AP807
 	CPU_2200_DDR_1200_RCLK_1200 = 0x6,
-#else
-	CPU_1800_DDR_1200_RCLK_1200 = 0x6,
-#endif
 	CPU_1800_DDR_1050_RCLK_1050 = 0x7,
 	CPU_1600_DDR_900_RCLK_900   = 0x0B,
 	CPU_1600_DDR_1050_RCLK_1050 = 0x0D,
diff --git a/plat/marvell/armada/a8k/common/plat_ble_setup.c b/plat/marvell/armada/a8k/common/plat_ble_setup.c
index 166f18b..f11b5ac 100644
--- a/plat/marvell/armada/a8k/common/plat_ble_setup.c
+++ b/plat/marvell/armada/a8k/common/plat_ble_setup.c
@@ -478,9 +478,6 @@
 		NOTICE("SVC: DEV ID: %s, FREQ Mode: 0x%x\n",
 			single_cluster == 0 ? "8040" : "8020", freq_pidi_mode);
 		switch (freq_pidi_mode) {
-#ifndef MVEBU_SOC_AP807
-		case CPU_1800_DDR_1200_RCLK_1200:
-#endif
 		case CPU_1800_DDR_1050_RCLK_1050:
 			if (perr[1])
 				goto perror;