diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index fac00a87ec..1c4f0606aa 100644
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -29,6 +29,7 @@
 #include <miiphy.h>
 #include <cpsw.h>
 #include <power/tps65217.h>
+#include <power/tps65218.h>
 #include <power/tps65910.h>
 #include <environment.h>
 #include <watchdog.h>
@@ -382,6 +383,12 @@ void am33xx_spl_board_init(void)
 
 		/* Set CORE Frequencies to OPP100 */
 		do_setup_dpll(&dpll_core_regs, &dpll_core_opp100);
+
+		/* Clear th PFM Flag on DCDC4 */
+		if (tps65218_reg_write(TPS65218_PROT_LEVEL_2, TPS65218_DCDC4, 0x00, 0x80)) {
+			puts ("tps65218_reg_write failure\n");
+		};
+
 	} else {
 		int sil_rev;
 
@@ -759,6 +766,11 @@ int board_eth_init(bd_t *bis)
 	mac_addr[4] = mac_lo & 0xFF;
 	mac_addr[5] = (mac_lo & 0xFF00) >> 8;
 
+	if (board_is_nbhw16()) {
+		/* Clock should be 2MHz */
+		cpsw_data.mdio_div = 0x3E;
+	}
+
 	if (!getenv("eth1addr")) {
 		if (is_valid_ethaddr(mac_addr))
 			eth_setenv_enetaddr("eth1addr", mac_addr);
diff --git a/include/configs/am335x_netbird.h b/include/configs/am335x_netbird.h
index 653a833799..ccbe1ad0cd 100644
--- a/include/configs/am335x_netbird.h
+++ b/include/configs/am335x_netbird.h
@@ -126,10 +126,6 @@
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS       4
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS   20
 
-/* PMIC support */
-#define CONFIG_POWER_TPS65217
-#define CONFIG_POWER_TPS65910
-
 /* SPL */
 #ifndef CONFIG_NOR_BOOT
 #define CONFIG_SPL_POWER_SUPPORT
@@ -413,4 +409,12 @@
 #define CONFIG_SYS_MEMTEST_START    0x80000000
 #define CONFIG_SYS_MEMTEST_END      0x87900000
 
+/* Enable support for TPS 65218 */
+#define CONFIG_POWER
+#define CONFIG_POWER_I2C
+#define CONFIG_POWER_TPS65218
+/* For compatibility reasons (BeagleBone) */
+#define CONFIG_POWER_TPS65217
+#define CONFIG_POWER_TPS62362
+
 #endif	/* ! __CONFIG_AM335X_EVM_H */