[PATCH v1 2/2] imx: imx8qm_rom7720_a1: fix broken fsl_esdhc_imx conversion

[Stefano Babic]

Hi Oliver,

sorry, lost your mail, and I see your question is still open:

On 20.11.20 14:13, Oliver Graute wrote:
> On 10/03/20, Stefano Babic wrote:
>> On 19.12.19 15:27, Oliver Graute wrote:
>>> Fix broken fsl_esdhc_imx conversion
>>>
>>> Signed-off-by: Oliver Graute <oliver.graute at kococonnector.com>
>>> Cc: Stefano Babic <sbabic at denx.de>
>>> Cc: Fabio Estevam <festevam at gmail.com>
>>> Cc: Peng Fan <peng.fan at nxp.com>
>>> Cc: Simon Glass <sjg at chromium.org>
>>> Cc: Ye Li <ye.li at nxp.com>
>>> Cc: uboot-imx <uboot-imx at nxp.com>
>>> ---
>>>  board/advantech/imx8qm_rom7720_a1/spl.c | 4 ++--
>>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/board/advantech/imx8qm_rom7720_a1/spl.c b/board/advantech/imx8qm_rom7720_a1/spl.c
>>> index 3f31a8f9c3..24d216921d 100644
>>> --- a/board/advantech/imx8qm_rom7720_a1/spl.c
>>> +++ b/board/advantech/imx8qm_rom7720_a1/spl.c
>>> @@ -55,7 +55,7 @@ DECLARE_GLOBAL_DATA_PTR;
>>>  		(SC_PAD_ISO_OFF << PADRING_LPCONFIG_SHIFT) | \
>>>  		(SC_PAD_28FDSOI_DSE_DV_HIGH << PADRING_DSE_SHIFT) | \
>>>  		(SC_PAD_28FDSOI_PS_PU << PADRING_PULL_SHIFT))
>>> -#ifdef CONFIG_FSL_ESDHC
>>> +#ifdef CONFIG_FSL_ESDHC_IMX
>>>  
>>>  #define USDHC1_CD_GPIO	IMX_GPIO_NR(5, 22)
>>>  #define USDHC2_CD_GPIO	IMX_GPIO_NR(4, 12)
>>> @@ -164,7 +164,7 @@ int board_mmc_getcd(struct mmc *mmc)
>>>  	return ret;
>>>  }
>>>  
>>> -#endif /* CONFIG_FSL_ESDHC */
>>> +#endif /* CONFIG_FSL_ESDHC_IMX */
>>>  
>>>  void spl_board_init(void)
>>>  {
>>>
>>
>> I agree to merge this, now it is enabled, code is compiled and I get a
>> warning:
>>
>>    aarch64:  w+   imx8qm_rom7720_a1_4G
>> functional
>> +  115 |    init_clk_usdhc(0);
>> +      |    ^~~~~~~~~~~~~~
>>
>> w+board/advantech/imx8qm_rom7720_a1/spl.c:115:4: warning: implicit
>> declaration of function 'init_clk_usdhc' [-Wimplicit-function-declaration]
> 
> is this the right place to fix this warning?
> 
> --- a/arch/arm/include/asm/arch-imx8/clock.h
> +++ b/arch/arm/include/asm/arch-imx8/clock.h
> @@ -23,5 +23,6 @@ enum mxc_clock {
>  };
> 
>  u32 mxc_get_clock(enum mxc_clock clk);
> +void init_clk_usdhc(u32 index);
> 

I think yes, we have the same for imx8m.

> 
>> w+board/advantech/imx8qm_rom7720_a1/spl.c:137:9: warning: implicit
>> declaration of function 'fsl_esdhc_initialize'; did you mean
>> 'eth_initialize'? [-Wimplicit-function-declaration]
> 
> I`ll replace this to fix this warning
> 
> +++ b/board/advantech/imx8qm_rom7720_a1/spl.c
> @@ -8,7 +8,7 @@
>  #include <init.h>
>  #include <log.h>
>  #include <spl.h>
> -#include <fsl_esdhc.h>
> +#include <fsl_esdhc_imx.h>
> 
> Best regards,
> 
> Oliver
> 

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
=====================================================================