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 | |
| 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')
| -rw-r--r-- | drivers/mtd/altera_qspi.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/cfi_flash.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/mtd_uboot.c | 1 | ||||
| -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 | ||||
| -rw-r--r-- | drivers/mtd/pic32_flash.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/renesas_rpc_hf.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/spi/sf-uclass.c | 1 |
11 files changed, 11 insertions, 0 deletions
diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c index 0011811250b..7bac599a54a 100644 --- a/drivers/mtd/altera_qspi.c +++ b/drivers/mtd/altera_qspi.c @@ -11,6 +11,7 @@ #include <flash.h> #include <log.h> #include <mtd.h> +#include <asm/global_data.h> #include <asm/io.h> #include <linux/bitops.h> diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index 9e3a652f445..b4512e3a5fc 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -26,6 +26,7 @@ #include <init.h> #include <irq_func.h> #include <log.h> +#include <asm/global_data.h> #include <asm/processor.h> #include <asm/io.h> #include <asm/byteorder.h> diff --git a/drivers/mtd/mtd_uboot.c b/drivers/mtd/mtd_uboot.c index 9360d4ed172..c53ec657a34 100644 --- a/drivers/mtd/mtd_uboot.c +++ b/drivers/mtd/mtd_uboot.c @@ -12,6 +12,7 @@ #include <linux/err.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <asm/global_data.h> #include <mtd.h> #define MTD_NAME_MAX_LEN 20 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> diff --git a/drivers/mtd/pic32_flash.c b/drivers/mtd/pic32_flash.c index a58a2c4b6c3..ea0dbe9eeee 100644 --- a/drivers/mtd/pic32_flash.c +++ b/drivers/mtd/pic32_flash.c @@ -12,6 +12,7 @@ #include <flash.h> #include <init.h> #include <irq_func.h> +#include <asm/global_data.h> #include <linux/bitops.h> #include <mach/pic32.h> #include <wait_bit.h> diff --git a/drivers/mtd/renesas_rpc_hf.c b/drivers/mtd/renesas_rpc_hf.c index 8a644ad9b38..2c61ce7b6e6 100644 --- a/drivers/mtd/renesas_rpc_hf.c +++ b/drivers/mtd/renesas_rpc_hf.c @@ -21,6 +21,7 @@ #include <wait_bit.h> #include <linux/bitops.h> #include <mtd/cfi_flash.h> +#include <asm/global_data.h> #define RPC_CMNCR 0x0000 /* R/W */ #define RPC_CMNCR_MD BIT(31) diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c index 3017022abbb..12d132152d3 100644 --- a/drivers/mtd/spi/sf-uclass.c +++ b/drivers/mtd/spi/sf-uclass.c @@ -9,6 +9,7 @@ #include <malloc.h> #include <spi.h> #include <spi_flash.h> +#include <asm/global_data.h> #include <dm/device-internal.h> #include "sf_internal.h" |