diff options
| author | Tom Rini <trini@konsulko.com> | 2021-02-15 08:19:40 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-15 10:16:45 -0500 |
| commit | 2ae80437fbe0181184ae4b188b89629b902702c6 (patch) | |
| tree | 846f70a5df9c80ef76284c39f0da58b8c3eba96f /drivers/mtd/nand | |
| parent | 76b7936e6f781c86b0d3159f67f1506d01c196ce (diff) | |
| parent | 401d1c4f5d2d29c4bc4beaec95402ca23eb63295 (diff) | |
Merge branch '2021-02-02-drop-asm_global_data-when-unused'
- Merge the patch to take <asm/global_data.h> out of <common.h>
Diffstat (limited to 'drivers/mtd/nand')
| -rw-r--r-- | drivers/mtd/nand/raw/nand_base.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/nand/raw/octeontx_nand.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/nand/raw/pxa3xx_nand.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/nand/raw/sunxi_nand.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/nand/raw/tegra_nand.c | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index 698968bc116..6557faddf94 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -4574,6 +4574,7 @@ ident_done: EXPORT_SYMBOL(nand_get_flash_type); #if CONFIG_IS_ENABLED(OF_CONTROL) +#include <asm/global_data.h> DECLARE_GLOBAL_DATA_PTR; static int nand_dt_init(struct mtd_info *mtd, struct nand_chip *chip, int node) diff --git a/drivers/mtd/nand/raw/octeontx_nand.c b/drivers/mtd/nand/raw/octeontx_nand.c index 9997135ef93..e0ccc7b0d90 100644 --- a/drivers/mtd/nand/raw/octeontx_nand.c +++ b/drivers/mtd/nand/raw/octeontx_nand.c @@ -23,6 +23,7 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/nand_bch.h> #include <linux/mtd/nand_ecc.h> +#include <asm/global_data.h> #include <asm/io.h> #include <asm/types.h> #include <asm/dma-mapping.h> diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.c b/drivers/mtd/nand/raw/pxa3xx_nand.c index f6233756d85..8ff58a70387 100644 --- a/drivers/mtd/nand/raw/pxa3xx_nand.c +++ b/drivers/mtd/nand/raw/pxa3xx_nand.c @@ -10,6 +10,7 @@ #include <malloc.h> #include <fdtdec.h> #include <nand.h> +#include <asm/global_data.h> #include <dm/device_compat.h> #include <dm/devres.h> #include <linux/bitops.h> diff --git a/drivers/mtd/nand/raw/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c index 12fc065b320..7bc6ec7beea 100644 --- a/drivers/mtd/nand/raw/sunxi_nand.c +++ b/drivers/mtd/nand/raw/sunxi_nand.c @@ -29,6 +29,7 @@ #include <malloc.h> #include <memalign.h> #include <nand.h> +#include <asm/global_data.h> #include <dm/device_compat.h> #include <dm/devres.h> #include <linux/bitops.h> diff --git a/drivers/mtd/nand/raw/tegra_nand.c b/drivers/mtd/nand/raw/tegra_nand.c index a530127cb77..6310253efa6 100644 --- a/drivers/mtd/nand/raw/tegra_nand.c +++ b/drivers/mtd/nand/raw/tegra_nand.c @@ -8,6 +8,7 @@ #include <common.h> #include <log.h> +#include <asm/global_data.h> #include <asm/io.h> #include <memalign.h> #include <nand.h> |