* [PATCH v1 1/2] imx: imx8qm_rom7720: added missing USDHC Base address defines
@ 2019-12-19 14:25 Oliver Graute
2019-12-19 14:27 ` [PATCH v1 2/2] imx: imx8qm_rom7720_a1: fix broken fsl_esdhc_imx conversion Oliver Graute
2019-12-19 14:53 ` [PATCH v1 1/2] imx: imx8qm_rom7720: added missing USDHC Base address defines Fabio Estevam
0 siblings, 2 replies; 7+ messages in thread
From: Oliver Graute @ 2019-12-19 14:25 UTC (permalink / raw)
To: u-boot
Added missing USDHC Base address defines
Signed-off-by: Oliver Graute <oliver.graute@kococonnector.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Ye Li <ye.li@nxp.com>
Cc: uboot-imx <uboot-imx@nxp.com>
---
include/configs/imx8qm_rom7720.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h
index 865863eb7c..8e1427da8a 100644
--- a/include/configs/imx8qm_rom7720.h
+++ b/include/configs/imx8qm_rom7720.h
@@ -18,6 +18,10 @@
#define CONFIG_FSL_USDHC
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
+#define USDHC1_BASE_ADDR 0x5B010000
+#define USDHC2_BASE_ADDR 0x5B020000
+#define USDHC3_BASE_ADDR 0x5B030000
+
#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
#define CONFIG_ENV_OVERWRITE
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v1 2/2] imx: imx8qm_rom7720_a1: fix broken fsl_esdhc_imx conversion
2019-12-19 14:25 [PATCH v1 1/2] imx: imx8qm_rom7720: added missing USDHC Base address defines Oliver Graute
@ 2019-12-19 14:27 ` Oliver Graute
2019-12-19 14:54 ` Fabio Estevam
2020-03-10 9:57 ` Stefano Babic
2019-12-19 14:53 ` [PATCH v1 1/2] imx: imx8qm_rom7720: added missing USDHC Base address defines Fabio Estevam
1 sibling, 2 replies; 7+ messages in thread
From: Oliver Graute @ 2019-12-19 14:27 UTC (permalink / raw)
To: u-boot
Fix broken fsl_esdhc_imx conversion
Signed-off-by: Oliver Graute <oliver.graute@kococonnector.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Ye Li <ye.li@nxp.com>
Cc: uboot-imx <uboot-imx@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)
{
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v1 1/2] imx: imx8qm_rom7720: added missing USDHC Base address defines
2019-12-19 14:25 [PATCH v1 1/2] imx: imx8qm_rom7720: added missing USDHC Base address defines Oliver Graute
2019-12-19 14:27 ` [PATCH v1 2/2] imx: imx8qm_rom7720_a1: fix broken fsl_esdhc_imx conversion Oliver Graute
@ 2019-12-19 14:53 ` Fabio Estevam
1 sibling, 0 replies; 7+ messages in thread
From: Fabio Estevam @ 2019-12-19 14:53 UTC (permalink / raw)
To: u-boot
Hi Oliver,
On Thu, Dec 19, 2019 at 11:25 AM Oliver Graute
<oliver.graute@kococonnector.com> wrote:
> +#define USDHC1_BASE_ADDR 0x5B010000
> +#define USDHC2_BASE_ADDR 0x5B020000
> +#define USDHC3_BASE_ADDR 0x5B030000
These defines would be better placed in a common SoC header file
instead of in the board file.
It is OK for now to do like this and we can do a cleanup later:
Reviewed-by: Fabio Estevam <festevam@gmail.com>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v1 2/2] imx: imx8qm_rom7720_a1: fix broken fsl_esdhc_imx conversion
2019-12-19 14:27 ` [PATCH v1 2/2] imx: imx8qm_rom7720_a1: fix broken fsl_esdhc_imx conversion Oliver Graute
@ 2019-12-19 14:54 ` Fabio Estevam
2020-03-10 9:57 ` Stefano Babic
1 sibling, 0 replies; 7+ messages in thread
From: Fabio Estevam @ 2019-12-19 14:54 UTC (permalink / raw)
To: u-boot
On Thu, Dec 19, 2019 at 11:27 AM Oliver Graute
<oliver.graute@kococonnector.com> wrote:
>
> Fix broken fsl_esdhc_imx conversion
>
> Signed-off-by: Oliver Graute <oliver.graute@kococonnector.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v1 2/2] imx: imx8qm_rom7720_a1: fix broken fsl_esdhc_imx conversion
2019-12-19 14:27 ` [PATCH v1 2/2] imx: imx8qm_rom7720_a1: fix broken fsl_esdhc_imx conversion Oliver Graute
2019-12-19 14:54 ` Fabio Estevam
@ 2020-03-10 9:57 ` Stefano Babic
2020-11-20 13:13 ` Oliver Graute
1 sibling, 1 reply; 7+ messages in thread
From: Stefano Babic @ 2020-03-10 9:57 UTC (permalink / raw)
To: u-boot
On 19.12.19 15:27, Oliver Graute wrote:
> Fix broken fsl_esdhc_imx conversion
>
> Signed-off-by: Oliver Graute <oliver.graute@kococonnector.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Fabio Estevam <festevam@gmail.com>
> Cc: Peng Fan <peng.fan@nxp.com>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Ye Li <ye.li@nxp.com>
> Cc: uboot-imx <uboot-imx@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]
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]
Can you check and repost ? Thanks !
Best regards,
Stefano Babic
--
=====================================================================
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
=====================================================================
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v1 2/2] imx: imx8qm_rom7720_a1: fix broken fsl_esdhc_imx conversion
2020-03-10 9:57 ` Stefano Babic
@ 2020-11-20 13:13 ` Oliver Graute
2020-12-06 13:47 ` Stefano Babic
0 siblings, 1 reply; 7+ messages in thread
From: Oliver Graute @ 2020-11-20 13:13 UTC (permalink / raw)
To: u-boot
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@kococonnector.com>
> > Cc: Stefano Babic <sbabic@denx.de>
> > Cc: Fabio Estevam <festevam@gmail.com>
> > Cc: Peng Fan <peng.fan@nxp.com>
> > Cc: Simon Glass <sjg@chromium.org>
> > Cc: Ye Li <ye.li@nxp.com>
> > Cc: uboot-imx <uboot-imx@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);
> 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
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v1 2/2] imx: imx8qm_rom7720_a1: fix broken fsl_esdhc_imx conversion
2020-11-20 13:13 ` Oliver Graute
@ 2020-12-06 13:47 ` Stefano Babic
0 siblings, 0 replies; 7+ messages in thread
From: Stefano Babic @ 2020-12-06 13:47 UTC (permalink / raw)
To: u-boot
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@kococonnector.com>
>>> Cc: Stefano Babic <sbabic@denx.de>
>>> Cc: Fabio Estevam <festevam@gmail.com>
>>> Cc: Peng Fan <peng.fan@nxp.com>
>>> Cc: Simon Glass <sjg@chromium.org>
>>> Cc: Ye Li <ye.li@nxp.com>
>>> Cc: uboot-imx <uboot-imx@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
=====================================================================
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-12-06 13:47 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-19 14:25 [PATCH v1 1/2] imx: imx8qm_rom7720: added missing USDHC Base address defines Oliver Graute
2019-12-19 14:27 ` [PATCH v1 2/2] imx: imx8qm_rom7720_a1: fix broken fsl_esdhc_imx conversion Oliver Graute
2019-12-19 14:54 ` Fabio Estevam
2020-03-10 9:57 ` Stefano Babic
2020-11-20 13:13 ` Oliver Graute
2020-12-06 13:47 ` Stefano Babic
2019-12-19 14:53 ` [PATCH v1 1/2] imx: imx8qm_rom7720: added missing USDHC Base address defines Fabio Estevam
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.