[PATCH 1/4] ARM: imx8m: allow ddr_get_firmware to be called from other units

[PATCH 1/4] ARM: imx8m: allow ddr_get_firmware to be called from other units

[Lucas Stach]

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 include/soc/imx8m/ddr.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/soc/imx8m/ddr.h b/include/soc/imx8m/ddr.h
index 2149ae432554..0b3c4d47e39d 100644
--- a/include/soc/imx8m/ddr.h
+++ b/include/soc/imx8m/ddr.h
@@ -389,7 +389,7 @@ extern struct dram_timing_info dram_timing;
 void ddr_get_firmware_lpddr4(void);
 void ddr_get_firmware_ddr(void);
 
-static void ddr_get_firmware(enum dram_type dram_type)
+static inline void ddr_get_firmware(enum dram_type dram_type)
 {
 	if (dram_type == DRAM_TYPE_LPDDR4)
 		ddr_get_firmware_lpddr4();
-- 
2.38.1

[PATCH 2/4] ARM: nxp-imx8mq-evk: include DDR firmware in image

[Lucas Stach]

This board uses the legacy DRAM initialization and doesn't call
imx8mq_ddr_init(), so there is no point where the DRAM firmware is
referenced from the image. Fix this by calling ddr_get_firmware()
from the legacy DRAM init.

Fixes: e770d18108de ("ARM: i.MX8M: include only necessary ddrphy firmwares in image")
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/boards/nxp-imx8mq-evk/ddrphy_train.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/boards/nxp-imx8mq-evk/ddrphy_train.c b/arch/arm/boards/nxp-imx8mq-evk/ddrphy_train.c
index d2c73fc7ce22..e8577369dc8b 100644
--- a/arch/arm/boards/nxp-imx8mq-evk/ddrphy_train.c
+++ b/arch/arm/boards/nxp-imx8mq-evk/ddrphy_train.c
@@ -11,6 +11,8 @@
 void ddr_cfg_phy(void) {
 	unsigned int tmp, tmp_t;
 
+	ddr_get_firmware(DRAM_TYPE_LPDDR4);
+
 	//Init DDRPHY register...
 	reg32_write(0x3c080440,0x2);
 	reg32_write(0x3c080444,0x3);
-- 
2.38.1

[PATCH 3/4] ARM: zii-imx8mq-dev: include DDR firmware in image

[Lucas Stach]

This board uses the legacy DRAM initialization and doesn't call
imx8mq_ddr_init(), so there is no point where the DRAM firmware is
referenced from the image. Fix this by calling ddr_get_firmware()
from the legacy DRAM init.

Fixes: e770d18108de ("ARM: i.MX8M: include only necessary ddrphy firmwares in image")
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/boards/zii-imx8mq-dev/ddrphy_train.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/boards/zii-imx8mq-dev/ddrphy_train.c b/arch/arm/boards/zii-imx8mq-dev/ddrphy_train.c
index d2c73fc7ce22..e8577369dc8b 100644
--- a/arch/arm/boards/zii-imx8mq-dev/ddrphy_train.c
+++ b/arch/arm/boards/zii-imx8mq-dev/ddrphy_train.c
@@ -11,6 +11,8 @@
 void ddr_cfg_phy(void) {
 	unsigned int tmp, tmp_t;
 
+	ddr_get_firmware(DRAM_TYPE_LPDDR4);
+
 	//Init DDRPHY register...
 	reg32_write(0x3c080440,0x2);
 	reg32_write(0x3c080444,0x3);
-- 
2.38.1

[PATCH 4/4] ARM: phytec-som-imx8mq: include DDR firmware in image

[Lucas Stach]

This board uses the legacy DRAM initialization and doesn't call
imx8mq_ddr_init(), so there is no point where the DRAM firmware is
referenced from the image. Fix this by calling ddr_get_firmware()
from the legacy DRAM init.

Fixes: e770d18108de ("ARM: i.MX8M: include only necessary ddrphy firmwares in image")
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/boards/phytec-som-imx8mq/ddrphy_train.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/boards/phytec-som-imx8mq/ddrphy_train.c b/arch/arm/boards/phytec-som-imx8mq/ddrphy_train.c
index 2c84a0f5fd5a..2ed6578093af 100644
--- a/arch/arm/boards/phytec-som-imx8mq/ddrphy_train.c
+++ b/arch/arm/boards/phytec-som-imx8mq/ddrphy_train.c
@@ -12,6 +12,8 @@
 void ddr_cfg_phy(void) {
 	unsigned int tmp, tmp_t;
 
+	ddr_get_firmware(DRAM_TYPE_LPDDR4);
+
 	//Init DDRPHY register...
 	reg32_write(0x3c080440,0x2);
 	reg32_write(0x3c080444,0x3);
-- 
2.38.1

Re: [PATCH 1/4] ARM: imx8m: allow ddr_get_firmware to be called from other units

[Sascha Hauer]

On Wed, Dec 07, 2022 at 11:09:21PM +0100, Lucas Stach wrote:
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  include/soc/imx8m/ddr.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks

Sascha

> 
> diff --git a/include/soc/imx8m/ddr.h b/include/soc/imx8m/ddr.h
> index 2149ae432554..0b3c4d47e39d 100644
> --- a/include/soc/imx8m/ddr.h
> +++ b/include/soc/imx8m/ddr.h
> @@ -389,7 +389,7 @@ extern struct dram_timing_info dram_timing;
>  void ddr_get_firmware_lpddr4(void);
>  void ddr_get_firmware_ddr(void);
>  
> -static void ddr_get_firmware(enum dram_type dram_type)
> +static inline void ddr_get_firmware(enum dram_type dram_type)
>  {
>  	if (dram_type == DRAM_TYPE_LPDDR4)
>  		ddr_get_firmware_lpddr4();
> -- 
> 2.38.1
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |