diff options
Diffstat (limited to 'drivers/ddr/fsl')
| -rw-r--r-- | drivers/ddr/fsl/arm_ddr_gen3.c | 2 | ||||
| -rw-r--r-- | drivers/ddr/fsl/ctrl_regs.c | 3 | ||||
| -rw-r--r-- | drivers/ddr/fsl/ddr1_dimm_params.c | 1 | ||||
| -rw-r--r-- | drivers/ddr/fsl/ddr2_dimm_params.c | 2 | ||||
| -rw-r--r-- | drivers/ddr/fsl/ddr3_dimm_params.c | 2 | ||||
| -rw-r--r-- | drivers/ddr/fsl/ddr4_dimm_params.c | 2 | ||||
| -rw-r--r-- | drivers/ddr/fsl/fsl_ddr_gen4.c | 2 | ||||
| -rw-r--r-- | drivers/ddr/fsl/fsl_mmdc.c | 2 | ||||
| -rw-r--r-- | drivers/ddr/fsl/interactive.c | 2 | ||||
| -rw-r--r-- | drivers/ddr/fsl/lc_common_dimm_params.c | 1 | ||||
| -rw-r--r-- | drivers/ddr/fsl/main.c | 2 | ||||
| -rw-r--r-- | drivers/ddr/fsl/mpc85xx_ddr_gen1.c | 2 | ||||
| -rw-r--r-- | drivers/ddr/fsl/mpc85xx_ddr_gen2.c | 4 | ||||
| -rw-r--r-- | drivers/ddr/fsl/mpc85xx_ddr_gen3.c | 3 | ||||
| -rw-r--r-- | drivers/ddr/fsl/options.c | 5 | ||||
| -rw-r--r-- | drivers/ddr/fsl/util.c | 3 |
16 files changed, 21 insertions, 17 deletions
diff --git a/drivers/ddr/fsl/arm_ddr_gen3.c b/drivers/ddr/fsl/arm_ddr_gen3.c index 9dada5e1175..9f9aea804d9 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 <common.h> +#include <config.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 8f8c2c864c3..9a25192c079 100644 --- a/drivers/ddr/fsl/ctrl_regs.c +++ b/drivers/ddr/fsl/ctrl_regs.c @@ -10,12 +10,13 @@ * Author: James Yang [at freescale.com] */ -#include <common.h> +#include <config.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 e5481eaa0dd..cc87a95214d 100644 --- a/drivers/ddr/fsl/ddr1_dimm_params.c +++ b/drivers/ddr/fsl/ddr1_dimm_params.c @@ -3,7 +3,6 @@ * 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 3b78118a9d8..5674685a191 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 1f8db90c45b..c30ecdaafaf 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 <common.h> +#include <linux/string.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 ea791622628..75e3bfe08be 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 f8d1468a26f..31c58d9a8e3 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 <common.h> +#include <config.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 28f2219b2a4..7812b1b01ca 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 <common.h> +#include <config.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 eb2f06e8300..94a5e447d56 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 5e4ad56f071..aaf9800b372 100644 --- a/drivers/ddr/fsl/lc_common_dimm_params.c +++ b/drivers/ddr/fsl/lc_common_dimm_params.c @@ -4,7 +4,6 @@ * 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 cd332718b64..31091bb4495 100644 --- a/drivers/ddr/fsl/main.c +++ b/drivers/ddr/fsl/main.c @@ -10,7 +10,7 @@ * Author: James Yang [at freescale.com] */ -#include <common.h> +#include <config.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 16186bdbae7..a8520754006 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 <common.h> +#include <config.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 b830e7cbd14..00b4b376dd4 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 <common.h> +#include <config.h> #include <asm/io.h> -#include <asm/processor.h> +#include <asm/ppc.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 1c4a1cae4df..b0a61fa2b41 100644 --- a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c +++ b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c @@ -3,9 +3,10 @@ * Copyright 2008-2020 Freescale Semiconductor, Inc. */ -#include <common.h> +#include <config.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 7cff8234584..852a5d0eca4 100644 --- a/drivers/ddr/fsl/options.c +++ b/drivers/ddr/fsl/options.c @@ -4,16 +4,19 @@ * Copyright 2017-2018 NXP Semiconductor */ -#include <common.h> +#include <config.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 60051392e71..0a73170e418 100644 --- a/drivers/ddr/fsl/util.c +++ b/drivers/ddr/fsl/util.c @@ -4,9 +4,10 @@ * Copyright 2021 NXP */ -#include <common.h> +#include <config.h> #ifdef CONFIG_PPC #include <asm/fsl_law.h> +#include <asm/ppc.h> #endif #include <div64.h> #include <linux/delay.h> |