| Message ID | 1302785860-14755-1-git-send-email-andre.schwarz@matrix-vision.de |
|---|---|
| State | Changes Requested |
| Delegated to: | Kim Phillips |
| Headers | show |
On Thu, 14 Apr 2011 14:57:40 +0200 Andre Schwarz <andre.schwarz@matrix-vision.de> wrote: > Running on mpc837x without CONFIG_FSL_ESDHC leads to > i2c1_clk not being set at all. It is bound to clock > of encryption module. fix this. > > > Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de> > --- > Changes for v2: > - fix commit message mangling in subject line. thanks for listing change matter, subsequent versions of patches should inherit prior versions "In-reply-to:" and "References:" headers. > arch/powerpc/cpu/mpc83xx/speed.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/arch/powerpc/cpu/mpc83xx/speed.c b/arch/powerpc/cpu/mpc83xx/speed.c > index 5e616dd..1eca1a8 100644 > --- a/arch/powerpc/cpu/mpc83xx/speed.c > +++ b/arch/powerpc/cpu/mpc83xx/speed.c > @@ -327,6 +327,8 @@ int get_clocks(void) > i2c1_clk = enc_clk; > #elif defined(CONFIG_FSL_ESDHC) > i2c1_clk = sdhc_clk; > +#elif defined(CONFIG_MPC837x) > + i2c1_clk = enc_clk; > #endif can you consolidate this and the other i2c1_clk-to-enc_clk assignments in one #elif defined(...) || defined(...), etc. not sure if the FSL_ESDHC ifdef would need to be moved above that. btw, subjects in this patchseries should be of the form [PATCH x/y]. Thanks, Kim
On Thu, 14 Apr 2011 14:57:40 +0200 Andre Schwarz <andre.schwarz@matrix-vision.de> wrote: > Running on mpc837x without CONFIG_FSL_ESDHC leads to > i2c1_clk not being set at all. It is bound to clock > of encryption module. fix this. > > > Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de> > --- applied to u-boot-mpc83xx. Thanks, Kim
diff --git a/arch/powerpc/cpu/mpc83xx/speed.c b/arch/powerpc/cpu/mpc83xx/speed.c index 5e616dd..1eca1a8 100644 --- a/arch/powerpc/cpu/mpc83xx/speed.c +++ b/arch/powerpc/cpu/mpc83xx/speed.c @@ -327,6 +327,8 @@ int get_clocks(void) i2c1_clk = enc_clk; #elif defined(CONFIG_FSL_ESDHC) i2c1_clk = sdhc_clk; +#elif defined(CONFIG_MPC837x) + i2c1_clk = enc_clk; #endif #if !defined(CONFIG_MPC832x) i2c2_clk = csb_clk; /* i2c-2 clk is equal to csb clk */
Running on mpc837x without CONFIG_FSL_ESDHC leads to i2c1_clk not being set at all. It is bound to clock of encryption module. fix this. Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de> --- Changes for v2: - fix commit message mangling in subject line. arch/powerpc/cpu/mpc83xx/speed.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)