Support ROCKCHIP SPI new feature
Subsystems (3)
v10 cover Support ROCKCHIP SPI new feature
Changes in v10:
- The internal CS inactive function is only supported after VER 0x00110002
Changes in v9:
- Conver to use CS GPIO description
Changes in v8:
- There is a problem with the version 7 mail format. resend it
Changes in v7:
- Fall back "rockchip,rv1126-spi" to "rockchip,rk3066-spi"
Changes in v6:
- Consider to compatibility, the "rockchip,rk3568-spi" is removed in Series-changes v5, so the commit massage should also remove the corresponding information
Changes in v5:
- Change to leave one compatible id rv1126, and rk3568 is compatible with rv1126
Changes in v4:
- Adjust the order patches
- Simply commit massage like redundancy "application" content
Changes in v3:
- Fix compile error which is find by Sascha in [v2,2/8]
Jon Lin (6):
dt-bindings: spi: spi-rockchip: add description for rv1126
spi: rockchip: add compatible string for rv1126
spi: rockchip: Set rx_fifo interrupt waterline base on transfer item
spi: rockchip: Wait for STB status in slave mode tx_xfer
spi: rockchip: Support cs-gpio
spi: rockchip: Support SPI_CS_HIGH
.../devicetree/bindings/spi/spi-rockchip.yaml | 1 + drivers/spi/spi-rockchip.c | 55 ++++++++++++++----- 2 files changed, 41 insertions(+), 15 deletions(-)
Signature · 1 line
2.17.1
PATCH v10 1/6 dt-bindings: spi: spi-rockchip: add description for rv1126
The description below will be used for rv1126.dtsi or compatible one in the future
---
Changes in v10:
- The internal CS inactive function is only supported after VER 0x00110002
Changes in v9:
- Conver to use CS GPIO description
Changes in v8:
- There is a problem with the version 7 mail format. resend it
Changes in v7:
- Fall back "rockchip,rv1126-spi" to "rockchip,rk3066-spi"
Changes in v6:
- Consider to compatibility, the "rockchip,rk3568-spi" is removed in Series-changes v5, so the commit massage should also remove the corresponding information
Changes in v5:
- Change to leave one compatible id rv1126, and rk3568 is compatible with rv1126
Changes in v4:
- Adjust the order patches
- Simply commit massage like redundancy "application" content
Changes in v3:
- Fix compile error which is find by Sascha in [v2,2/8]
Documentation/devicetree/bindings/spi/spi-rockchip.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/spi/spi-rockchip.yaml +1 -0
@@ -33,6 +33,7 @@ properties: - rockchip,rk3328-spi - rockchip,rk3368-spi - rockchip,rk3399-spi + - rockchip,rv1126-spi - const: rockchip,rk3066-spi reg:
Signature · 1 line
2.17.1
PATCH v10 2/6 spi: rockchip: add compatible string for rv1126
In reply to Jon LinAdd compatible string for rv1126 for potential applications.
---
Changes in v10: None
Changes in v9: None
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
drivers/spi/spi-rockchip.c | 1 + 1 file changed, 1 insertion(+)
drivers/spi/spi-rockchip.c +1 -0
@@ -922,6 +922,7 @@ static const struct of_device_id rockchip_spi_dt_match[] = { { .compatible = "rockchip,rk3368-spi", }, { .compatible = "rockchip,rk3399-spi", }, { .compatible = "rockchip,rv1108-spi", }, + { .compatible = "rockchip,rv1126-spi", }, { }, }; MODULE_DEVICE_TABLE(of, rockchip_spi_dt_match);
Signature · 1 line
2.17.1
PATCH v10 3/6 spi: rockchip: Set rx_fifo interrupt waterline base on transfer item
In reply to Jon LinThe error here is to calculate the width as 8 bits. In fact, 16 bits should be considered.
---
Changes in v10: None
Changes in v9: None
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
drivers/spi/spi-rockchip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/spi/spi-rockchip.c +2 -2
@@ -540,8 +540,8 @@ static int rockchip_spi_config(struct rockchip_spi *rs,* interrupt exactly when the fifo is full doesn't seem to work, * so we need the strict inequality here */ -if (xfer->len < rs->fifo_len) -writel_relaxed (xfer->len -1 , rs->regs +ROCKCHIP_SPI_RXFTLR ); +if ((xfer->len / rs->n_bytes) < rs->fifo_len) +writel_relaxed (xfer->len / rs->n_bytes -1 , rs->regs +ROCKCHIP_SPI_RXFTLR );else writel_relaxed (rs->fifo_len /2 -1 , rs->regs +ROCKCHIP_SPI_RXFTLR );
Signature · 1 line
2.17.1
PATCH v10 4/6 spi: rockchip: Wait for STB status in slave mode tx_xfer
In reply to Jon LinAfter ROCKCHIP_SPI_VER2_TYPE2, SR->STB is a more accurate judgment bit for spi slave transmition.
---
Changes in v10: None
Changes in v9: None
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
drivers/spi/spi-rockchip.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)
drivers/spi/spi-rockchip.c +14 -7
@@ -116,13 +116,14 @@#define BAUDR_SCKDV_MIN 2#define BAUDR_SCKDV_MAX 65534 -/* Bit fields in SR, 5bit */ -#define SR_MASK 0x1f +/* Bit fields in SR, 6bit */ +#define SR_MASK 0x3f#define SR_BUSY (1 << 0)#define SR_TF_FULL (1 << 1)#define SR_TF_EMPTY (1 << 2)#define SR_RF_EMPTY (1 << 3)#define SR_RF_FULL (1 << 4) +#define SR_SLAVE_TX_BUSY (1 << 5)/* Bit fields in ISR, IMR, ISR, RISR, 5bit */ #define INT_MASK 0x1f
@@ -197,13 +198,19 @@ static inline void spi_enable_chip(struct rockchip_spi *rs, bool enable)writel_relaxed ((enable ?1U :0U ), rs->regs +ROCKCHIP_SPI_SSIENR ); } -static inline void wait_for_idle (struct rockchip_spi *rs) +static inline void wait_for_tx_idle (struct rockchip_spi *rs,bool slave_mode) {unsigned long timeout = jiffies +msecs_to_jiffies (5 );do { -if (!(readl_relaxed (rs->regs +ROCKCHIP_SPI_SR ) &SR_BUSY )) -return ; +if (slave_mode) { +if (!(readl_relaxed (rs->regs +ROCKCHIP_SPI_SR ) &SR_SLAVE_TX_BUSY ) && + !((readl_relaxed (rs->regs +ROCKCHIP_SPI_SR ) &SR_BUSY ))) +return ; + }else { +if (!(readl_relaxed (rs->regs +ROCKCHIP_SPI_SR ) &SR_BUSY )) +return ; + } }while (!time_after (jiffies, timeout));dev_warn (rs->dev,"spi controller is in busy state!\n" );
@@ -383,7 +390,7 @@ static void rockchip_spi_dma_txcb(void *data)return ;/* Wait until the FIFO data completely. */ -wait_for_idle (rs); +wait_for_tx_idle (rs, ctlr->slave);spi_enable_chip (rs, false);spi_finalize_current_transfer (ctlr);
@@ -545,7 +552,7 @@ static int rockchip_spi_config(struct rockchip_spi *rs,else writel_relaxed (rs->fifo_len /2 -1 , rs->regs +ROCKCHIP_SPI_RXFTLR ); -writel_relaxed (rs->fifo_len /2 , rs->regs +ROCKCHIP_SPI_DMATDLR ); +writel_relaxed (rs->fifo_len /2 -1 , rs->regs +ROCKCHIP_SPI_DMATDLR );writel_relaxed (rockchip_spi_calc_burst_size (xfer->len / rs->n_bytes) -1 , rs->regs +ROCKCHIP_SPI_DMARDLR );writel_relaxed (dmacr, rs->regs +ROCKCHIP_SPI_DMACR );
Signature · 1 line
2.17.1
PATCH v10 5/6 spi: rockchip: Support cs-gpio
In reply to Jon Lin1.Add standard cs-gpio support 2.Refer to spi-controller.yaml for details
---
Changes in v10: None Changes in v9: None Changes in v8: None Changes in v7: None Changes in v6: None Changes in v5: None Changes in v4: None Changes in v3: None
drivers/spi/spi-rockchip.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/spi/spi-rockchip.c +10 -5
@@ -157,7 +157,8 @@*/ #define ROCKCHIP_SPI_MAX_TRANLEN 0xffff -#define ROCKCHIP_SPI_MAX_CS_NUM 2 +/* 2 for native cs, 2 for cs-gpio */ +#define ROCKCHIP_SPI_MAX_CS_NUM 4#define ROCKCHIP_SPI_VER2_TYPE1 0x05EC0002#define ROCKCHIP_SPI_VER2_TYPE2 0x00110002
@@ -245,11 +246,15 @@ static void rockchip_spi_set_cs(struct spi_device *spi, bool enable)/* Keep things powered as long as CS is asserted */ pm_runtime_get_sync (rs->dev); -ROCKCHIP_SPI_SET_BITS (rs->regs +ROCKCHIP_SPI_SER , -BIT (spi->chip_select)); +if (spi->cs_gpiod) +ROCKCHIP_SPI_SET_BITS (rs->regs +ROCKCHIP_SPI_SER ,1 ); +else +ROCKCHIP_SPI_SET_BITS (rs->regs +ROCKCHIP_SPI_SER ,BIT (spi->chip_select)); }else { -ROCKCHIP_SPI_CLR_BITS (rs->regs +ROCKCHIP_SPI_SER , -BIT (spi->chip_select)); +if (spi->cs_gpiod) +ROCKCHIP_SPI_CLR_BITS (rs->regs +ROCKCHIP_SPI_SER ,1 ); +else +ROCKCHIP_SPI_CLR_BITS (rs->regs +ROCKCHIP_SPI_SER ,BIT (spi->chip_select));/* Drop reference from when we first asserted CS */ pm_runtime_put (rs->dev);
Signature · 1 line
2.17.1
PATCH v10 6/6 spi: rockchip: Support SPI_CS_HIGH
1.Add standard spi-cs-high support
2.Refer to spi-controller.yaml for details
---
Changes in v10: None
Changes in v9: None
Changes in v8: None
Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
drivers/spi/spi-rockchip.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/spi/spi-rockchip.c +13 -1
@@ -107,6 +107,8 @@#define CR0_OPM_MASTER 0x0#define CR0_OPM_SLAVE 0x1 +#define CR0_SOI_OFFSET 23 +#define CR0_MTM_OFFSET 0x21/* Bit fields in SER, 2bit */
@@ -236,7 +238,7 @@ static void rockchip_spi_set_cs(struct spi_device *spi, bool enable) {struct spi_controller *ctlr = spi->controller;struct rockchip_spi *rs =spi_controller_get_devdata (ctlr); -bool cs_asserted = !enable; +bool cs_asserted = spi->mode &SPI_CS_HIGH ? enable : !enable;/* Return immediately for no-op */ if (cs_asserted == rs->cs_asserted[spi->chip_select])
@@ -507,6 +509,8 @@ static int rockchip_spi_config(struct rockchip_spi *rs, cr0 |= (spi->mode &0x3U ) <<CR0_SCPH_OFFSET ;if (spi->mode &SPI_LSB_FIRST ) cr0 |=CR0_FBM_LSB <<CR0_FBM_OFFSET ; +if (spi->mode &SPI_CS_HIGH ) + cr0 |=BIT (spi->chip_select) <<CR0_SOI_OFFSET ;if (xfer->rx_buf && xfer->tx_buf) cr0 |=CR0_XFM_TR <<CR0_XFM_OFFSET ;
@@ -795,6 +799,14 @@ static int rockchip_spi_probe(struct platform_device *pdev) ctlr->can_dma = rockchip_spi_can_dma; } +switch (readl_relaxed (rs->regs +ROCKCHIP_SPI_VERSION )) { +case ROCKCHIP_SPI_VER2_TYPE2 : + ctlr->mode_bits |=SPI_CS_HIGH ; +break ; +default : +break ; + } + ret =devm_spi_register_controller (&pdev->dev, ctlr);if (ret <0 ) {dev_err (&pdev->dev,"Failed to register controller\n" );
Signature · 1 line
2.17.1
Mark Brown
maintainerQuoted 10 lines · Jon Lin
Changes in v10:
- The internal CS inactive function is only supported after VER0x00110002Changes in v9:
- Conver to use CS GPIO descriptionChanges in v8:
- There is a problem with the version 7 mail format. resend it[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next
Thanks!
[1/6] dt-bindings: spi: spi-rockchip: add description for rv1126
commit: c58c7e9bf55ced301fdd9c8c1841361cc5fc8458
[2/6] spi: rockchip: add compatible string for rv1126
commit: 0f4f58b847b23d79185ad20ecf629c9f913f4f41
[3/6] spi: rockchip: Set rx_fifo interrupt waterline base on transfer item
commit: 4a47fcdb5f8b220a396e896a4efed51c13e27d8b
[4/6] spi: rockchip: Wait for STB status in slave mode tx_xfer
commit: 2758bd093ac35ca5b62dbecfd30dab60e8b59790
[5/6] spi: rockchip: Support cs-gpio
commit: b8d423711d1870c5e1280d5bbb0639fe6638a60e
[6/6] spi: rockchip: Support SPI_CS_HIGH
commit: 736b81e075172f1e6cd7a8bc1a1374a2dee9e4dcAll being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark