mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-08 11:50:43 +09:00
UPSTREAM: spi: spi-geni-qcom: Add SPI Device mode support for GENI based QuPv3
Currently spi geni driver supports only master mode operation.
Add spi device mode support to GENI based QuPv3.
Signed-off-by: Praveen Talari <quic_ptalari@quicinc.com>
Reviewed-by: Vijaya Krishna Nivarthi <quic_vnivarth@quicinc.com>
Link: https://lore.kernel.org/r/20230714042203.14251-3-quic_ptalari@quicinc.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Bug: 370629635
Change-Id: Icfa82dd3b943763184356a1178e9642f43a015f2
(cherry picked from commit d7f74cc31a)
Signed-off-by: Praveen Talari <quic_ptalari@quicinc.com>
This commit is contained in:
committed by
Treehugger Robot
parent
759bab9407
commit
9a072aa707
@@ -12,6 +12,7 @@
|
|||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <linux/pm_opp.h>
|
#include <linux/pm_opp.h>
|
||||||
#include <linux/pm_runtime.h>
|
#include <linux/pm_runtime.h>
|
||||||
|
#include <linux/property.h>
|
||||||
#include <linux/soc/qcom/geni-se.h>
|
#include <linux/soc/qcom/geni-se.h>
|
||||||
#include <linux/spi/spi.h>
|
#include <linux/spi/spi.h>
|
||||||
#include <linux/spinlock.h>
|
#include <linux/spinlock.h>
|
||||||
@@ -52,6 +53,9 @@
|
|||||||
#define SPI_CS_CLK_DELAY_MSK GENMASK(19, 10)
|
#define SPI_CS_CLK_DELAY_MSK GENMASK(19, 10)
|
||||||
#define SPI_CS_CLK_DELAY_SHFT 10
|
#define SPI_CS_CLK_DELAY_SHFT 10
|
||||||
|
|
||||||
|
#define SE_SPI_SLAVE_EN (0x2BC)
|
||||||
|
#define SPI_SLAVE_EN BIT(0)
|
||||||
|
|
||||||
/* M_CMD OP codes for SPI */
|
/* M_CMD OP codes for SPI */
|
||||||
#define SPI_TX_ONLY 1
|
#define SPI_TX_ONLY 1
|
||||||
#define SPI_RX_ONLY 2
|
#define SPI_RX_ONLY 2
|
||||||
@@ -99,6 +103,16 @@ struct spi_geni_master {
|
|||||||
int cur_xfer_mode;
|
int cur_xfer_mode;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static void spi_slv_setup(struct spi_geni_master *mas)
|
||||||
|
{
|
||||||
|
struct geni_se *se = &mas->se;
|
||||||
|
|
||||||
|
writel(SPI_SLAVE_EN, se->base + SE_SPI_SLAVE_EN);
|
||||||
|
writel(GENI_IO_MUX_0_EN, se->base + GENI_OUTPUT_CTRL);
|
||||||
|
writel(START_TRIGGER, se->base + SE_GENI_CFG_SEQ_START);
|
||||||
|
dev_dbg(mas->dev, "spi slave setup done\n");
|
||||||
|
}
|
||||||
|
|
||||||
static int get_spi_clk_cfg(unsigned int speed_hz,
|
static int get_spi_clk_cfg(unsigned int speed_hz,
|
||||||
struct spi_geni_master *mas,
|
struct spi_geni_master *mas,
|
||||||
unsigned int *clk_idx,
|
unsigned int *clk_idx,
|
||||||
@@ -140,12 +154,22 @@ static void handle_se_timeout(struct spi_master *spi,
|
|||||||
const struct spi_transfer *xfer;
|
const struct spi_transfer *xfer;
|
||||||
|
|
||||||
spin_lock_irq(&mas->lock);
|
spin_lock_irq(&mas->lock);
|
||||||
reinit_completion(&mas->cancel_done);
|
|
||||||
if (mas->cur_xfer_mode == GENI_SE_FIFO)
|
if (mas->cur_xfer_mode == GENI_SE_FIFO)
|
||||||
writel(0, se->base + SE_GENI_TX_WATERMARK_REG);
|
writel(0, se->base + SE_GENI_TX_WATERMARK_REG);
|
||||||
|
|
||||||
xfer = mas->cur_xfer;
|
xfer = mas->cur_xfer;
|
||||||
mas->cur_xfer = NULL;
|
mas->cur_xfer = NULL;
|
||||||
|
|
||||||
|
if (spi->slave) {
|
||||||
|
/*
|
||||||
|
* skip CMD Cancel sequnece since spi slave
|
||||||
|
* doesn`t support CMD Cancel sequnece
|
||||||
|
*/
|
||||||
|
spin_unlock_irq(&mas->lock);
|
||||||
|
goto unmap_if_dma;
|
||||||
|
}
|
||||||
|
|
||||||
|
reinit_completion(&mas->cancel_done);
|
||||||
geni_se_cancel_m_cmd(se);
|
geni_se_cancel_m_cmd(se);
|
||||||
spin_unlock_irq(&mas->lock);
|
spin_unlock_irq(&mas->lock);
|
||||||
|
|
||||||
@@ -542,6 +566,10 @@ static bool geni_can_dma(struct spi_controller *ctlr,
|
|||||||
if (mas->cur_xfer_mode == GENI_GPI_DMA)
|
if (mas->cur_xfer_mode == GENI_GPI_DMA)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
/* Set SE DMA mode for SPI slave. */
|
||||||
|
if (ctlr->slave)
|
||||||
|
return true;
|
||||||
|
|
||||||
len = get_xfer_len_in_words(xfer, mas);
|
len = get_xfer_len_in_words(xfer, mas);
|
||||||
fifo_size = mas->tx_fifo_depth * mas->fifo_width_bits / mas->cur_bits_per_word;
|
fifo_size = mas->tx_fifo_depth * mas->fifo_width_bits / mas->cur_bits_per_word;
|
||||||
|
|
||||||
@@ -619,6 +647,7 @@ static void spi_geni_release_dma_chan(struct spi_geni_master *mas)
|
|||||||
|
|
||||||
static int spi_geni_init(struct spi_geni_master *mas)
|
static int spi_geni_init(struct spi_geni_master *mas)
|
||||||
{
|
{
|
||||||
|
struct spi_master *spi = dev_get_drvdata(mas->dev);
|
||||||
struct geni_se *se = &mas->se;
|
struct geni_se *se = &mas->se;
|
||||||
unsigned int proto, major, minor, ver;
|
unsigned int proto, major, minor, ver;
|
||||||
u32 spi_tx_cfg, fifo_disable;
|
u32 spi_tx_cfg, fifo_disable;
|
||||||
@@ -627,7 +656,14 @@ static int spi_geni_init(struct spi_geni_master *mas)
|
|||||||
pm_runtime_get_sync(mas->dev);
|
pm_runtime_get_sync(mas->dev);
|
||||||
|
|
||||||
proto = geni_se_read_proto(se);
|
proto = geni_se_read_proto(se);
|
||||||
if (proto != GENI_SE_SPI) {
|
|
||||||
|
if (spi->slave) {
|
||||||
|
if (proto != GENI_SE_SPI_SLAVE) {
|
||||||
|
dev_err(mas->dev, "Invalid proto %d\n", proto);
|
||||||
|
goto out_pm;
|
||||||
|
}
|
||||||
|
spi_slv_setup(mas);
|
||||||
|
} else if (proto != GENI_SE_SPI) {
|
||||||
dev_err(mas->dev, "Invalid proto %d\n", proto);
|
dev_err(mas->dev, "Invalid proto %d\n", proto);
|
||||||
goto out_pm;
|
goto out_pm;
|
||||||
}
|
}
|
||||||
@@ -679,9 +715,11 @@ static int spi_geni_init(struct spi_geni_master *mas)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* We always control CS manually */
|
/* We always control CS manually */
|
||||||
spi_tx_cfg = readl(se->base + SE_SPI_TRANS_CFG);
|
if (!spi->slave) {
|
||||||
spi_tx_cfg &= ~CS_TOGGLE;
|
spi_tx_cfg = readl(se->base + SE_SPI_TRANS_CFG);
|
||||||
writel(spi_tx_cfg, se->base + SE_SPI_TRANS_CFG);
|
spi_tx_cfg &= ~CS_TOGGLE;
|
||||||
|
writel(spi_tx_cfg, se->base + SE_SPI_TRANS_CFG);
|
||||||
|
}
|
||||||
|
|
||||||
out_pm:
|
out_pm:
|
||||||
pm_runtime_put(mas->dev);
|
pm_runtime_put(mas->dev);
|
||||||
@@ -1074,6 +1112,9 @@ static int spi_geni_probe(struct platform_device *pdev)
|
|||||||
pm_runtime_set_autosuspend_delay(&pdev->dev, 250);
|
pm_runtime_set_autosuspend_delay(&pdev->dev, 250);
|
||||||
pm_runtime_enable(dev);
|
pm_runtime_enable(dev);
|
||||||
|
|
||||||
|
if (device_property_read_bool(&pdev->dev, "spi-slave"))
|
||||||
|
spi->slave = true;
|
||||||
|
|
||||||
ret = geni_icc_get(&mas->se, NULL);
|
ret = geni_icc_get(&mas->se, NULL);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto spi_geni_probe_runtime_disable;
|
goto spi_geni_probe_runtime_disable;
|
||||||
@@ -1094,7 +1135,7 @@ static int spi_geni_probe(struct platform_device *pdev)
|
|||||||
* for dma (gsi) mode, the gsi will set cs based on params passed in
|
* for dma (gsi) mode, the gsi will set cs based on params passed in
|
||||||
* TRE
|
* TRE
|
||||||
*/
|
*/
|
||||||
if (mas->cur_xfer_mode == GENI_SE_FIFO)
|
if (!spi->slave && mas->cur_xfer_mode == GENI_SE_FIFO)
|
||||||
spi->set_cs = spi_geni_set_cs;
|
spi->set_cs = spi_geni_set_cs;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
Reference in New Issue
Block a user