diff options
| author | Tom Rini | 2020-10-16 09:44:51 -0400 |
|---|---|---|
| committer | Tom Rini | 2020-10-16 09:44:51 -0400 |
| commit | da09b99ea572cec9a114872e480b798db11f9c6e (patch) | |
| tree | ea40e8c6a93a8e6e54ead962cc709e993b607419 /drivers/spi | |
| parent | 9dc6aef8c963ae17e1263b89c692792fce0c7198 (diff) | |
| parent | 4a1989c0bc77565493fd142ce224d5d0c88deda9 (diff) | |
Merge branch '2020-10-15-further-cleanup_dev_xxx'
- Bring in the next round of dev_xxx cleanup patches.
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/fsl_qspi.c | 9 | ||||
| -rw-r--r-- | drivers/spi/nxp_fspi.c | 7 |
2 files changed, 9 insertions, 7 deletions
diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c index eec968e5ec1..128f95877f2 100644 --- a/drivers/spi/fsl_qspi.c +++ b/drivers/spi/fsl_qspi.c @@ -24,19 +24,20 @@ */ #include <common.h> +#include <dm.h> +#include <dm/device_compat.h> #include <log.h> -#include <asm/io.h> +#include <spi.h> +#include <spi-mem.h> #include <linux/bitops.h> #include <linux/delay.h> #include <linux/libfdt.h> #include <linux/sizes.h> #include <linux/iopoll.h> -#include <dm.h> #include <linux/iopoll.h> #include <linux/sizes.h> #include <linux/err.h> -#include <spi.h> -#include <spi-mem.h> +#include <asm/io.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/spi/nxp_fspi.c b/drivers/spi/nxp_fspi.c index ebd94925e99..9661e9e10d7 100644 --- a/drivers/spi/nxp_fspi.c +++ b/drivers/spi/nxp_fspi.c @@ -34,12 +34,13 @@ */ #include <common.h> -#include <asm/io.h> +#include <clk.h> +#include <dm.h> +#include <dm/device_compat.h> #include <malloc.h> #include <spi.h> #include <spi-mem.h> -#include <dm.h> -#include <clk.h> +#include <asm/io.h> #include <linux/bitops.h> #include <linux/kernel.h> #include <linux/sizes.h> |