summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladimir Barinov <vladimir.barinov@cogentembedded.com>2018-03-15 13:39:48 +0300
committerVladimir Barinov <vladimir.barinov@cogentembedded.com>2018-03-15 13:39:48 +0300
commitdd5445c6db1a39c12d81d8cac8dc35ae84dddad7 (patch)
treec509c7c99c1c1f768eae478a0a359de95a71cb89
parenta09e77dbe274e015df726f9ca91d4f7aaf709d50 (diff)
SPI: fix perfromance and fix SPI slave packets loss
- this fixes SPI performance when small chunks are used during transfer under heavy cpu load - fix spi slave<->master packets loss under heavy load
-rw-r--r--meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0001-spi-sh-msiof-fixes.patch16
-rw-r--r--meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0086-spi-sh-msiof-Add-slave-mode-support.patch325
2 files changed, 305 insertions, 36 deletions
diff --git a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0001-spi-sh-msiof-fixes.patch b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0001-spi-sh-msiof-fixes.patch
index d8806ba..411d0ee 100644
--- a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0001-spi-sh-msiof-fixes.patch
+++ b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0001-spi-sh-msiof-fixes.patch
@@ -3,7 +3,8 @@ From: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
Date: Sun, 15 May 2016 21:53:13 +0300
Subject: [PATCH] spi: sh-msiof: fixes
-speed up polling of CTR register
+speed up polling of CTR register and allow scheduling instead of
+busy loop
Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
---
@@ -19,15 +20,24 @@ index d096f5a..6817304 100644
sh_msiof_write(p, CTR, data);
- for (k = 100; k > 0; k--) {
-+ for (k = 1000; k > 0; k--) {
++ for (k = 100000; k > 0; k--) {
if ((sh_msiof_read(p, CTR) & mask) == set)
break;
- udelay(10);
-+ udelay(1);
++ usleep_range(1, 2);
}
return k > 0 ? 0 : -ETIMEDOUT;
+@@ -295,7 +295,7 @@ static void sh_msiof_spi_reset_regs(struct sh_msiof_spi_priv *p)
+ if (!(sh_msiof_read(p, CTR) & mask))
+ break;
+
+- udelay(10);
++ usleep_range(10, 20);
+ }
+ }
+
--
1.9.1
diff --git a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0086-spi-sh-msiof-Add-slave-mode-support.patch b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0086-spi-sh-msiof-Add-slave-mode-support.patch
index af15bae..ef0b74b 100644
--- a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0086-spi-sh-msiof-Add-slave-mode-support.patch
+++ b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0086-spi-sh-msiof-Add-slave-mode-support.patch
@@ -1,29 +1,32 @@
-From 383d0d23b9292dab56a2fdf5f6fecf898be6d142 Mon Sep 17 00:00:00 2001
+From cf9e4784f3bde3e4749163384f27450ddffe746c Mon Sep 17 00:00:00 2001
From: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
-Date: Mon, 28 Jul 2014 14:47:56 +0900
-Subject: [PATCH 4/7] spi: sh-msiof: Add slave mode support
+Date: Mon, 22 May 2017 15:11:43 +0200
+Subject: [PATCH] spi: sh-msiof: Add slave mode support
Add slave mode support to the MSIOF driver, in both PIO and DMA mode.
For now this only supports the transmission of messages with a size
that is known in advance.
+Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
Signed-off-by: Hiromitsu Yamasaki <hiromitsu.yamasaki.ym@renesas.com>
[geert: Timeout handling cleanup, spi core integration, cancellation,
rewording]
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Rob Herring <robh@kernel.org>
+Signed-off-by: Mark Brown <broonie@kernel.org>
---
- Documentation/devicetree/bindings/spi/sh-msiof.txt | 2 +
- drivers/spi/spi-sh-msiof.c | 79 ++++++++++++++------
- 2 files changed, 60 insertions(+), 21 deletions(-)
+ Documentation/devicetree/bindings/spi/sh-msiof.txt | 2 +
+ drivers/spi/spi-sh-msiof.c | 193 +++++++++------------
+ include/linux/spi/sh_msiof.h | 4 +-
+ 3 files changed, 90 insertions(+), 109 deletions(-)
diff --git a/Documentation/devicetree/bindings/spi/sh-msiof.txt b/Documentation/devicetree/bindings/spi/sh-msiof.txt
-index c2b6251..74ee3cd 100644
+index f1dbc15..9e43f30 100644
--- a/Documentation/devicetree/bindings/spi/sh-msiof.txt
+++ b/Documentation/devicetree/bindings/spi/sh-msiof.txt
-@@ -33,6 +33,8 @@ Optional properties:
+@@ -34,6 +34,8 @@ Optional properties:
specifiers, one for transmission, and one for
reception.
- dma-names : Must contain a list of two DMA names, "tx" and "rx".
@@ -33,19 +36,20 @@ index c2b6251..74ee3cd 100644
Must contain one of the following values:
0 (no bit delay)
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
-index 3281dc7..3b87024 100644
+index 13fd706..916377b 100644
--- a/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
-@@ -3,7 +3,7 @@
+@@ -3,7 +3,8 @@
*
* Copyright (C) 2016-2017 Renesas Electronics Corporation
* Copyright (c) 2009 Magnus Damm
- * Copyright (C) 2014 Glider bvba
++ * Copyright (C) 2014 Renesas Electronics Corporation
+ * Copyright (C) 2014-2017 Glider bvba
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
-@@ -35,7 +35,6 @@
+@@ -35,7 +36,6 @@
#include <asm/unaligned.h>
@@ -53,7 +57,7 @@ index 3281dc7..3b87024 100644
struct sh_msiof_chipdata {
u16 tx_fifo_size;
u16 rx_fifo_size;
-@@ -62,6 +61,7 @@ struct sh_msiof_spi_priv {
+@@ -62,6 +62,7 @@ struct sh_msiof_spi_priv {
void *rx_dma_page;
dma_addr_t tx_dma_addr;
dma_addr_t rx_dma_addr;
@@ -61,7 +65,101 @@ index 3281dc7..3b87024 100644
unsigned int quirks;
};
-@@ -712,6 +712,33 @@ static int sh_msiof_spi_stop(struct sh_msiof_spi_priv *p, void *rx_buf)
+@@ -402,18 +403,21 @@ static void sh_msiof_spi_set_pin_regs(struct sh_msiof_spi_priv *p,
+ tmp |= lsb_first << MDR1_BITLSB_SHIFT;
+ tmp |= sh_msiof_spi_get_dtdl_and_syncdl(p);
+ if (p->quirks & TRANSFER_WORKAROUND_H3WS10) {
+- if (p->mode == SPI_MSIOF_MASTER) {
++ if (!spi_controller_is_slave(p->master)) {
+ tmp &= ~MDR1_DTDL_MASK;
+ tmp |= 0 << MDR1_DTDL_SHIFT;
+ }
+ }
+ if (p->quirks & TRANSFER_WORKAROUND_H3WS11) {
+- if (p->mode == SPI_MSIOF_MASTER) {
++ if (!spi_controller_is_slave(p->master)) {
+ tmp &= ~MDR1_DTDL_MASK;
+ tmp |= 1 << MDR1_DTDL_SHIFT;
+ }
+ }
+- if (p->mode == SPI_MSIOF_MASTER) {
++
++ if (spi_controller_is_slave(p->master)) {
++ sh_msiof_write(p, TMDR1, tmp | TMDR1_PCON);
++ } else {
+ if (p->cs == 1)
+ tmp |= MDR1_SYNCCH_SS1;
+ else if (p->cs == 2)
+@@ -421,16 +425,15 @@ static void sh_msiof_spi_set_pin_regs(struct sh_msiof_spi_priv *p,
+ else
+ tmp &= ~MDR1_SYNCCH_MASK;
+ sh_msiof_write(p, TMDR1, tmp | MDR1_TRMD | TMDR1_PCON);
+- } else
+- sh_msiof_write(p, TMDR1, tmp | TMDR1_PCON);
++ }
+ if (p->quirks & TRANSFER_WORKAROUND_H3WS10) {
+- if (p->mode == SPI_MSIOF_MASTER) {
++ if (!spi_controller_is_slave(p->master)) {
+ tmp &= ~MDR1_DTDL_MASK;
+ tmp |= 2 << MDR1_DTDL_SHIFT;
+ }
+ }
+ if (p->quirks & TRANSFER_WORKAROUND_H3WS11) {
+- if (p->mode == SPI_MSIOF_MASTER) {
++ if (!spi_controller_is_slave(p->master)) {
+ tmp &= ~MDR1_DTDL_MASK;
+ tmp |= 1 << MDR1_DTDL_SHIFT;
+ }
+@@ -443,7 +446,7 @@ static void sh_msiof_spi_set_pin_regs(struct sh_msiof_spi_priv *p,
+
+ tmp = 0;
+ if (p->quirks & TRANSFER_WORKAROUND_H3WS10) {
+- if (p->mode == SPI_MSIOF_MASTER) {
++ if (!spi_controller_is_slave(p->master)) {
+ tmp |= 0 << CTR_TSCKIZ_POL_SHIFT;
+ tmp |= 0 << CTR_RSCKIZ_POL_SHIFT;
+ } else {
+@@ -680,10 +683,11 @@ static int sh_msiof_prepare_message(struct spi_master *master,
+
+ static int sh_msiof_spi_start(struct sh_msiof_spi_priv *p, void *rx_buf)
+ {
++ bool slave = spi_controller_is_slave(p->master);
+ int ret = 0;
+
+ /* setup clock and rx/tx signals */
+- if (p->mode == SPI_MSIOF_MASTER)
++ if (!slave)
+ ret = sh_msiof_modify_ctr_wait(p, 0, CTR_TSCKE);
+ if (rx_buf && !ret)
+ ret = sh_msiof_modify_ctr_wait(p, 0, CTR_RXE);
+@@ -691,7 +695,7 @@ static int sh_msiof_spi_start(struct sh_msiof_spi_priv *p, void *rx_buf)
+ ret = sh_msiof_modify_ctr_wait(p, 0, CTR_TXE);
+
+ /* start by setting frame bit */
+- if (!ret && p->mode == SPI_MSIOF_MASTER)
++ if (!ret && !slave)
+ ret = sh_msiof_modify_ctr_wait(p, 0, CTR_TFSE);
+
+ return ret;
+@@ -699,21 +703,50 @@ static int sh_msiof_spi_start(struct sh_msiof_spi_priv *p, void *rx_buf)
+
+ static int sh_msiof_spi_stop(struct sh_msiof_spi_priv *p, void *rx_buf)
+ {
++ bool slave = spi_controller_is_slave(p->master);
+ int ret = 0;
+
+ /* shut down frame, rx/tx and clock signals */
+- if (p->mode == SPI_MSIOF_MASTER)
++ if (!slave)
+ ret = sh_msiof_modify_ctr_wait(p, CTR_TFSE, 0);
+ if (!ret)
+ ret = sh_msiof_modify_ctr_wait(p, CTR_TXE, 0);
+ if (rx_buf && !ret)
+ ret = sh_msiof_modify_ctr_wait(p, CTR_RXE, 0);
+- if (!ret && p->mode == SPI_MSIOF_MASTER)
++ if (!ret && !slave)
+ ret = sh_msiof_modify_ctr_wait(p, CTR_TSCKE, 0);
+
return ret;
}
@@ -74,16 +172,17 @@ index 3281dc7..3b87024 100644
+ return 0;
+}
+
-+static int sh_msiof_wait_for_completion(struct sh_msiof_spi_priv *p)
++static int sh_msiof_wait_for_completion(struct sh_msiof_spi_priv *p,
++ struct completion *done)
+{
+ if (spi_controller_is_slave(p->master)) {
-+ if (wait_for_completion_interruptible(&p->done) ||
++ if (wait_for_completion_interruptible(done) ||
+ p->slave_aborted) {
+ dev_dbg(&p->pdev->dev, "interrupted\n");
+ return -EINTR;
+ }
+ } else {
-+ if (!wait_for_completion_timeout(&p->done, HZ)) {
++ if (!wait_for_completion_timeout(done, HZ)) {
+ dev_err(&p->pdev->dev, "timeout\n");
+ return -ETIMEDOUT;
+ }
@@ -95,7 +194,17 @@ index 3281dc7..3b87024 100644
static int sh_msiof_spi_txrx_once(struct sh_msiof_spi_priv *p,
void (*tx_fifo)(struct sh_msiof_spi_priv *,
const void *, int, int),
-@@ -747,6 +774,7 @@ static int sh_msiof_spi_txrx_once(struct sh_msiof_spi_priv *p,
+@@ -724,9 +757,6 @@ static int sh_msiof_spi_txrx_once(struct sh_msiof_spi_priv *p,
+ {
+ int fifo_shift;
+ int ret;
+- unsigned long timeout;
+-
+- timeout = (p->mode == SPI_MSIOF_MASTER) ? HZ : MAX_SCHEDULE_TIMEOUT;
+
+ /* limit maximum word transfer to rx/tx fifo size */
+ if (tx_buf)
+@@ -749,6 +779,7 @@ static int sh_msiof_spi_txrx_once(struct sh_msiof_spi_priv *p,
tx_fifo(p, tx_buf, words, fifo_shift);
reinit_completion(&p->done);
@@ -103,7 +212,41 @@ index 3281dc7..3b87024 100644
ret = sh_msiof_spi_start(p, rx_buf);
if (ret) {
-@@ -867,6 +895,7 @@ static int sh_msiof_dma_once(struct sh_msiof_spi_priv *p, const void *tx,
+@@ -757,21 +788,9 @@ static int sh_msiof_spi_txrx_once(struct sh_msiof_spi_priv *p,
+ }
+
+ /* wait for tx fifo to be emptied / rx fifo to be filled */
+- if (p->mode == SPI_MSIOF_MASTER)
+- ret = wait_for_completion_timeout(&p->done, timeout);
+- else {
+- ret = wait_for_completion_interruptible_timeout(
+- &p->done, timeout);
+- if (ret == -ERESTARTSYS) {
+- dev_err(&p->pdev->dev, "PIO mode. Task interrupt\n");
+- goto stop_reset;
+- }
+- }
+- if (!ret) {
+- dev_err(&p->pdev->dev, "PIO timeout\n");
+- ret = -ETIMEDOUT;
++ ret = sh_msiof_wait_for_completion(p, &p->done);
++ if (ret)
+ goto stop_reset;
+- }
+
+ /* read rx fifo */
+ if (rx_buf)
+@@ -817,9 +836,6 @@ static int sh_msiof_dma_once(struct sh_msiof_spi_priv *p, const void *tx,
+ struct dma_async_tx_descriptor *desc_tx = NULL, *desc_rx = NULL;
+ dma_cookie_t cookie;
+ int ret;
+- unsigned long timeout;
+-
+- timeout = (p->mode == SPI_MSIOF_MASTER) ? HZ : MAX_SCHEDULE_TIMEOUT;
+
+ /* First prepare and submit the DMA request(s), as this may fail */
+ if (rx) {
+@@ -869,6 +885,7 @@ static int sh_msiof_dma_once(struct sh_msiof_spi_priv *p, const void *tx,
reinit_completion(&p->done);
reinit_completion(&p->done_dma_tx);
reinit_completion(&p->done_dma_rx);
@@ -111,23 +254,121 @@ index 3281dc7..3b87024 100644
/* Now start DMA */
if (rx)
-@@ -1205,8 +1234,14 @@ static struct sh_msiof_spi_info *sh_msiof_spi_parse_dt(struct device *dev)
+@@ -884,64 +901,23 @@ static int sh_msiof_dma_once(struct sh_msiof_spi_priv *p, const void *tx,
+
+ /* wait for Tx/Rx DMA completion */
+ if (tx) {
+- if (p->mode == SPI_MSIOF_MASTER)
+- ret = wait_for_completion_timeout(
+- &p->done_dma_tx, timeout);
+- else {
+- ret = wait_for_completion_interruptible_timeout(
+- &p->done_dma_tx, timeout);
+- if (ret == -ERESTARTSYS) {
+- dev_err(&p->pdev->dev, "Tx DMA. Task interrupt\n");
+- goto stop_reset;
+- }
+- }
+- if (!ret) {
+- dev_err(&p->pdev->dev, "Tx DMA timeout\n");
+- ret = -ETIMEDOUT;
++ ret = sh_msiof_wait_for_completion(p, &p->done_dma_tx);
++ if (ret)
+ goto stop_reset;
+- }
++
+ if (!rx) {
+ ier_bits = IER_TEOFE;
+ sh_msiof_write(p, IER, ier_bits);
+
+ /* wait for tx fifo to be emptied */
+- if (p->mode == SPI_MSIOF_MASTER)
+- ret = wait_for_completion_timeout(
+- &p->done, timeout);
+- else {
+- ret = wait_for_completion_interruptible_timeout(
+- &p->done, timeout);
+- if (ret == -ERESTARTSYS) {
+- dev_err(&p->pdev->dev,
+- "Tx fifo to be emptied. Task interrupt\n");
+- goto stop_reset;
+- }
+- }
+- if (!ret) {
+- dev_err(&p->pdev->dev,
+- "Tx fifo to be emptied timeout\n");
+- ret = -ETIMEDOUT;
++ if (sh_msiof_wait_for_completion(p, &p->done))
+ goto stop_reset;
+- }
+ }
+ }
+ if (rx) {
+- if (p->mode == SPI_MSIOF_MASTER)
+- ret = wait_for_completion_timeout(
+- &p->done_dma_rx, timeout);
+- else {
+- ret = wait_for_completion_interruptible_timeout(
+- &p->done_dma_rx, timeout);
+- if (ret == -ERESTARTSYS) {
+- dev_err(&p->pdev->dev, "Rx DMA. Task interrupt\n");
+- goto stop_reset;
+- }
+- }
+- if (!ret) {
+- dev_err(&p->pdev->dev, "Rx DMA timeout\n");
+- ret = -ETIMEDOUT;
++ ret = sh_msiof_wait_for_completion(p, &p->done_dma_rx);
++ if (ret)
+ goto stop_reset;
+- }
+ }
+
+ sh_msiof_write(p, IER, 0);
+@@ -1040,7 +1016,7 @@ static int sh_msiof_transfer_one(struct spi_master *master,
+ sh_msiof_spi_reset_regs(p);
+
+ /* setup clocks (clock already enabled in chipselect()) */
+- if (p->mode == SPI_MSIOF_MASTER)
++ if (!spi_controller_is_slave(p->master))
+ sh_msiof_spi_set_clk_regs(p, clk_get_rate(p->clk), t->speed_hz);
+
+ while (master->dma_tx && len > 15) {
+@@ -1071,7 +1047,7 @@ static int sh_msiof_transfer_one(struct spi_master *master,
+ copy32(p->tx_dma_page, tx_buf, l / 4);
+
+ #ifdef CONFIG_SPI_SH_MSIOF_TRANSFER_SYNC_DEBUG
+- if (p->mode == SPI_MSIOF_MASTER)
++ if (!spi_controller_is_slave(p->master))
+ msleep(TRANSFAR_SYNC_DELAY);
+ #endif /* CONFIG_SPI_SH_MSIOF_TRANSFER_SYNC_DEBUG */
+
+@@ -1148,9 +1124,8 @@ static int sh_msiof_transfer_one(struct spi_master *master,
+ words = len / bytes_per_word;
+
+ while (words > 0) {
+-
+ #ifdef CONFIG_SPI_SH_MSIOF_TRANSFER_SYNC_DEBUG
+- if (p->mode == SPI_MSIOF_MASTER)
++ if (!spi_controller_is_slave(p->master))
+ msleep(TRANSFAR_SYNC_DELAY);
+ #endif /* CONFIG_SPI_SH_MSIOF_TRANSFER_SYNC_DEBUG */
+
+@@ -1209,8 +1184,12 @@ static struct sh_msiof_spi_info *sh_msiof_spi_parse_dt(struct device *dev)
if (!info)
return NULL;
-+ if (of_property_read_bool(np, "slave"))
-+ info->mode = SPI_MSIOF_SLAVE;
-+ else
-+ info->mode = SPI_MSIOF_MASTER;
++ info->mode = of_property_read_bool(np, "spi-slave") ? MSIOF_SPI_SLAVE
++ : MSIOF_SPI_MASTER;
+
/* Parse the MSIOF properties */
- of_property_read_u32(np, "num-cs", &num_cs);
-+ if (info->mode == SPI_MSIOF_MASTER)
++ if (info->mode == MSIOF_SPI_MASTER)
+ of_property_read_u32(np, "num-cs", &num_cs);
of_property_read_u32(np, "renesas,tx-fifo-size",
&info->tx_fifo_override);
of_property_read_u32(np, "renesas,rx-fifo-size",
-@@ -1214,10 +1249,6 @@ static struct sh_msiof_spi_info *sh_msiof_spi_parse_dt(struct device *dev)
+@@ -1218,11 +1197,6 @@ static struct sh_msiof_spi_info *sh_msiof_spi_parse_dt(struct device *dev)
of_property_read_u32(np, "renesas,dtdl", &info->dtdl);
of_property_read_u32(np, "renesas,syncdl", &info->syncdl);
@@ -135,10 +376,11 @@ index 3281dc7..3b87024 100644
- info->mode = SPI_MSIOF_SLAVE;
- else
- info->mode = SPI_MSIOF_MASTER;
-
+-
info->num_chipselect = num_cs;
-@@ -1368,6 +1399,7 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)
+ return info;
+@@ -1372,6 +1346,7 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)
struct spi_master *master;
const struct sh_msiof_chipdata *chipdata;
const struct of_device_id *of_id;
@@ -146,7 +388,7 @@ index 3281dc7..3b87024 100644
struct sh_msiof_spi_priv *p;
struct clk *ref_clk;
u32 clk_rate = 0;
-@@ -1375,32 +1407,36 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)
+@@ -1379,32 +1354,35 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)
int ret;
const struct soc_device_attribute *attr;
@@ -175,11 +417,12 @@ index 3281dc7..3b87024 100644
- if (!p->info) {
+ if (!info) {
dev_err(&pdev->dev, "failed to obtain device info\n");
- ret = -ENXIO;
- goto err1;
+- ret = -ENXIO;
+- goto err1;
++ return -ENXIO;
}
-+ if (info->mode == SPI_MSIOF_SLAVE)
++ if (info->mode == MSIOF_SPI_SLAVE)
+ master = spi_alloc_slave(&pdev->dev,
+ sizeof(struct sh_msiof_spi_priv));
+ else
@@ -197,7 +440,7 @@ index 3281dc7..3b87024 100644
attr = soc_device_match(rcar_quirks_match);
if (attr)
p->quirks = (uintptr_t)attr->data;
-@@ -1458,6 +1494,7 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)
+@@ -1462,6 +1440,7 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)
master->num_chipselect = p->info->num_chipselect;
master->setup = sh_msiof_spi_setup;
master->prepare_message = sh_msiof_prepare_message;
@@ -205,5 +448,21 @@ index 3281dc7..3b87024 100644
master->bits_per_word_mask = SPI_BPW_RANGE_MASK(8, 32);
master->auto_runtime_pm = true;
master->transfer_one = sh_msiof_transfer_one;
+diff --git a/include/linux/spi/sh_msiof.h b/include/linux/spi/sh_msiof.h
+index f723aa4..f74b581 100644
+--- a/include/linux/spi/sh_msiof.h
++++ b/include/linux/spi/sh_msiof.h
+@@ -2,8 +2,8 @@
+ #define __SPI_SH_MSIOF_H__
+
+ enum {
+- SPI_MSIOF_MASTER,
+- SPI_MSIOF_SLAVE,
++ MSIOF_SPI_MASTER,
++ MSIOF_SPI_SLAVE,
+ };
+
+ struct sh_msiof_spi_info {
--
-1.7.10.4
+1.9.1
+