diff options
Diffstat (limited to 'drivers/spi')
70 files changed, 345 insertions, 67 deletions
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 612434633b3..35030ab3556 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -168,6 +168,14 @@ config CF_SPI Enable the ColdFire SPI driver. This driver can be used on some m68k SoCs. +config CV1800B_SPIF + bool "Sophgo cv1800b SPI Flash Controller driver" + depends on SPI_MEM + help + Enable the Sophgo cv1800b SPI Flash Controller driver. This driver + can be used to access the SPI NOR flash on platforms embedding this + Sophgo cv1800b IP core. + config DAVINCI_SPI bool "Davinci & Keystone SPI driver" depends on ARCH_DAVINCI || ARCH_KEYSTONE diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 14bdb97f189..32d7bf7237a 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -30,6 +30,7 @@ obj-$(CONFIG_BCM63XX_SPI) += bcm63xx_spi.o obj-$(CONFIG_BCMSTB_SPI) += bcmstb_spi.o obj-$(CONFIG_CF_SPI) += cf_spi.o obj-$(CONFIG_CORTINA_SFLASH) += ca_sflash.o +obj-$(CONFIG_CV1800B_SPIF) += cv1800b_spif.o obj-$(CONFIG_DAVINCI_SPI) += davinci_spi.o obj-$(CONFIG_DESIGNWARE_SPI) += designware_spi.o obj-$(CONFIG_EXYNOS_SPI) += exynos_spi.o diff --git a/drivers/spi/altera_spi.c b/drivers/spi/altera_spi.c index 989679e881b..8e227d187b0 100644 --- a/drivers/spi/altera_spi.c +++ b/drivers/spi/altera_spi.c @@ -6,7 +6,6 @@ * Copyright (c) 2005-2008 Analog Devices Inc. * Copyright (C) 2010 Thomas Chou <thomas@wytron.com.tw> */ -#include <common.h> #include <dm.h> #include <errno.h> #include <log.h> diff --git a/drivers/spi/apple_spi.c b/drivers/spi/apple_spi.c index f35f5af1f6f..5f94e9f7a74 100644 --- a/drivers/spi/apple_spi.c +++ b/drivers/spi/apple_spi.c @@ -4,7 +4,6 @@ * Copyright The Asahi Linux Contributors */ -#include <common.h> #include <dm.h> #include <clk.h> #include <spi.h> diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c index 70cb242cd31..929bf90458c 100644 --- a/drivers/spi/atcspi200_spi.c +++ b/drivers/spi/atcspi200_spi.c @@ -6,7 +6,6 @@ * Author: Rick Chen (rick@andestech.com) */ -#include <common.h> #include <clk.h> #include <log.h> #include <malloc.h> diff --git a/drivers/spi/ath79_spi.c b/drivers/spi/ath79_spi.c index 205567ef54d..faefac71260 100644 --- a/drivers/spi/ath79_spi.c +++ b/drivers/spi/ath79_spi.c @@ -3,7 +3,6 @@ * Copyright (C) 2015-2016 Wills Wang <wills.wang@live.com> */ -#include <common.h> #include <clock_legacy.h> #include <spi.h> #include <dm.h> diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c index bd73e4fddf1..3efb661803b 100644 --- a/drivers/spi/atmel-quadspi.c +++ b/drivers/spi/atmel-quadspi.c @@ -12,7 +12,6 @@ #include <malloc.h> #include <asm/io.h> #include <clk.h> -#include <common.h> #include <dm.h> #include <errno.h> #include <fdtdec.h> diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c index d4f0c4c4483..79f01001318 100644 --- a/drivers/spi/atmel_spi.c +++ b/drivers/spi/atmel_spi.c @@ -2,7 +2,6 @@ /* * Copyright (C) 2007 Atmel Corporation */ -#include <common.h> #include <clk.h> #include <dm.h> #include <fdtdec.h> diff --git a/drivers/spi/bcm63xx_hsspi.c b/drivers/spi/bcm63xx_hsspi.c index 23ac5bb76c0..1aa43fd3a23 100644 --- a/drivers/spi/bcm63xx_hsspi.c +++ b/drivers/spi/bcm63xx_hsspi.c @@ -7,7 +7,6 @@ * Copyright (C) 2012-2013 Jonas Gorski <jogo@openwrt.org> */ -#include <common.h> #include <clk.h> #include <dm.h> #include <log.h> diff --git a/drivers/spi/bcm63xx_spi.c b/drivers/spi/bcm63xx_spi.c index 889ac1f966e..595b41c8ab8 100644 --- a/drivers/spi/bcm63xx_spi.c +++ b/drivers/spi/bcm63xx_spi.c @@ -7,7 +7,6 @@ * Copyright (C) 2010 Tanguy Bouzeloc <tanguy.bouzeloc@efixo.com> */ -#include <common.h> #include <clk.h> #include <dm.h> #include <log.h> diff --git a/drivers/spi/bcmbca_hsspi.c b/drivers/spi/bcmbca_hsspi.c index af45882db0a..eff9e1117d3 100644 --- a/drivers/spi/bcmbca_hsspi.c +++ b/drivers/spi/bcmbca_hsspi.c @@ -8,7 +8,6 @@ * Copyright (C) 2021 Broadcom Ltd */ -#include <common.h> #include <asm/io.h> #include <clk.h> #include <spi.h> diff --git a/drivers/spi/ca_sflash.c b/drivers/spi/ca_sflash.c index 38bddd38619..a99a8a4485a 100644 --- a/drivers/spi/ca_sflash.c +++ b/drivers/spi/ca_sflash.c @@ -7,7 +7,6 @@ * Author: PengPeng Chen <pengpeng.chen@cortina-access.com> */ -#include <common.h> #include <malloc.h> #include <clk.h> #include <dm.h> diff --git a/drivers/spi/cadence_ospi_versal.c b/drivers/spi/cadence_ospi_versal.c index c2be307f1d8..222f828f54e 100644 --- a/drivers/spi/cadence_ospi_versal.c +++ b/drivers/spi/cadence_ospi_versal.c @@ -6,7 +6,6 @@ */ #include <clk.h> -#include <common.h> #include <memalign.h> #include <wait_bit.h> #include <asm/io.h> diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c index f4593c47b8c..75e52232010 100644 --- a/drivers/spi/cadence_qspi.c +++ b/drivers/spi/cadence_qspi.c @@ -4,7 +4,6 @@ * Altera Corporation <www.altera.com> */ -#include <common.h> #include <clk.h> #include <log.h> #include <dm.h> diff --git a/drivers/spi/cadence_qspi_apb.c b/drivers/spi/cadence_qspi_apb.c index fb905322178..93ab2b5635f 100644 --- a/drivers/spi/cadence_qspi_apb.c +++ b/drivers/spi/cadence_qspi_apb.c @@ -25,7 +25,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <common.h> #include <log.h> #include <asm/io.h> #include <dma.h> diff --git a/drivers/spi/cf_spi.c b/drivers/spi/cf_spi.c index 1a841b5dcef..8234468b1d4 100644 --- a/drivers/spi/cf_spi.c +++ b/drivers/spi/cf_spi.c @@ -13,7 +13,6 @@ * TODO: fsl_dspi.c should work as a driver for the DSPI module. */ -#include <common.h> #include <dm.h> #include <log.h> #include <asm/global_data.h> diff --git a/drivers/spi/cv1800b_spif.c b/drivers/spi/cv1800b_spif.c new file mode 100644 index 00000000000..9c077f3ff90 --- /dev/null +++ b/drivers/spi/cv1800b_spif.c @@ -0,0 +1,321 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (c) 2024, Kongyang Liu <seashell11234455@gmail.com> + */ + +#include <clk.h> +#include <dm.h> +#include <linux/bitops.h> +#include <linux/io.h> +#include <linux/kernel.h> +#include <spi-mem.h> +#include <spi.h> +#include <spi_flash.h> +#include <wait_bit.h> + +#define CV1800B_SPI_CTRL_SCK_DIV_MASK GENMASK(10, 0) +#define CV1800B_SPI_CTRL_CPHA BIT(12) +#define CV1800B_SPI_CTRL_CPOL BIT(13) + +#define CV1800B_SPI_CE_MANUAL BIT(0) +#define CV1800B_SPI_CE_MANUAL_EN BIT(1) +#define CV1800B_SPI_CE_ENABLE (CV1800B_SPI_CE_MANUAL | \ + CV1800B_SPI_CE_MANUAL_EN) +#define CV1800B_SPI_CE_DISABLE CV1800B_SPI_CE_MANUAL_EN +#define CV1800B_SPI_CE_HARDWARE 0 + +#define CV1800B_SPI_DLY_CTRL_NEG_SAMPLE BIT(14) + +#define CV1800B_SPI_TRAN_MODE_RX BIT(0) +#define CV1800B_SPI_TRAN_MODE_TX BIT(1) +#define CV1800B_SPI_TRAN_FAST_MODE BIT(3) +#define CV1800B_SPI_TRAN_BUS_WIDTH_1_BIT 0x0 +#define CV1800B_SPI_TRAN_BUS_WIDTH_2_BIT BIT(4) +#define CV1800B_SPI_TRAN_BUS_WIDTH_4_BIT BIT(5) +#define CV1800B_SPI_TRAN_ADDR_3_BYTES (3 << 8) +#define CV1800B_SPI_TRAN_ADDR_4_BYTES (4 << 8) +#define CV1800B_SPI_TRAN_WITH_CMD BIT(11) +#define CV1800B_SPI_TRAN_GO_BUSY BIT(15) +#define CV1800B_SPI_TRAN_DUMMY_CYC_MASK GENMASK(19, 16) +#define CV1800B_SPI_TRAN_DUMMY_CYC_OFFSET 16 +#define CV1800B_SPI_TRAN_BYTE4_EN BIT(20) +#define CV1800B_SPI_TRAN_BYTE4_CMD BIT(21) + +#define CV1800B_SPI_FF_PT_AVAILABLE_MASK GENMASK(3, 0) + +#define CV1800B_SPI_INT_TRAN_DONE BIT(0) +#define CV1800B_SPI_INT_RD_FIFO BIT(2) +#define CV1800B_SPI_INT_WR_FIFO BIT(3) + +#define CV1800B_FIFO_CAPACITY 8 +#define CV1800B_DEFAULT_DIV 4 + +struct cv1800b_spif_regs { + u32 spi_ctrl; + u32 ce_ctrl; + u32 dly_ctrl; + u32 dmmr_ctrl; + u32 tran_csr; + u32 tran_num; + u32 ff_port; + u32 reserved0; + u32 ff_pt; + u32 reserved1; + u32 int_sts; + u32 int_en; +}; + +struct cv1800b_spi_priv { + struct cv1800b_spif_regs *regs; + uint clk_freq; + uint mode; + int div; +}; + +static int cv1800b_spi_probe(struct udevice *bus) +{ + struct cv1800b_spi_priv *priv = dev_get_priv(bus); + struct clk clkdev; + int ret; + + priv->regs = (struct cv1800b_spif_regs *)dev_read_addr_ptr(bus); + if (priv->regs == 0) + return -EINVAL; + + ret = clk_get_by_index(bus, 0, &clkdev); + if (ret) + return ret; + priv->clk_freq = clk_get_rate(&clkdev); + + /* DMMR mode is enabled by default, disable it */ + writel(0, &priv->regs->dmmr_ctrl); + + return 0; +} + +static void cv1800b_spi_config_dmmr(struct cv1800b_spi_priv *priv, struct spi_nor *flash) +{ + struct cv1800b_spif_regs *regs = priv->regs; + u32 read_cmd = flash->read_opcode; + u32 val; + + val = CV1800B_SPI_TRAN_MODE_RX | CV1800B_SPI_TRAN_WITH_CMD; + + switch (read_cmd) { + case SPINOR_OP_READ_4B: + case SPINOR_OP_READ_FAST_4B: + case SPINOR_OP_READ_1_1_2_4B: + case SPINOR_OP_READ_1_1_4_4B: + val |= CV1800B_SPI_TRAN_ADDR_4_BYTES | + CV1800B_SPI_TRAN_BYTE4_EN | CV1800B_SPI_TRAN_BYTE4_CMD; + break; + case SPINOR_OP_READ: + case SPINOR_OP_READ_FAST: + case SPINOR_OP_READ_1_1_2: + case SPINOR_OP_READ_1_1_4: + val |= CV1800B_SPI_TRAN_ADDR_3_BYTES; + break; + } + + switch (read_cmd) { + case SPINOR_OP_READ_FAST: + case SPINOR_OP_READ_FAST_4B: + val |= CV1800B_SPI_TRAN_FAST_MODE; + break; + } + + switch (read_cmd) { + case SPINOR_OP_READ_1_1_2: + case SPINOR_OP_READ_1_1_2_4B: + val |= CV1800B_SPI_TRAN_BUS_WIDTH_2_BIT; + break; + case SPINOR_OP_READ_1_1_4: + case SPINOR_OP_READ_1_1_4_4B: + val |= CV1800B_SPI_TRAN_BUS_WIDTH_4_BIT; + break; + } + + val |= (flash->read_dummy & CV1800B_SPI_TRAN_DUMMY_CYC_MASK) + << CV1800B_SPI_TRAN_DUMMY_CYC_OFFSET; + writel(val, ®s->tran_csr); +} + +static void cv1800b_set_clk_div(struct cv1800b_spi_priv *priv, u32 div) +{ + struct cv1800b_spif_regs *regs = priv->regs; + u32 neg_sample = 0; + + clrsetbits_le32(®s->spi_ctrl, CV1800B_SPI_CTRL_SCK_DIV_MASK, div); + + if (div < CV1800B_DEFAULT_DIV) + neg_sample = CV1800B_SPI_DLY_CTRL_NEG_SAMPLE; + clrsetbits_le32(®s->dly_ctrl, CV1800B_SPI_DLY_CTRL_NEG_SAMPLE, neg_sample); +} + +static int cv1800b_spi_transfer(struct cv1800b_spi_priv *priv, + u8 *din, const u8 *dout, uint len, ulong flags) +{ + struct cv1800b_spif_regs *regs = priv->regs; + u32 tran_csr; + u32 xfer_size, off; + u32 fifo_cnt; + u32 interrupt_mask; + + if (din) { + /* Slow down on receiving */ + cv1800b_set_clk_div(priv, CV1800B_DEFAULT_DIV); + interrupt_mask = CV1800B_SPI_INT_RD_FIFO; + } else { + interrupt_mask = CV1800B_SPI_INT_WR_FIFO; + } + + writel(0, ®s->ff_pt); + writel(len, ®s->tran_num); + + tran_csr = CV1800B_SPI_TRAN_GO_BUSY; + if (din) { + tran_csr |= CV1800B_SPI_TRAN_MODE_RX; + } else { + tran_csr |= CV1800B_SPI_TRAN_MODE_TX; + if (!(flags & SPI_XFER_BEGIN) && (priv->mode & SPI_TX_QUAD)) + tran_csr |= CV1800B_SPI_TRAN_BUS_WIDTH_4_BIT; + } + writel(tran_csr, ®s->tran_csr); + + wait_for_bit_le32(®s->int_sts, interrupt_mask, true, 3000, false); + + off = 0; + while (off < len) { + xfer_size = min_t(u32, len - off, CV1800B_FIFO_CAPACITY); + + fifo_cnt = readl(®s->ff_pt) & CV1800B_SPI_FF_PT_AVAILABLE_MASK; + if (din) + xfer_size = min(xfer_size, fifo_cnt); + else + xfer_size = min(xfer_size, CV1800B_FIFO_CAPACITY - fifo_cnt); + + while (xfer_size--) { + if (din) + din[off++] = readb(®s->ff_port); + else + writeb(dout[off++], ®s->ff_port); + } + } + + wait_for_bit_le32(®s->int_sts, CV1800B_SPI_INT_TRAN_DONE, true, 3000, false); + writel(0, ®s->ff_pt); + clrbits_le32(®s->int_sts, CV1800B_SPI_INT_TRAN_DONE | interrupt_mask); + + if (din) + cv1800b_set_clk_div(priv, priv->div); + return 0; +} + +static int cv1800b_spi_xfer(struct udevice *dev, unsigned int bitlen, + const void *dout, void *din, unsigned long flags) +{ + struct udevice *bus = dev->parent; + struct cv1800b_spi_priv *priv = dev_get_priv(bus); + struct cv1800b_spif_regs *regs = priv->regs; + + if (bitlen == 0) + goto out; + + if (bitlen % 8) { + flags |= SPI_XFER_END; + goto out; + } + + if (flags & SPI_XFER_BEGIN) + writel(CV1800B_SPI_CE_DISABLE, ®s->ce_ctrl); + + if (din || dout) + cv1800b_spi_transfer(priv, din, dout, bitlen / 8, flags); + +out: + if (flags & SPI_XFER_END) + writel(CV1800B_SPI_CE_ENABLE, ®s->ce_ctrl); + return 0; +} + +static int cv1800b_spi_set_speed(struct udevice *bus, uint speed) +{ + struct cv1800b_spi_priv *priv = dev_get_priv(bus); + + priv->div = DIV_ROUND_CLOSEST(priv->clk_freq, speed * 2) - 1; + if (priv->div <= 0) + priv->div = CV1800B_DEFAULT_DIV; + + cv1800b_set_clk_div(priv, priv->div); + + return 0; +} + +static int cv1800b_spi_set_mode(struct udevice *bus, uint mode) +{ + struct cv1800b_spi_priv *priv = dev_get_priv(bus); + struct cv1800b_spif_regs *regs = priv->regs; + u32 val = 0; + + if (mode & SPI_CPHA) + val |= CV1800B_SPI_CTRL_CPHA; + if (mode & SPI_CPOL) + val |= CV1800B_SPI_CTRL_CPOL; + clrsetbits_le32(®s->spi_ctrl, CV1800B_SPI_CTRL_CPHA | CV1800B_SPI_CTRL_CPOL, val); + + priv->mode = mode; + + return 0; +} + +static int cv1800b_spi_exec_op(struct spi_slave *slave, const struct spi_mem_op *op) +{ + struct udevice *bus = slave->dev->parent; + struct cv1800b_spi_priv *priv = dev_get_priv(bus); + struct cv1800b_spif_regs *regs = priv->regs; + struct spi_nor *flash = dev_get_uclass_priv(slave->dev); + u32 old_tran_csr; + + if (!(op->data.nbytes > 0 && op->data.dir == SPI_MEM_DATA_IN) || + !(op->addr.nbytes > 0 && op->addr.nbytes <= 4)) + return -ENOTSUPP; + + old_tran_csr = readl(®s->tran_csr); + writel(CV1800B_SPI_CE_HARDWARE, ®s->ce_ctrl); + + cv1800b_spi_config_dmmr(priv, flash); + + writel(1, ®s->dmmr_ctrl); + memcpy(op->data.buf.in, (void *)priv->regs + op->addr.val, op->data.nbytes); + writel(0, ®s->dmmr_ctrl); + + writel(CV1800B_SPI_CE_ENABLE, ®s->ce_ctrl); + writel(old_tran_csr, ®s->tran_csr); + + return 0; +} + +static const struct spi_controller_mem_ops cv1800b_spi_mem_ops = { + .exec_op = cv1800b_spi_exec_op, +}; + +static const struct dm_spi_ops cv1800b_spi_ops = { + .xfer = cv1800b_spi_xfer, + .mem_ops = &cv1800b_spi_mem_ops, + .set_speed = cv1800b_spi_set_speed, + .set_mode = cv1800b_spi_set_mode, +}; + +static const struct udevice_id cv1800b_spi_ids[] = { + { .compatible = "sophgo,cv1800b-spif" }, + { } +}; + +U_BOOT_DRIVER(cv1800b_spi) = { + .name = "cv1800b_spif", + .id = UCLASS_SPI, + .of_match = cv1800b_spi_ids, + .ops = &cv1800b_spi_ops, + .priv_auto = sizeof(struct cv1800b_spi_priv), + .probe = cv1800b_spi_probe, +}; diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c index 25f5e9fdebd..04c134be9ed 100644 --- a/drivers/spi/davinci_spi.c +++ b/drivers/spi/davinci_spi.c @@ -8,7 +8,7 @@ * Copyright (C) 2007 Atmel Corporation */ -#include <common.h> +#include <config.h> #include <log.h> #include <spi.h> #include <malloc.h> diff --git a/drivers/spi/designware_spi.c b/drivers/spi/designware_spi.c index 22a79da2333..6bd48b1b373 100644 --- a/drivers/spi/designware_spi.c +++ b/drivers/spi/designware_spi.c @@ -11,7 +11,6 @@ */ #define LOG_CATEGORY UCLASS_SPI -#include <common.h> #include <clk.h> #include <dm.h> #include <dm/device_compat.h> diff --git a/drivers/spi/exynos_spi.c b/drivers/spi/exynos_spi.c index 1bcc3ad318d..1b9bf004b7c 100644 --- a/drivers/spi/exynos_spi.c +++ b/drivers/spi/exynos_spi.c @@ -4,7 +4,6 @@ * Padmavathi Venna <padma.v@samsung.com> */ -#include <common.h> #include <dm.h> #include <errno.h> #include <log.h> diff --git a/drivers/spi/fsl_dspi.c b/drivers/spi/fsl_dspi.c index 9b3d5a94817..1d4d90ce5aa 100644 --- a/drivers/spi/fsl_dspi.c +++ b/drivers/spi/fsl_dspi.c @@ -11,7 +11,6 @@ #include <asm/global_data.h> #include <linux/math64.h> -#include <common.h> #include <dm.h> #include <errno.h> #include <log.h> diff --git a/drivers/spi/fsl_espi.c b/drivers/spi/fsl_espi.c index b1d964d79d0..2638ed25200 100644 --- a/drivers/spi/fsl_espi.c +++ b/drivers/spi/fsl_espi.c @@ -8,7 +8,7 @@ * Chuanhua Han (chuanhua.han@nxp.com) */ -#include <common.h> +#include <config.h> #include <log.h> #include <linux/bitops.h> #include <linux/delay.h> diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c index 3f97730bad0..8a0a53cb372 100644 --- a/drivers/spi/fsl_qspi.c +++ b/drivers/spi/fsl_qspi.c @@ -23,7 +23,6 @@ * Transition to spi-mem in spi-fsl-qspi.c */ -#include <common.h> #include <dm.h> #include <dm/device_compat.h> #include <log.h> diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c index 9142ffd2387..e48ca65fe72 100644 --- a/drivers/spi/ich.c +++ b/drivers/spi/ich.c @@ -7,7 +7,6 @@ #define LOG_CATEGORY UCLASS_SPI -#include <common.h> #include <bootstage.h> #include <div64.h> #include <dm.h> diff --git a/drivers/spi/iproc_qspi.c b/drivers/spi/iproc_qspi.c index b5c274314b5..09f30c22702 100644 --- a/drivers/spi/iproc_qspi.c +++ b/drivers/spi/iproc_qspi.c @@ -3,7 +3,6 @@ * Copyright 2020-2021 Broadcom */ -#include <common.h> #include <dm.h> #include <spi.h> #include <spi-mem.h> diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c index 2bb7390bbfb..095cbea0fca 100644 --- a/drivers/spi/kirkwood_spi.c +++ b/drivers/spi/kirkwood_spi.c @@ -7,7 +7,7 @@ * Derived from drivers/spi/mpc8xxx_spi.c */ -#include <common.h> +#include <config.h> #include <dm.h> #include <log.h> #include <malloc.h> diff --git a/drivers/spi/meson_spifc.c b/drivers/spi/meson_spifc.c index d99a151406e..d7ebb6bf1ac 100644 --- a/drivers/spi/meson_spifc.c +++ b/drivers/spi/meson_spifc.c @@ -7,7 +7,6 @@ * Amlogic Meson SPI Flash Controller driver */ -#include <common.h> #include <log.h> #include <spi.h> #include <clk.h> diff --git a/drivers/spi/microchip_coreqspi.c b/drivers/spi/microchip_coreqspi.c index 5fe0c8e1237..234b1688272 100644 --- a/drivers/spi/microchip_coreqspi.c +++ b/drivers/spi/microchip_coreqspi.c @@ -5,7 +5,6 @@ * Naga Sureshkumar Relli <nagasuresh.relli@microchip.com> */ -#include <common.h> #include <clk.h> #include <dm.h> #include <log.h> diff --git a/drivers/spi/mpc8xx_spi.c b/drivers/spi/mpc8xx_spi.c index e1448cc6196..7e72fb9e23d 100644 --- a/drivers/spi/mpc8xx_spi.c +++ b/drivers/spi/mpc8xx_spi.c @@ -16,7 +16,6 @@ * */ -#include <common.h> #include <dm.h> #include <malloc.h> #include <mpc8xx.h> diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c index 7d15390c56b..cd624f4d6f0 100644 --- a/drivers/spi/mpc8xxx_spi.c +++ b/drivers/spi/mpc8xxx_spi.c @@ -4,7 +4,6 @@ * With help from the common/soft_spi and arch/powerpc/cpu/mpc8260 drivers */ -#include <common.h> #include <clk.h> #include <dm.h> #include <errno.h> diff --git a/drivers/spi/mscc_bb_spi.c b/drivers/spi/mscc_bb_spi.c index 95bea0da1b3..ad4daeba3cd 100644 --- a/drivers/spi/mscc_bb_spi.c +++ b/drivers/spi/mscc_bb_spi.c @@ -5,7 +5,6 @@ * Copyright (c) 2018 Microsemi Corporation */ -#include <common.h> #include <dm.h> #include <errno.h> #include <log.h> diff --git a/drivers/spi/mt7621_spi.c b/drivers/spi/mt7621_spi.c index 3d008099862..e46942de2e3 100644 --- a/drivers/spi/mt7621_spi.c +++ b/drivers/spi/mt7621_spi.c @@ -8,7 +8,6 @@ * Copyright (C) 2014-2015 Felix Fietkau <nbd@nbd.name> */ -#include <common.h> #include <clk.h> #include <dm.h> #include <log.h> diff --git a/drivers/spi/mtk_snfi_spi.c b/drivers/spi/mtk_snfi_spi.c index 3decb3744de..830424b31d6 100644 --- a/drivers/spi/mtk_snfi_spi.c +++ b/drivers/spi/mtk_snfi_spi.c @@ -5,7 +5,6 @@ * Author: Weijie Gao <weijie.gao@mediatek.com> */ -#include <common.h> #include <clk.h> #include <dm.h> #include <errno.h> diff --git a/drivers/spi/mtk_snor.c b/drivers/spi/mtk_snor.c index 4b7d4a6e074..f202b2f49f5 100644 --- a/drivers/spi/mtk_snor.c +++ b/drivers/spi/mtk_snor.c @@ -7,7 +7,6 @@ // Some parts are based on drivers/spi/spi-mtk-nor.c of linux version #include <clk.h> -#include <common.h> #include <cpu_func.h> #include <dm.h> #include <dm/device.h> diff --git a/drivers/spi/mvebu_a3700_spi.c b/drivers/spi/mvebu_a3700_spi.c index bba2383a111..fde9b142fb8 100644 --- a/drivers/spi/mvebu_a3700_spi.c +++ b/drivers/spi/mvebu_a3700_spi.c @@ -5,7 +5,6 @@ * Copyright (C) 2016 Stefan Roese <sr@denx.de> */ -#include <common.h> #include <dm.h> #include <log.h> #include <malloc.h> diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c index e291092c481..ff61a14f095 100644 --- a/drivers/spi/mxc_spi.c +++ b/drivers/spi/mxc_spi.c @@ -3,7 +3,7 @@ * Copyright (C) 2008, Guennadi Liakhovetski <lg@denx.de> */ -#include <common.h> +#include <config.h> #include <clk.h> #include <dm.h> #include <log.h> diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c index 773e26bbed7..ad9e490faa9 100644 --- a/drivers/spi/mxs_spi.c +++ b/drivers/spi/mxs_spi.c @@ -12,7 +12,6 @@ * GPIO driven chipselects are not supported. */ -#include <common.h> #include <dm.h> #include <dt-structs.h> #include <cpu_func.h> diff --git a/drivers/spi/npcm_pspi.c b/drivers/spi/npcm_pspi.c index eb14185273e..7708a96971c 100644 --- a/drivers/spi/npcm_pspi.c +++ b/drivers/spi/npcm_pspi.c @@ -3,10 +3,10 @@ * Copyright (c) 2021 Nuvoton Technology. */ -#include <common.h> #include <dm.h> #include <spi.h> #include <clk.h> +#include <reset.h> #include <asm/gpio.h> #include <linux/iopoll.h> @@ -194,6 +194,7 @@ static int npcm_pspi_probe(struct udevice *bus) { struct npcm_pspi_priv *priv = dev_get_priv(bus); int node = dev_of_offset(bus); + struct reset_ctl reset; int ret; ret = clk_get_by_index(bus, 0, &priv->clk); @@ -205,6 +206,14 @@ static int npcm_pspi_probe(struct udevice *bus) gpio_request_by_name_nodev(offset_to_ofnode(node), "cs-gpios", 0, &priv->cs_gpio, GPIOD_IS_OUT| GPIOD_ACTIVE_LOW); + /* Reset HW */ + ret = reset_get_by_index(bus, 0, &reset); + if (!ret) { + reset_assert(&reset); + udelay(5); + reset_deassert(&reset); + } + return 0; } diff --git a/drivers/spi/nxp_fspi.c b/drivers/spi/nxp_fspi.c index 5db27f9ae2c..fefdaaa9e90 100644 --- a/drivers/spi/nxp_fspi.c +++ b/drivers/spi/nxp_fspi.c @@ -33,7 +33,6 @@ * Frieder Schrempf <frieder.schrempf@kontron.de> */ -#include <common.h> #include <clk.h> #include <dm.h> #include <dm/device_compat.h> diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c index 5cce6baa621..3d82fc74ff5 100644 --- a/drivers/spi/omap3_spi.c +++ b/drivers/spi/omap3_spi.c @@ -16,9 +16,9 @@ * Modified by Ruslan Araslanov <ruslan.araslanov@vitecmm.com> */ -#include <common.h> #include <dm.h> #include <spi.h> +#include <time.h> #include <malloc.h> #include <asm/global_data.h> #include <asm/io.h> diff --git a/drivers/spi/pic32_spi.c b/drivers/spi/pic32_spi.c index 45f07f083da..e11ae7fc7a4 100644 --- a/drivers/spi/pic32_spi.c +++ b/drivers/spi/pic32_spi.c @@ -6,7 +6,6 @@ * Purna Chandra Mandal <purna.mandal@microchip.com> */ -#include <common.h> #include <clk.h> #include <dm.h> #include <log.h> diff --git a/drivers/spi/pl022_spi.c b/drivers/spi/pl022_spi.c index e2b49ebd149..1e20701d0d3 100644 --- a/drivers/spi/pl022_spi.c +++ b/drivers/spi/pl022_spi.c @@ -10,7 +10,6 @@ */ #include <clk.h> -#include <common.h> #include <dm.h> #include <dm/device_compat.h> #include <fdtdec.h> diff --git a/drivers/spi/renesas_rpc_spi.c b/drivers/spi/renesas_rpc_spi.c index 8aff2238645..e6b602cf7b4 100644 --- a/drivers/spi/renesas_rpc_spi.c +++ b/drivers/spi/renesas_rpc_spi.c @@ -5,7 +5,6 @@ * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com> */ -#include <common.h> #include <asm/global_data.h> #include <asm/io.h> #include <clk.h> diff --git a/drivers/spi/rk_spi.c b/drivers/spi/rk_spi.c index c8694fdff95..4571dc9f9b6 100644 --- a/drivers/spi/rk_spi.c +++ b/drivers/spi/rk_spi.c @@ -10,7 +10,6 @@ * Peter, Software Engineering, <superpeter.cai@gmail.com>. */ -#include <common.h> #include <clk.h> #include <dm.h> #include <dt-structs.h> diff --git a/drivers/spi/sandbox_spi.c b/drivers/spi/sandbox_spi.c index f844597d04c..4cc016138b1 100644 --- a/drivers/spi/sandbox_spi.c +++ b/drivers/spi/sandbox_spi.c @@ -10,7 +10,6 @@ #define LOG_CATEGORY UCLASS_SPI -#include <common.h> #include <dm.h> #include <log.h> #include <malloc.h> diff --git a/drivers/spi/sh_qspi.c b/drivers/spi/sh_qspi.c index 72594993853..b7364a61929 100644 --- a/drivers/spi/sh_qspi.c +++ b/drivers/spi/sh_qspi.c @@ -8,7 +8,6 @@ #define LOG_CATEGORY UCLASS_SPI -#include <common.h> #include <console.h> #include <malloc.h> #include <spi.h> diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c index 0fa14339bdc..9bdb4a5bff9 100644 --- a/drivers/spi/soft_spi.c +++ b/drivers/spi/soft_spi.c @@ -9,7 +9,6 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ -#include <common.h> #include <dm.h> #include <errno.h> #include <fdtdec.h> diff --git a/drivers/spi/spi-aspeed-smc.c b/drivers/spi/spi-aspeed-smc.c index 7d5f101a766..d91d58da459 100644 --- a/drivers/spi/spi-aspeed-smc.c +++ b/drivers/spi/spi-aspeed-smc.c @@ -12,7 +12,6 @@ #include <asm/io.h> #include <clk.h> -#include <common.h> #include <dm.h> #include <dm/device_compat.h> #include <linux/bitops.h> diff --git a/drivers/spi/spi-emul-uclass.c b/drivers/spi/spi-emul-uclass.c index 64bc19c0011..d92f36bd20e 100644 --- a/drivers/spi/spi-emul-uclass.c +++ b/drivers/spi/spi-emul-uclass.c @@ -5,7 +5,6 @@ #define LOG_CATEGORY UCLASS_SPI_EMUL -#include <common.h> #include <dm.h> #include <spi.h> #include <spi_flash.h> diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c index b7eca583595..3579b7d7db5 100644 --- a/drivers/spi/spi-mem.c +++ b/drivers/spi/spi-mem.c @@ -13,7 +13,6 @@ #include <linux/pm_runtime.h> #include "internals.h" #else -#include <common.h> #include <dm.h> #include <errno.h> #include <malloc.h> diff --git a/drivers/spi/spi-mxic.c b/drivers/spi/spi-mxic.c index f663b9dcbb1..b98bcd9b6ba 100644 --- a/drivers/spi/spi-mxic.c +++ b/drivers/spi/spi-mxic.c @@ -6,7 +6,6 @@ * zhengxunli <zhengxunli@mxic.com.tw> */ -#include <common.h> #include <clk.h> #include <dm.h> #include <errno.h> diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index 572cef1694c..836c550b0bb 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -15,7 +15,6 @@ #include <asm/gpio.h> #include <asm/io.h> #include <clk.h> -#include <common.h> #include <dm.h> #include <errno.h> #include <linux/delay.h> diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c index ea372a05f83..0c8666c05f9 100644 --- a/drivers/spi/spi-sifive.c +++ b/drivers/spi/spi-sifive.c @@ -6,7 +6,6 @@ * SiFive SPI controller driver (master mode only) */ -#include <common.h> #include <dm.h> #include <dm/device_compat.h> #include <malloc.h> diff --git a/drivers/spi/spi-sn-f-ospi.c b/drivers/spi/spi-sn-f-ospi.c index e3633a52608..fc82791006e 100644 --- a/drivers/spi/spi-sn-f-ospi.c +++ b/drivers/spi/spi-sn-f-ospi.c @@ -5,7 +5,6 @@ */ #include <clk.h> -#include <common.h> #include <dm.h> #include <dm/device_compat.h> #include <linux/bitfield.h> diff --git a/drivers/spi/spi-sunxi.c b/drivers/spi/spi-sunxi.c index 9ec6b359e22..13725ee7a2d 100644 --- a/drivers/spi/spi-sunxi.c +++ b/drivers/spi/spi-sunxi.c @@ -18,7 +18,6 @@ * SPDX-License-Identifier: GPL-2.0+ */ -#include <common.h> #include <clk.h> #include <dm.h> #include <log.h> diff --git a/drivers/spi/spi-synquacer.c b/drivers/spi/spi-synquacer.c index 553f9687e3b..eb522fd7b3d 100644 --- a/drivers/spi/spi-synquacer.c +++ b/drivers/spi/spi-synquacer.c @@ -6,7 +6,6 @@ */ #include <clk.h> -#include <common.h> #include <dm.h> #include <log.h> #include <time.h> diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c index f4795e68672..6e281725239 100644 --- a/drivers/spi/spi-uclass.c +++ b/drivers/spi/spi-uclass.c @@ -5,7 +5,6 @@ #define LOG_CATEGORY UCLASS_SPI -#include <common.h> #include <dm.h> #include <errno.h> #include <log.h> diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 22910de0dd9..50a076a98be 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -3,7 +3,6 @@ * Copyright (c) 2011 The Chromium OS Authors. */ -#include <common.h> #include <fdtdec.h> #include <malloc.h> #include <spi.h> diff --git a/drivers/spi/stm32_qspi.c b/drivers/spi/stm32_qspi.c index 2ffa201a66e..2812a4da411 100644 --- a/drivers/spi/stm32_qspi.c +++ b/drivers/spi/stm32_qspi.c @@ -9,7 +9,6 @@ #define LOG_CATEGORY UCLASS_SPI -#include <common.h> #include <clk.h> #include <dm.h> #include <log.h> diff --git a/drivers/spi/stm32_spi.c b/drivers/spi/stm32_spi.c index ddb410a94c0..97b83b17167 100644 --- a/drivers/spi/stm32_spi.c +++ b/drivers/spi/stm32_spi.c @@ -7,7 +7,6 @@ #define LOG_CATEGORY UCLASS_SPI -#include <common.h> #include <clk.h> #include <dm.h> #include <errno.h> diff --git a/drivers/spi/tegra114_spi.c b/drivers/spi/tegra114_spi.c index f0256d8e664..57f1a8fc703 100644 --- a/drivers/spi/tegra114_spi.c +++ b/drivers/spi/tegra114_spi.c @@ -5,7 +5,6 @@ * Copyright (c) 2010-2013 NVIDIA Corporation */ -#include <common.h> #include <dm.h> #include <log.h> #include <time.h> diff --git a/drivers/spi/tegra20_sflash.c b/drivers/spi/tegra20_sflash.c index 10e38cf839d..19114808e9d 100644 --- a/drivers/spi/tegra20_sflash.c +++ b/drivers/spi/tegra20_sflash.c @@ -5,7 +5,6 @@ * With more help from omap3_spi SPI driver */ -#include <common.h> #include <dm.h> #include <errno.h> #include <log.h> diff --git a/drivers/spi/tegra20_slink.c b/drivers/spi/tegra20_slink.c index d0e788539e0..d54a5049205 100644 --- a/drivers/spi/tegra20_slink.c +++ b/drivers/spi/tegra20_slink.c @@ -5,7 +5,6 @@ * Copyright (c) 2010-2013 NVIDIA Corporation */ -#include <common.h> #include <dm.h> #include <log.h> #include <time.h> diff --git a/drivers/spi/tegra210_qspi.c b/drivers/spi/tegra210_qspi.c index 5c8c1859cc9..b969a7993d4 100644 --- a/drivers/spi/tegra210_qspi.c +++ b/drivers/spi/tegra210_qspi.c @@ -6,7 +6,6 @@ * */ -#include <common.h> #include <dm.h> #include <log.h> #include <time.h> diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c index 99acb108823..a16412ec6fb 100644 --- a/drivers/spi/ti_qspi.c +++ b/drivers/spi/ti_qspi.c @@ -5,7 +5,6 @@ * Copyright (C) 2013, Texas Instruments, Incorporated */ -#include <common.h> #include <cpu_func.h> #include <log.h> #include <asm/cache.h> diff --git a/drivers/spi/uniphier_spi.c b/drivers/spi/uniphier_spi.c index 6402acbf14a..8f2c0fb4b8e 100644 --- a/drivers/spi/uniphier_spi.c +++ b/drivers/spi/uniphier_spi.c @@ -5,7 +5,6 @@ */ #include <clk.h> -#include <common.h> #include <dm.h> #include <log.h> #include <time.h> diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c index 94ddf4967ea..0e7fa3a4525 100644 --- a/drivers/spi/xilinx_spi.c +++ b/drivers/spi/xilinx_spi.c @@ -13,7 +13,6 @@ */ #include <config.h> -#include <common.h> #include <dm.h> #include <errno.h> #include <log.h> diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c index cb52c0f3072..b71b9a6fd6c 100644 --- a/drivers/spi/zynq_qspi.c +++ b/drivers/spi/zynq_qspi.c @@ -7,7 +7,6 @@ */ #include <clk.h> -#include <common.h> #include <dm.h> #include <dm/device_compat.h> #include <log.h> diff --git a/drivers/spi/zynq_spi.c b/drivers/spi/zynq_spi.c index b3e0858eb94..ebcb5b6cc88 100644 --- a/drivers/spi/zynq_spi.c +++ b/drivers/spi/zynq_spi.c @@ -6,7 +6,6 @@ * Xilinx Zynq PS SPI controller driver (master mode only) */ -#include <common.h> #include <dm.h> #include <dm/device_compat.h> #include <log.h> diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c index a323994fb2d..61349a4da53 100644 --- a/drivers/spi/zynqmp_gqspi.c +++ b/drivers/spi/zynqmp_gqspi.c @@ -7,7 +7,6 @@ #define LOG_CATEGORY UCLASS_SPI -#include <common.h> #include <cpu_func.h> #include <log.h> #include <asm/arch/sys_proto.h> |