Patchwork [U-Boot,3/3,V4] PMIC: MAX77686: Add FDT Support

login
register
mail settings
Submitter Rajeshwari Birje
Date Jan. 4, 2013, 5:38 a.m.
Message ID <1357277939-3033-4-git-send-email-rajeshwari.s@samsung.com>
Download mbox | patch
Permalink /patch/209368/
State Changes Requested
Delegated to: Minkyu Kang
Headers show

Comments

Rajeshwari Birje - Jan. 4, 2013, 5:38 a.m.
This patch adds fdt support to MAX77686.

Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
---
Changes in V2:
        - Corrected indentation errors.
Changes in V3:
	- Rebased on top of the latest implementation
	of PMIC
Changes in V4:
	- Corrected PMIC register address
 drivers/power/pmic/pmic_max77686.c |   37 +++++++++++++++++++++++++++++++++--
 1 files changed, 34 insertions(+), 3 deletions(-)
Simon Glass - Jan. 10, 2013, 3:13 p.m.
On Thu, Jan 3, 2013 at 9:38 PM, Rajeshwari Shinde
<rajeshwari.s@samsung.com> wrote:
> This patch adds fdt support to MAX77686.
>
> Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>

Acked-by: Simon Glass <sjg@chromium.org>

> ---
> Changes in V2:
>         - Corrected indentation errors.
> Changes in V3:
>         - Rebased on top of the latest implementation
>         of PMIC
> Changes in V4:
>         - Corrected PMIC register address
>  drivers/power/pmic/pmic_max77686.c |   37 +++++++++++++++++++++++++++++++++--
>  1 files changed, 34 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/power/pmic/pmic_max77686.c b/drivers/power/pmic/pmic_max77686.c
> index fce0183..a1ee04e 100644
> --- a/drivers/power/pmic/pmic_max77686.c
> +++ b/drivers/power/pmic/pmic_max77686.c
> @@ -22,10 +22,14 @@
>   */
>
>  #include <common.h>
> +#include <fdtdec.h>
> +#include <i2c.h>
>  #include <power/pmic.h>
>  #include <power/max77686_pmic.h>
>  #include <errno.h>
>
> +DECLARE_GLOBAL_DATA_PTR;
> +
>  int pmic_init(unsigned char bus)
>  {
>         static const char name[] = "MAX77686_PMIC";
> @@ -36,13 +40,40 @@ int pmic_init(unsigned char bus)
>                 return -ENOMEM;
>         }
>
> -       puts("Board PMIC init\n");
> +#ifdef CONFIG_OF_CONTROL
> +       const void *blob = gd->fdt_blob;
> +       int node, parent;
> +
> +       node = fdtdec_next_compatible(blob, 0, COMPAT_MAXIM_MAX77686_PMIC);
> +       if (node < 0) {
> +               debug("PMIC: No node for PMIC Chip in device tree\n");
> +               debug("node = %d\n", node);
> +               return -1;
> +       }
> +
> +       parent = fdt_parent_offset(blob, node);
> +       if (parent < 0) {
> +               debug("%s: Cannot find node parent\n", __func__);
> +               return -1;
> +       }
> +
> +       p->bus = i2c_get_bus_num_fdt(parent);
> +       if (p->bus < 0) {
> +               debug("%s: Cannot find I2C bus\n", __func__);
> +               return -1;
> +       }
> +       p->hw.i2c.addr = fdtdec_get_int(blob, node, "reg", 9);
> +#else
> +       p->bus = bus;
> +       p->hw.i2c.addr = MAX77686_I2C_ADDR;
> +#endif
> +
>         p->name = name;
>         p->interface = PMIC_I2C;
>         p->number_of_regs = PMIC_NUM_OF_REGS;
> -       p->hw.i2c.addr = MAX77686_I2C_ADDR;
>         p->hw.i2c.tx_num = 1;
> -       p->bus = bus;
> +
> +       puts("Board PMIC init\n");
>
>         return 0;
>  }
> --
> 1.7.4.4
>

Patch

diff --git a/drivers/power/pmic/pmic_max77686.c b/drivers/power/pmic/pmic_max77686.c
index fce0183..a1ee04e 100644
--- a/drivers/power/pmic/pmic_max77686.c
+++ b/drivers/power/pmic/pmic_max77686.c
@@ -22,10 +22,14 @@ 
  */
 
 #include <common.h>
+#include <fdtdec.h>
+#include <i2c.h>
 #include <power/pmic.h>
 #include <power/max77686_pmic.h>
 #include <errno.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 int pmic_init(unsigned char bus)
 {
 	static const char name[] = "MAX77686_PMIC";
@@ -36,13 +40,40 @@  int pmic_init(unsigned char bus)
 		return -ENOMEM;
 	}
 
-	puts("Board PMIC init\n");
+#ifdef CONFIG_OF_CONTROL
+	const void *blob = gd->fdt_blob;
+	int node, parent;
+
+	node = fdtdec_next_compatible(blob, 0, COMPAT_MAXIM_MAX77686_PMIC);
+	if (node < 0) {
+		debug("PMIC: No node for PMIC Chip in device tree\n");
+		debug("node = %d\n", node);
+		return -1;
+	}
+
+	parent = fdt_parent_offset(blob, node);
+	if (parent < 0) {
+		debug("%s: Cannot find node parent\n", __func__);
+		return -1;
+	}
+
+	p->bus = i2c_get_bus_num_fdt(parent);
+	if (p->bus < 0) {
+		debug("%s: Cannot find I2C bus\n", __func__);
+		return -1;
+	}
+	p->hw.i2c.addr = fdtdec_get_int(blob, node, "reg", 9);
+#else
+	p->bus = bus;
+	p->hw.i2c.addr = MAX77686_I2C_ADDR;
+#endif
+
 	p->name = name;
 	p->interface = PMIC_I2C;
 	p->number_of_regs = PMIC_NUM_OF_REGS;
-	p->hw.i2c.addr = MAX77686_I2C_ADDR;
 	p->hw.i2c.tx_num = 1;
-	p->bus = bus;
+
+	puts("Board PMIC init\n");
 
 	return 0;
 }