[U-Boot] [PATCH 1/3] imx: mx6 remove duplicated enable_cspi_clock

Fabio Estevam festevam at gmail.com
Wed Jun 24 17:53:40 CEST 2015


On Wed, Jun 24, 2015 at 7:44 AM, Peng Fan <Peng.Fan at freescale.com> wrote:
> enable_spi_clock does the same thing with enable_cspi_clock.
>
> Signed-off-by: Peng Fan <Peng.Fan at freescale.com>
> ---
>  arch/arm/cpu/armv7/mx6/clock.c | 19 -------------------
>  1 file changed, 19 deletions(-)
>
> diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c
> index ae99945..1134770 100644
> --- a/arch/arm/cpu/armv7/mx6/clock.c
> +++ b/arch/arm/cpu/armv7/mx6/clock.c
> @@ -102,25 +102,6 @@ void enable_uart_clk(unsigned char enable)
>  }
>  #endif
>
> -#ifdef CONFIG_SPI
> -/* spi_num can be from 0 - 4 */
> -int enable_cspi_clock(unsigned char enable, unsigned spi_num)
> -{
> -       u32 mask;
> -
> -       if (spi_num > 4)
> -               return -EINVAL;
> -
> -       mask = MXC_CCM_CCGR_CG_MASK << (spi_num * 2);
> -       if (enable)
> -               setbits_le32(&imx_ccm->CCGR1, mask);
> -       else
> -               clrbits_le32(&imx_ccm->CCGR1, mask);
> -
> -       return 0;
> -}
> -#endif
> -

This patch causes board/compulab/cm_fx6/spl.c to fail to build.

I see that you fix board/compulab/cm_fx6/spl.c in a later patch in
your series, but it should be part of the same patch to avoid the
build breakage.

You should also remove the function prototype from
arch/arm/include/asm/arch-mx6/clock.h.

Regards,

Fabio Estevam


More information about the U-Boot mailing list