[U-Boot] [PATCH 3/3] pico-imx7d: polish uart clock id definition

[Stefano Babic]

Hi Jun,

I am just trying to check if some patch was silently lost, I found yours:

On 16/07/19 09:42, Jun Nie wrote:
> Polish uart clock id definition. Default IMX7 UART ID is UART1
> as original parameter in imx_get_uartclk().
> 
> Signed-off-by: Jun Nie <jun.nie at linaro.org>
> ---
>  arch/arm/include/asm/arch-mx7/clock.h | 18 +-----------------
>  1 file changed, 1 insertion(+), 17 deletions(-)
> 
> diff --git a/arch/arm/include/asm/arch-mx7/clock.h b/arch/arm/include/asm/arch-mx7/clock.h
> index 1d07fde..a8e6097 100644
> --- a/arch/arm/include/asm/arch-mx7/clock.h
> +++ b/arch/arm/include/asm/arch-mx7/clock.h
> @@ -175,23 +175,7 @@ enum clk_root_index {
>  	CLK_ROOT_MAX,
>  };
>  
> -#if (CONFIG_CONS_INDEX == 0)
> -#define UART_CLK_ROOT UART1_CLK_ROOT
> -#elif (CONFIG_CONS_INDEX == 1)
> -#define UART_CLK_ROOT UART2_CLK_ROOT
> -#elif (CONFIG_CONS_INDEX == 2)
> -#define UART_CLK_ROOT UART3_CLK_ROOT
> -#elif (CONFIG_CONS_INDEX == 3)
> -#define UART_CLK_ROOT UART4_CLK_ROOT
> -#elif (CONFIG_CONS_INDEX == 4)
> -#define UART_CLK_ROOT UART5_CLK_ROOT
> -#elif (CONFIG_CONS_INDEX == 5)
> -#define UART_CLK_ROOT UART6_CLK_ROOT
> -#elif (CONFIG_CONS_INDEX == 6)
> -#define UART_CLK_ROOT UART7_CLK_ROOT
> -#else
> -#error "Invalid IMX UART ID for serial console is defined"
> -#endif
> +#define UART_CLK_ROOT (UART1_CLK_ROOT + CONFIG_CONS_INDEX)
>  
>  struct clk_root_setting {
>  	enum clk_root_index root;
> 

It looks ok but CONFIG_CONS_INDEX *must* be set, else it breaks boards.
Patch breaks at least the colibri boards.

Best regards,
Stefano

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================