| Message ID | 1470895377-2502-9-git-send-email-peng.fan@nxp.com |
|---|---|
| State | Accepted |
| Commit | 00ffa56d4b0ffb1518ed9dfc313b0d3d54998879 |
| Delegated to: | Stefano Babic |
| Headers | show |
On 11/08/2016 08:02, Peng Fan wrote: > Since MX6ULL select MX6UL, we can not use IS_ENABLED(CONFIG_MX6UL) here, > because this piece code is only for i.MX6UL. > > Signed-off-by: Peng Fan <peng.fan@nxp.com> > Cc: Stefano Babic <sbabic@denx.de> > --- > arch/arm/cpu/armv7/mx6/soc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c > index af7fca5..4083ba5 100644 > --- a/arch/arm/cpu/armv7/mx6/soc.c > +++ b/arch/arm/cpu/armv7/mx6/soc.c > @@ -356,7 +356,7 @@ int arch_cpu_init(void) > set_ahb_rate(132000000); > } > > - if (IS_ENABLED(CONFIG_MX6UL) && is_soc_rev(CHIP_REV_1_0) == 0) { > + if (is_mx6ul() && is_soc_rev(CHIP_REV_1_0) == 0) { > /* > * According to the design team's requirement on i.MX6UL, > * the PMIC_STBY_REQ PAD should be configured as open > Reviewed-by: Stefano Babic <sbabic@denx.de> Best regards, Stefano Babic
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index af7fca5..4083ba5 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -356,7 +356,7 @@ int arch_cpu_init(void) set_ahb_rate(132000000); } - if (IS_ENABLED(CONFIG_MX6UL) && is_soc_rev(CHIP_REV_1_0) == 0) { + if (is_mx6ul() && is_soc_rev(CHIP_REV_1_0) == 0) { /* * According to the design team's requirement on i.MX6UL, * the PMIC_STBY_REQ PAD should be configured as open
Since MX6ULL select MX6UL, we can not use IS_ENABLED(CONFIG_MX6UL) here, because this piece code is only for i.MX6UL. Signed-off-by: Peng Fan <peng.fan@nxp.com> Cc: Stefano Babic <sbabic@denx.de> --- arch/arm/cpu/armv7/mx6/soc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)