diff options
| author | Tom Rini <trini@konsulko.com> | 2024-05-18 20:20:43 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-05-19 08:16:36 -0600 |
| commit | d678a59d2d719da9e807495b4b021501f2836ca5 (patch) | |
| tree | 313e5c32e3d02d3cf1904875b1655140973126e9 /drivers/ddr/altera | |
| parent | 3be9f399e911cfc437a37ac826441f1d96da1c9b (diff) | |
Revert "Merge patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet""
When bringing in the series 'arm: dts: am62-beagleplay: Fix Beagleplay
Ethernet"' I failed to notice that b4 noticed it was based on next and
so took that as the base commit and merged that part of next to master.
This reverts commit c8ffd1356d42223cbb8c86280a083cc3c93e6426, reversing
changes made to 2ee6f3a5f7550de3599faef9704e166e5dcace35.
Reported-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/ddr/altera')
| -rw-r--r-- | drivers/ddr/altera/sdram_agilex.c | 1 | ||||
| -rw-r--r-- | drivers/ddr/altera/sdram_arria10.c | 1 | ||||
| -rw-r--r-- | drivers/ddr/altera/sdram_gen5.c | 1 | ||||
| -rw-r--r-- | drivers/ddr/altera/sdram_n5x.c | 1 | ||||
| -rw-r--r-- | drivers/ddr/altera/sdram_s10.c | 1 | ||||
| -rw-r--r-- | drivers/ddr/altera/sdram_soc64.c | 1 | ||||
| -rw-r--r-- | drivers/ddr/altera/sequencer.c | 2 | ||||
| -rw-r--r-- | drivers/ddr/altera/sequencer.h | 2 |
8 files changed, 7 insertions, 3 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 ( \ |