From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Babic Date: Fri, 09 May 2014 14:44:20 +0200 Subject: [U-Boot] [PATCH 1/4] power: make pfuze100 be able to coexist with other pmics In-Reply-To: <1398228839-29780-2-git-send-email-tharvey@gateworks.com> References: <1398228839-29780-1-git-send-email-tharvey@gateworks.com> <1398228839-29780-2-git-send-email-tharvey@gateworks.com> Message-ID: <536CCDA4.3050304@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 23/04/2014 06:53, Tim Harvey wrote: > Avoid uding pmic_init() as this forces the model of only allowing a > single PMIC driver to be built at a time. > > Signed-off-by: Tim Harvey > --- > drivers/power/pmic/pmic_pfuze100.c | 2 +- > include/power/pfuze100_pmic.h | 1 + > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/power/pmic/pmic_pfuze100.c b/drivers/power/pmic/pmic_pfuze100.c > index 22c1f15..21f12d2 100644 > --- a/drivers/power/pmic/pmic_pfuze100.c > +++ b/drivers/power/pmic/pmic_pfuze100.c > @@ -11,7 +11,7 @@ > #include > #include > > -int pmic_init(unsigned char bus) > +int power_pfuze100_init(unsigned char bus) > { > static const char name[] = "PFUZE100_PMIC"; > struct pmic *p = pmic_alloc(); > diff --git a/include/power/pfuze100_pmic.h b/include/power/pfuze100_pmic.h > index 2a9032a..444aba6 100644 > --- a/include/power/pfuze100_pmic.h > +++ b/include/power/pfuze100_pmic.h > @@ -93,4 +93,5 @@ enum { > #define SWBST_MODE_AUTO (2 << 2) > #define SWBST_MODE_APS (2 << 3) > > +int power_pfuze100_init(unsigned char bus); > #endif > Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================