diff options
| author | Tom Rini <trini@konsulko.com> | 2024-05-20 10:16:33 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-05-20 10:16:33 -0600 |
| commit | d4781422d1268aa6deca3e49d2fb227e79c160b4 (patch) | |
| tree | 420073c8a29a401a3908803000df6f54673e1731 /drivers/ddr | |
| parent | 85854bc3324edd0c81047780ee60033d056fd490 (diff) | |
| parent | a7f0154c412859323396111dd0c09dbafbc153cb (diff) | |
Merge tag 'v2024.07-rc3' into next
Prepare v2024.07-rc3
Diffstat (limited to 'drivers/ddr')
41 files changed, 41 insertions, 25 deletions
diff --git a/drivers/ddr/altera/sdram_agilex.c b/drivers/ddr/altera/sdram_agilex.c index 7f2cccb6af2..65ecdd022c4 100644 --- a/drivers/ddr/altera/sdram_agilex.c +++ b/drivers/ddr/altera/sdram_agilex.c @@ -4,6 +4,7 @@ * */ +#include <common.h> #include <dm.h> #include <errno.h> #include <div64.h> diff --git a/drivers/ddr/altera/sdram_arria10.c b/drivers/ddr/altera/sdram_arria10.c index bd2af94bb0d..8ef5fa4c481 100644 --- a/drivers/ddr/altera/sdram_arria10.c +++ b/drivers/ddr/altera/sdram_arria10.c @@ -3,6 +3,7 @@ * Copyright (C) 2017 Intel Corporation <www.intel.com> */ +#include <common.h> #include <cpu_func.h> #include <errno.h> #include <fdtdec.h> diff --git a/drivers/ddr/altera/sdram_gen5.c b/drivers/ddr/altera/sdram_gen5.c index 46c53e7c7a3..34d2a2789cc 100644 --- a/drivers/ddr/altera/sdram_gen5.c +++ b/drivers/ddr/altera/sdram_gen5.c @@ -2,6 +2,7 @@ /* * Copyright Altera Corporation (C) 2014-2015 */ +#include <common.h> #include <dm.h> #include <errno.h> #include <div64.h> diff --git a/drivers/ddr/altera/sdram_n5x.c b/drivers/ddr/altera/sdram_n5x.c index db09986f64b..d9039443b91 100644 --- a/drivers/ddr/altera/sdram_n5x.c +++ b/drivers/ddr/altera/sdram_n5x.c @@ -4,6 +4,7 @@ * */ +#include <common.h> #include <clk.h> #include <div64.h> #include <dm.h> diff --git a/drivers/ddr/altera/sdram_s10.c b/drivers/ddr/altera/sdram_s10.c index 4ac4c79e0ac..4d36fb45332 100644 --- a/drivers/ddr/altera/sdram_s10.c +++ b/drivers/ddr/altera/sdram_s10.c @@ -4,6 +4,7 @@ * */ +#include <common.h> #include <cpu_func.h> #include <dm.h> #include <errno.h> diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c index 9e57c2ecfa4..4716abfc9a8 100644 --- a/drivers/ddr/altera/sdram_soc64.c +++ b/drivers/ddr/altera/sdram_soc64.c @@ -4,6 +4,7 @@ * */ +#include <common.h> #include <cpu_func.h> #include <dm.h> #include <errno.h> diff --git a/drivers/ddr/altera/sequencer.c b/drivers/ddr/altera/sequencer.c index 7636e71a0a6..e402f2929ab 100644 --- a/drivers/ddr/altera/sequencer.c +++ b/drivers/ddr/altera/sequencer.c @@ -3,8 +3,8 @@ * Copyright Altera Corporation (C) 2012-2015 */ +#include <common.h> #include <log.h> -#include <linux/string.h> #include <asm/io.h> #include <asm/arch/sdram.h> #include <errno.h> diff --git a/drivers/ddr/altera/sequencer.h b/drivers/ddr/altera/sequencer.h index 618ba00da64..c72a683ffef 100644 --- a/drivers/ddr/altera/sequencer.h +++ b/drivers/ddr/altera/sequencer.h @@ -6,8 +6,6 @@ #ifndef _SEQUENCER_H_ #define _SEQUENCER_H_ -#include <config.h> - #define RW_MGR_NUM_DM_PER_WRITE_GROUP (seq->rwcfg->mem_data_mask_width \ / seq->rwcfg->mem_if_write_dqs_width) #define RW_MGR_NUM_TRUE_DM_PER_WRITE_GROUP ( \ diff --git a/drivers/ddr/fsl/arm_ddr_gen3.c b/drivers/ddr/fsl/arm_ddr_gen3.c index 9f9aea804d9..9dada5e1175 100644 --- a/drivers/ddr/fsl/arm_ddr_gen3.c +++ b/drivers/ddr/fsl/arm_ddr_gen3.c @@ -5,7 +5,7 @@ * Derived from mpc85xx_ddr_gen3.c, removed all workarounds */ -#include <config.h> +#include <common.h> #include <log.h> #include <asm/io.h> #include <fsl_ddr_sdram.h> diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c index 9a25192c079..8f8c2c864c3 100644 --- a/drivers/ddr/fsl/ctrl_regs.c +++ b/drivers/ddr/fsl/ctrl_regs.c @@ -10,13 +10,12 @@ * Author: James Yang [at freescale.com] */ -#include <config.h> +#include <common.h> #include <fsl_ddr_sdram.h> #include <fsl_errata.h> #include <fsl_ddr.h> #include <fsl_immap.h> #include <log.h> -#include <linux/string.h> #include <asm/bitops.h> #include <asm/io.h> #if defined(CONFIG_FSL_LSCH2) || defined(CONFIG_FSL_LSCH3) || \ diff --git a/drivers/ddr/fsl/ddr1_dimm_params.c b/drivers/ddr/fsl/ddr1_dimm_params.c index cc87a95214d..e5481eaa0dd 100644 --- a/drivers/ddr/fsl/ddr1_dimm_params.c +++ b/drivers/ddr/fsl/ddr1_dimm_params.c @@ -3,6 +3,7 @@ * Copyright 2008 Freescale Semiconductor, Inc. */ +#include <common.h> #include <fsl_ddr_sdram.h> #include <log.h> #include <asm/bitops.h> diff --git a/drivers/ddr/fsl/ddr2_dimm_params.c b/drivers/ddr/fsl/ddr2_dimm_params.c index 5674685a191..3b78118a9d8 100644 --- a/drivers/ddr/fsl/ddr2_dimm_params.c +++ b/drivers/ddr/fsl/ddr2_dimm_params.c @@ -3,9 +3,9 @@ * Copyright 2008 Freescale Semiconductor, Inc. */ +#include <common.h> #include <fsl_ddr_sdram.h> #include <log.h> -#include <linux/string.h> #include <asm/bitops.h> #include <fsl_ddr.h> diff --git a/drivers/ddr/fsl/ddr3_dimm_params.c b/drivers/ddr/fsl/ddr3_dimm_params.c index c30ecdaafaf..1f8db90c45b 100644 --- a/drivers/ddr/fsl/ddr3_dimm_params.c +++ b/drivers/ddr/fsl/ddr3_dimm_params.c @@ -8,7 +8,7 @@ * JEDEC standard No.21-C 4_01_02_11R18.pdf */ -#include <linux/string.h> +#include <common.h> #include <fsl_ddr_sdram.h> #include <log.h> diff --git a/drivers/ddr/fsl/ddr4_dimm_params.c b/drivers/ddr/fsl/ddr4_dimm_params.c index 75e3bfe08be..ea791622628 100644 --- a/drivers/ddr/fsl/ddr4_dimm_params.c +++ b/drivers/ddr/fsl/ddr4_dimm_params.c @@ -10,10 +10,10 @@ * */ +#include <common.h> #include <fsl_ddr_sdram.h> #include <log.h> #include <linux/bug.h> -#include <linux/string.h> #include <fsl_ddr.h> diff --git a/drivers/ddr/fsl/fsl_ddr_gen4.c b/drivers/ddr/fsl/fsl_ddr_gen4.c index 31c58d9a8e3..f8d1468a26f 100644 --- a/drivers/ddr/fsl/fsl_ddr_gen4.c +++ b/drivers/ddr/fsl/fsl_ddr_gen4.c @@ -4,7 +4,7 @@ * Copyright 2021 NXP */ -#include <config.h> +#include <common.h> #include <env.h> #include <log.h> #include <asm/io.h> diff --git a/drivers/ddr/fsl/fsl_mmdc.c b/drivers/ddr/fsl/fsl_mmdc.c index 7812b1b01ca..28f2219b2a4 100644 --- a/drivers/ddr/fsl/fsl_mmdc.c +++ b/drivers/ddr/fsl/fsl_mmdc.c @@ -7,7 +7,7 @@ * Generic driver for Freescale MMDC(Multi Mode DDR Controller). */ -#include <config.h> +#include <common.h> #include <fsl_mmdc.h> #include <asm/io.h> #include <linux/delay.h> diff --git a/drivers/ddr/fsl/interactive.c b/drivers/ddr/fsl/interactive.c index 94a5e447d56..eb2f06e8300 100644 --- a/drivers/ddr/fsl/interactive.c +++ b/drivers/ddr/fsl/interactive.c @@ -11,11 +11,11 @@ * York Sun [at freescale.com] */ +#include <common.h> #include <cli.h> #include <command.h> #include <env.h> #include <log.h> -#include <vsprintf.h> #include <asm/bitops.h> #include <linux/ctype.h> #include <asm/types.h> diff --git a/drivers/ddr/fsl/lc_common_dimm_params.c b/drivers/ddr/fsl/lc_common_dimm_params.c index aaf9800b372..5e4ad56f071 100644 --- a/drivers/ddr/fsl/lc_common_dimm_params.c +++ b/drivers/ddr/fsl/lc_common_dimm_params.c @@ -4,6 +4,7 @@ * Copyright 2017-2021 NXP Semiconductor */ +#include <common.h> #include <fsl_ddr_sdram.h> #include <log.h> #include <asm/bitops.h> diff --git a/drivers/ddr/fsl/main.c b/drivers/ddr/fsl/main.c index 31091bb4495..cd332718b64 100644 --- a/drivers/ddr/fsl/main.c +++ b/drivers/ddr/fsl/main.c @@ -10,7 +10,7 @@ * Author: James Yang [at freescale.com] */ -#include <config.h> +#include <common.h> #include <display_options.h> #include <dm.h> #include <i2c.h> diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c index a8520754006..16186bdbae7 100644 --- a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c +++ b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c @@ -3,7 +3,7 @@ * Copyright 2008 Freescale Semiconductor, Inc. */ -#include <config.h> +#include <common.h> #include <log.h> #include <asm/io.h> #include <fsl_ddr_sdram.h> diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen2.c b/drivers/ddr/fsl/mpc85xx_ddr_gen2.c index 00b4b376dd4..b830e7cbd14 100644 --- a/drivers/ddr/fsl/mpc85xx_ddr_gen2.c +++ b/drivers/ddr/fsl/mpc85xx_ddr_gen2.c @@ -3,9 +3,9 @@ * Copyright 2008-2011 Freescale Semiconductor, Inc. */ -#include <config.h> +#include <common.h> #include <asm/io.h> -#include <asm/ppc.h> +#include <asm/processor.h> #include <fsl_ddr_sdram.h> #include <linux/delay.h> diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c index b0a61fa2b41..1c4a1cae4df 100644 --- a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c +++ b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c @@ -3,10 +3,9 @@ * Copyright 2008-2020 Freescale Semiconductor, Inc. */ -#include <config.h> +#include <common.h> #include <log.h> #include <asm/io.h> -#include <asm/ppc.h> #include <fsl_ddr_sdram.h> #include <asm/processor.h> #include <linux/delay.h> diff --git a/drivers/ddr/fsl/options.c b/drivers/ddr/fsl/options.c index 852a5d0eca4..7cff8234584 100644 --- a/drivers/ddr/fsl/options.c +++ b/drivers/ddr/fsl/options.c @@ -4,19 +4,16 @@ * Copyright 2017-2018 NXP Semiconductor */ -#include <config.h> +#include <common.h> #include <env.h> #include <hwconfig.h> #include <fsl_ddr_sdram.h> #include <log.h> -#include <vsprintf.h> #include <fsl_ddr.h> #if defined(CONFIG_FSL_LSCH2) || defined(CONFIG_FSL_LSCH3) || \ defined(CONFIG_ARM) #include <asm/arch/clock.h> -#else -#include <asm/ppc.h> #endif /* diff --git a/drivers/ddr/fsl/util.c b/drivers/ddr/fsl/util.c index 0a73170e418..60051392e71 100644 --- a/drivers/ddr/fsl/util.c +++ b/drivers/ddr/fsl/util.c @@ -4,10 +4,9 @@ * Copyright 2021 NXP */ -#include <config.h> +#include <common.h> #ifdef CONFIG_PPC #include <asm/fsl_law.h> -#include <asm/ppc.h> #endif #include <div64.h> #include <linux/delay.h> diff --git a/drivers/ddr/imx/imx8m/ddr_init.c b/drivers/ddr/imx/imx8m/ddr_init.c index e9209ce8b61..52a4aa63230 100644 --- a/drivers/ddr/imx/imx8m/ddr_init.c +++ b/drivers/ddr/imx/imx8m/ddr_init.c @@ -3,6 +3,7 @@ * Copyright 2018-2019 NXP */ +#include <common.h> #include <errno.h> #include <log.h> #include <asm/io.h> diff --git a/drivers/ddr/imx/imx8ulp/ddr_init.c b/drivers/ddr/imx/imx8ulp/ddr_init.c index 172e260a55d..c362a2da338 100644 --- a/drivers/ddr/imx/imx8ulp/ddr_init.c +++ b/drivers/ddr/imx/imx8ulp/ddr_init.c @@ -2,6 +2,7 @@ /* * Copyright 2021 NXP */ +#include <common.h> #include <asm/io.h> #include <asm/arch/clock.h> #include <asm/arch/ddr.h> diff --git a/drivers/ddr/imx/imx9/ddr_init.c b/drivers/ddr/imx/imx9/ddr_init.c index 5b0ad773875..7a333880e6b 100644 --- a/drivers/ddr/imx/imx9/ddr_init.c +++ b/drivers/ddr/imx/imx9/ddr_init.c @@ -3,6 +3,7 @@ * Copyright 2022 NXP */ +#include <common.h> #include <errno.h> #include <log.h> #include <asm/io.h> @@ -10,7 +11,6 @@ #include <asm/arch/clock.h> #include <asm/arch/sys_proto.h> #include <linux/delay.h> -#include <linux/string.h> static unsigned int g_cdd_rr_max[4]; static unsigned int g_cdd_rw_max[4]; diff --git a/drivers/ddr/imx/phy/ddrphy_train.c b/drivers/ddr/imx/phy/ddrphy_train.c index ccc10df1845..cd905f952c6 100644 --- a/drivers/ddr/imx/phy/ddrphy_train.c +++ b/drivers/ddr/imx/phy/ddrphy_train.c @@ -3,6 +3,7 @@ * Copyright 2018 NXP */ +#include <common.h> #include <log.h> #include <linux/kernel.h> #include <asm/arch/ddr.h> diff --git a/drivers/ddr/imx/phy/ddrphy_utils.c b/drivers/ddr/imx/phy/ddrphy_utils.c index cf5bdad7abe..45e1a70dbd4 100644 --- a/drivers/ddr/imx/phy/ddrphy_utils.c +++ b/drivers/ddr/imx/phy/ddrphy_utils.c @@ -3,6 +3,7 @@ * Copyright 2018 NXP */ +#include <common.h> #include <errno.h> #include <log.h> #include <asm/io.h> diff --git a/drivers/ddr/imx/phy/helper.c b/drivers/ddr/imx/phy/helper.c index c1fc800f191..b9b2403012d 100644 --- a/drivers/ddr/imx/phy/helper.c +++ b/drivers/ddr/imx/phy/helper.c @@ -3,6 +3,7 @@ * Copyright 2018 NXP */ +#include <common.h> #include <binman_sym.h> #include <log.h> #include <spl.h> diff --git a/drivers/ddr/marvell/axp/ddr3_dfs.c b/drivers/ddr/marvell/axp/ddr3_dfs.c index 985835ec923..2a4596680b1 100644 --- a/drivers/ddr/marvell/axp/ddr3_dfs.c +++ b/drivers/ddr/marvell/axp/ddr3_dfs.c @@ -3,6 +3,7 @@ * Copyright (C) Marvell International Ltd. and its affiliates */ +#include <common.h> #include <i2c.h> #include <spl.h> #include <asm/io.h> diff --git a/drivers/ddr/marvell/axp/ddr3_dqs.c b/drivers/ddr/marvell/axp/ddr3_dqs.c index bda0d7ec473..0db94212b90 100644 --- a/drivers/ddr/marvell/axp/ddr3_dqs.c +++ b/drivers/ddr/marvell/axp/ddr3_dqs.c @@ -3,6 +3,7 @@ * Copyright (C) Marvell International Ltd. and its affiliates */ +#include <common.h> #include <i2c.h> #include <log.h> #include <spl.h> diff --git a/drivers/ddr/marvell/axp/ddr3_hw_training.c b/drivers/ddr/marvell/axp/ddr3_hw_training.c index bb3e1be1f4c..35d98faf58f 100644 --- a/drivers/ddr/marvell/axp/ddr3_hw_training.c +++ b/drivers/ddr/marvell/axp/ddr3_hw_training.c @@ -3,6 +3,7 @@ * Copyright (C) Marvell International Ltd. and its affiliates */ +#include <common.h> #include <i2c.h> #include <log.h> #include <spl.h> diff --git a/drivers/ddr/marvell/axp/ddr3_init.c b/drivers/ddr/marvell/axp/ddr3_init.c index 23c6d119f61..a9dcb74cecb 100644 --- a/drivers/ddr/marvell/axp/ddr3_init.c +++ b/drivers/ddr/marvell/axp/ddr3_init.c @@ -3,6 +3,7 @@ * Copyright (C) Marvell International Ltd. and its affiliates */ +#include <common.h> #include <i2c.h> #include <log.h> #include <spl.h> diff --git a/drivers/ddr/marvell/axp/ddr3_pbs.c b/drivers/ddr/marvell/axp/ddr3_pbs.c index 2322900185d..069a42fbf5e 100644 --- a/drivers/ddr/marvell/axp/ddr3_pbs.c +++ b/drivers/ddr/marvell/axp/ddr3_pbs.c @@ -3,6 +3,7 @@ * Copyright (C) Marvell International Ltd. and its affiliates */ +#include <common.h> #include <i2c.h> #include <spl.h> #include <asm/io.h> diff --git a/drivers/ddr/marvell/axp/ddr3_read_leveling.c b/drivers/ddr/marvell/axp/ddr3_read_leveling.c index db7003f72ca..30a5c354885 100644 --- a/drivers/ddr/marvell/axp/ddr3_read_leveling.c +++ b/drivers/ddr/marvell/axp/ddr3_read_leveling.c @@ -3,6 +3,7 @@ * Copyright (C) Marvell International Ltd. and its affiliates */ +#include <common.h> #include <i2c.h> #include <log.h> #include <spl.h> diff --git a/drivers/ddr/marvell/axp/ddr3_sdram.c b/drivers/ddr/marvell/axp/ddr3_sdram.c index f8fee2623d0..0b150b20f3a 100644 --- a/drivers/ddr/marvell/axp/ddr3_sdram.c +++ b/drivers/ddr/marvell/axp/ddr3_sdram.c @@ -3,6 +3,7 @@ * Copyright (C) Marvell International Ltd. and its affiliates */ +#include <common.h> #include <i2c.h> #include <spl.h> #include <asm/io.h> diff --git a/drivers/ddr/marvell/axp/ddr3_spd.c b/drivers/ddr/marvell/axp/ddr3_spd.c index c169a8ea16b..4763403c127 100644 --- a/drivers/ddr/marvell/axp/ddr3_spd.c +++ b/drivers/ddr/marvell/axp/ddr3_spd.c @@ -3,6 +3,7 @@ * Copyright (C) Marvell International Ltd. and its affiliates */ +#include <common.h> #include <i2c.h> #include <spl.h> #include <asm/io.h> diff --git a/drivers/ddr/marvell/axp/ddr3_write_leveling.c b/drivers/ddr/marvell/axp/ddr3_write_leveling.c index ea7bac56d0e..d4add447774 100644 --- a/drivers/ddr/marvell/axp/ddr3_write_leveling.c +++ b/drivers/ddr/marvell/axp/ddr3_write_leveling.c @@ -3,6 +3,7 @@ * Copyright (C) Marvell International Ltd. and its affiliates */ +#include <common.h> #include <i2c.h> #include <log.h> #include <spl.h> diff --git a/drivers/ddr/marvell/axp/xor.c b/drivers/ddr/marvell/axp/xor.c index 6ecacfeb933..76aea96682c 100644 --- a/drivers/ddr/marvell/axp/xor.c +++ b/drivers/ddr/marvell/axp/xor.c @@ -3,6 +3,7 @@ * Copyright (C) Marvell International Ltd. and its affiliates */ +#include <common.h> #include <i2c.h> #include <log.h> #include <spl.h> diff --git a/drivers/ddr/microchip/ddr2.c b/drivers/ddr/microchip/ddr2.c index bfba5d245c6..149b6071cfd 100644 --- a/drivers/ddr/microchip/ddr2.c +++ b/drivers/ddr/microchip/ddr2.c @@ -3,6 +3,7 @@ * (c) 2015 Paul Thacker <paul.thacker@microchip.com> * */ +#include <common.h> #include <wait_bit.h> #include <linux/kernel.h> #include <linux/bitops.h> |