| Message ID | 1395856590-21917-6-git-send-email-sjg@chromium.org |
|---|---|
| State | Changes Requested |
| Delegated to: | Minkyu Kang |
| Headers | show |
On 27/03/14 02:56, Simon Glass wrote: > From: Aaron Durbin <adurbin@chromium.org> > > The TSP65090 is a PMIC on some exynos5 boards. The init function is > called for the TPS65090 pmic. If that device is not a part of the device > tree (returns -ENODEV) then continue. Otherwise return a failure. > > Signed-off-by: Aaron Durbin <adurbin@chromium.org> > Signed-off-by: Simon Glass <sjg@chromium.org> > Reviewed-by: Simon Glass <sjg@chromium.org> > --- > > board/samsung/common/board.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c > index 3866495..654bdb6 100644 > --- a/board/samsung/common/board.c > +++ b/board/samsung/common/board.c > @@ -23,6 +23,7 @@ > #include <power/pmic.h> > #include <asm/arch/sromc.h> > #include <power/max77686_pmic.h> > +#include <power/tps65090_pmic.h> > > DECLARE_GLOBAL_DATA_PTR; > > @@ -261,6 +262,12 @@ int power_init_board(void) > ret = max77686_init(); > #endif What is the base tree of this patch? looks different with samsung tree. seems to need rebase? > #ifdef CONFIG_POWER_TPS65090 > + /* The TPS65090 may not be in the device tree. If so, it is not > + * an error. */ please fix this multi line comment. It should be /* * ... * ... */ > + ret = tps65090_init(); > + if (ret == 0 || ret == -ENODEV) > + return 0; #endif > + > return ret; > } > #endif > Thanks, Minkyu Kang.
Hi Simon, > From: Aaron Durbin <adurbin@chromium.org> > > The TSP65090 is a PMIC on some exynos5 boards. The init function is > called for the TPS65090 pmic. If that device is not a part of the > device tree (returns -ENODEV) then continue. Otherwise return a > failure. > > Signed-off-by: Aaron Durbin <adurbin@chromium.org> > Signed-off-by: Simon Glass <sjg@chromium.org> > Reviewed-by: Simon Glass <sjg@chromium.org> > --- > > board/samsung/common/board.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/board/samsung/common/board.c > b/board/samsung/common/board.c index 3866495..654bdb6 100644 > --- a/board/samsung/common/board.c > +++ b/board/samsung/common/board.c > @@ -23,6 +23,7 @@ > #include <power/pmic.h> > #include <asm/arch/sromc.h> > #include <power/max77686_pmic.h> > +#include <power/tps65090_pmic.h> > > DECLARE_GLOBAL_DATA_PTR; > > @@ -261,6 +262,12 @@ int power_init_board(void) > ret = max77686_init(); > #endif > > + /* The TPS65090 may not be in the device tree. If so, it is > not > + * an error. */ > + ret = tps65090_init(); > + if (ret == 0 || ret == -ENODEV) > + return 0; > + > return ret; > } > #endif Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Hi Minkyu, On 27 March 2014 06:13, Minkyu Kang <mk7.kang@samsung.com> wrote: > On 27/03/14 02:56, Simon Glass wrote: > > From: Aaron Durbin <adurbin@chromium.org> > > > > The TSP65090 is a PMIC on some exynos5 boards. The init function is > > called for the TPS65090 pmic. If that device is not a part of the device > > tree (returns -ENODEV) then continue. Otherwise return a failure. > > > > Signed-off-by: Aaron Durbin <adurbin@chromium.org> > > Signed-off-by: Simon Glass <sjg@chromium.org> > > Reviewed-by: Simon Glass <sjg@chromium.org> > > --- > > > > board/samsung/common/board.c | 7 +++++++ > > 1 file changed, 7 insertions(+) > > > > diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c > > index 3866495..654bdb6 100644 > > --- a/board/samsung/common/board.c > > +++ b/board/samsung/common/board.c > > @@ -23,6 +23,7 @@ > > #include <power/pmic.h> > > #include <asm/arch/sromc.h> > > #include <power/max77686_pmic.h> > > +#include <power/tps65090_pmic.h> > > > > DECLARE_GLOBAL_DATA_PTR; > > > > @@ -261,6 +262,12 @@ int power_init_board(void) > > ret = max77686_init(); > > #endif > > What is the base tree of this patch? > looks different with samsung tree. > seems to need rebase? > Yes it is based on mainline - I will base in on samsung/master when I resend. Regards, Simon
diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c index 3866495..654bdb6 100644 --- a/board/samsung/common/board.c +++ b/board/samsung/common/board.c @@ -23,6 +23,7 @@ #include <power/pmic.h> #include <asm/arch/sromc.h> #include <power/max77686_pmic.h> +#include <power/tps65090_pmic.h> DECLARE_GLOBAL_DATA_PTR; @@ -261,6 +262,12 @@ int power_init_board(void) ret = max77686_init(); #endif + /* The TPS65090 may not be in the device tree. If so, it is not + * an error. */ + ret = tps65090_init(); + if (ret == 0 || ret == -ENODEV) + return 0; + return ret; } #endif