mx25pdk: Adapt it for the new PMIC framework

Make the necessary adaptions for the new PMIC framework, so that mx25pdk can be built again. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Stefano Babic <sbabic@denx.de>

mx25pdk: Adapt it for the new PMIC framework
Make the necessary adaptions for the new PMIC framework, so that mx25pdk can be built again. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Stefano Babic <sbabic@denx.de>
Fabio Estevam · Stefano Babic
1 parent 05a860c228
Showing 2 changed files with 13 additions and 6 deletions Side-by-side Diff
board/freescale/mx25pdk/mx25pdk.c
include/configs/mx25pdk.h
@@ -27,7 +27,7 @@
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <i2c.h>
-#include <pmic.h>
+#include <power/pmic.h>
 #include <fsl_pmic.h>
 #include <mc34704.h>
  
  
@@ -110,11 +110,18 @@
 int board_late_init(void)
 {
 	struct pmic *p;
+	int ret;
  
 	mx25pdk_fec_init();
  
-	pmic_init();
-	p = get_pmic();
+	ret = pmic_init(I2C_PMIC);
+	if (ret)
+		return ret;
+
+	p = pmic_get("FSL_PMIC");
+	if (!p)
+		return -ENODEV;
+
 	/* Turn on Ethernet PHY supply */
 	pmic_reg_write(p, MC34704_GENERAL2_REG, ONOFFE);
  
@@ -108,9 +108,9 @@
 #define CONFIG_SYS_FSL_ESDHC_NUM	1
  
 /* PMIC Configs */
-#define CONFIG_PMIC
-#define CONFIG_PMIC_I2C
-#define CONFIG_PMIC_FSL
+#define CONFIG_POWER
+#define CONFIG_POWER_I2C
+#define CONFIG_POWER_FSL
 #define CONFIG_PMIC_FSL_MC34704
 #define CONFIG_SYS_FSL_PMIC_I2C_ADDR	0x54
...	...	@@ -27,7 +27,7 @@
27	27	#include <mmc.h>
28	28	#include <fsl_esdhc.h>
29	29	#include <i2c.h>
30		-#include <pmic.h>
	30	+#include <power/pmic.h>
31	31	#include <fsl_pmic.h>
32	32	#include <mc34704.h>
33	33
34	34
...	...	@@ -110,11 +110,18 @@
110	110	int board_late_init(void)
111	111	{
112	112	struct pmic *p;
	113	+ int ret;
113	114
114	115	mx25pdk_fec_init();
115	116
116		- pmic_init();
117		- p = get_pmic();
	117	+ ret = pmic_init(I2C_PMIC);
	118	+ if (ret)
	119	+ return ret;
	120	+
	121	+ p = pmic_get("FSL_PMIC");
	122	+ if (!p)
	123	+ return -ENODEV;
	124	+
118	125	/* Turn on Ethernet PHY supply */
119	126	pmic_reg_write(p, MC34704_GENERAL2_REG, ONOFFE);
120	127
...	...	@@ -108,9 +108,9 @@
108	108	#define CONFIG_SYS_FSL_ESDHC_NUM 1
109	109
110	110	/* PMIC Configs */
111		-#define CONFIG_PMIC
112		-#define CONFIG_PMIC_I2C
113		-#define CONFIG_PMIC_FSL
	111	+#define CONFIG_POWER
	112	+#define CONFIG_POWER_I2C
	113	+#define CONFIG_POWER_FSL
114	114	#define CONFIG_PMIC_FSL_MC34704
115	115	#define CONFIG_SYS_FSL_PMIC_I2C_ADDR 0x54
116	116