[U-Boot] [PATCH, V2] Resend: i.MX6: add enable_sata_clock()

[Eric Nelson]

Hi Stefano,

On 05/06/2012 10:04 AM, Stefano Babic wrote:
> On 28/04/2012 17:29, Eric Nelson wrote:
>
>> Hi Dirk,
>>
>> I tried to address this global/non-const by making it explicitly public,
>> but Stefano nacked the patch:
>>      http://patchwork.ozlabs.org/patch/144712/
>>
>> As it stands, the compiler won't generate an external reference for the
>> local above, so it should be good.
>
> It seems ok. However, this conflicts with
>
> 	imx-common: Factor out get_ahb_clk()
>
> sent by Fabio Estevam.
>
> Reason is only the modified structure name : I made these changes to
> your patch:
>
> diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c
> index 3255771..52d5dc4 100644
> --- a/arch/arm/cpu/armv7/mx6/clock.c
> +++ b/arch/arm/cpu/armv7/mx6/clock.c
> @@ -296,8 +296,8 @@ int enable_sata_clock(void)
>   {
>          u32 reg = 0;
>          s32 timeout = 100000;
> -       struct imx_ccm_reg *const imx_ccm
> -               = (struct imx_ccm_reg *) CCM_BASE_ADDR;
> +       struct mxc_ccm_reg *const imx_ccm
> +               = (struct mxc_ccm_reg *) CCM_BASE_ADDR;
>
>          /* Enable sata clock */
>
> Change is trivial, but please take a look.
>

This is clearly fine, but it has me laughing because I never
remember what 'mxc' stands for.

Regards,


Eric