Commit 2410d6a3 authored by Emil Renner Berthing's avatar Emil Renner Berthing Committed by Mark Brown

spi: rockchip: always use SPI mode

The hardware supports 3 different variants of SPI
and there were some code around it, but nothing
to actually set it to anything but "Motorola SPI".
Just drop that code and always use that mode.
Signed-off-by: default avatarEmil Renner Berthing <kernel@esmil.dk>
Tested-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 31bcb57b
...@@ -156,12 +156,6 @@ ...@@ -156,12 +156,6 @@
#define ROCKCHIP_SPI_MAX_CS_NUM 2 #define ROCKCHIP_SPI_MAX_CS_NUM 2
enum rockchip_ssi_type {
SSI_MOTO_SPI = 0,
SSI_TI_SSP,
SSI_NS_MICROWIRE,
};
struct rockchip_spi_dma_data { struct rockchip_spi_dma_data {
struct dma_chan *ch; struct dma_chan *ch;
dma_addr_t addr; dma_addr_t addr;
...@@ -179,8 +173,6 @@ struct rockchip_spi { ...@@ -179,8 +173,6 @@ struct rockchip_spi {
u32 fifo_len; u32 fifo_len;
/* max bus freq supported */ /* max bus freq supported */
u32 max_freq; u32 max_freq;
/* supported slave numbers */
enum rockchip_ssi_type type;
u16 mode; u16 mode;
u8 tmode; u8 tmode;
...@@ -525,14 +517,14 @@ static void rockchip_spi_config(struct rockchip_spi *rs) ...@@ -525,14 +517,14 @@ static void rockchip_spi_config(struct rockchip_spi *rs)
u32 dmacr = 0; u32 dmacr = 0;
int rsd = 0; int rsd = 0;
u32 cr0 = (CR0_BHT_8BIT << CR0_BHT_OFFSET) u32 cr0 = CR0_FRF_SPI << CR0_FRF_OFFSET
| (CR0_SSD_ONE << CR0_SSD_OFFSET) | CR0_BHT_8BIT << CR0_BHT_OFFSET
| (CR0_EM_BIG << CR0_EM_OFFSET); | CR0_SSD_ONE << CR0_SSD_OFFSET
| CR0_EM_BIG << CR0_EM_OFFSET;
cr0 |= (rs->n_bytes << CR0_DFS_OFFSET); cr0 |= (rs->n_bytes << CR0_DFS_OFFSET);
cr0 |= ((rs->mode & 0x3) << CR0_SCPH_OFFSET); cr0 |= ((rs->mode & 0x3) << CR0_SCPH_OFFSET);
cr0 |= (rs->tmode << CR0_XFM_OFFSET); cr0 |= (rs->tmode << CR0_XFM_OFFSET);
cr0 |= (rs->type << CR0_FRF_OFFSET);
if (rs->use_dma) { if (rs->use_dma) {
if (rs->tx) if (rs->tx)
...@@ -709,7 +701,6 @@ static int rockchip_spi_probe(struct platform_device *pdev) ...@@ -709,7 +701,6 @@ static int rockchip_spi_probe(struct platform_device *pdev)
spi_enable_chip(rs, false); spi_enable_chip(rs, false);
rs->type = SSI_MOTO_SPI;
rs->master = master; rs->master = master;
rs->dev = &pdev->dev; rs->dev = &pdev->dev;
rs->max_freq = clk_get_rate(rs->spiclk); rs->max_freq = clk_get_rate(rs->spiclk);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment