summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2014-02-13 10:18:15 +0800
committerMark Brown <broonie@linaro.org>2014-02-16 09:11:05 +0800
commitd31ad46f58e89fdb9f5b902aa7cc29689e123dde (patch)
treeddf0bd5c0064734181b14cce51a5affa2d555b6d /drivers/spi
parent7961656a6f11b69966500d7bd25273203fd930da (diff)
downloadop-kernel-dev-d31ad46f58e89fdb9f5b902aa7cc29689e123dde.zip
op-kernel-dev-d31ad46f58e89fdb9f5b902aa7cc29689e123dde.tar.gz
spi: sun6i: Fix define for SUN6I_TFR_CTL_CS_MASK
Current code in sun6i_spi_set_cs() actually clears CPHA and CPOL bits which is obvious wrong. The define for SUN6I_TFR_CTL_CS_MASK is wrong. Fix it. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-sun6i.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-sun6i.c b/drivers/spi/spi-sun6i.c
index 94d38d0..4b9ec08 100644
--- a/drivers/spi/spi-sun6i.c
+++ b/drivers/spi/spi-sun6i.c
@@ -36,8 +36,8 @@
#define SUN6I_TFR_CTL_CPHA BIT(0)
#define SUN6I_TFR_CTL_CPOL BIT(1)
#define SUN6I_TFR_CTL_SPOL BIT(2)
-#define SUN6I_TFR_CTL_CS_MASK 0x3
-#define SUN6I_TFR_CTL_CS(cs) (((cs) & SUN6I_TFR_CTL_CS_MASK) << 4)
+#define SUN6I_TFR_CTL_CS_MASK 0x30
+#define SUN6I_TFR_CTL_CS(cs) (((cs) << 4) & SUN6I_TFR_CTL_CS_MASK)
#define SUN6I_TFR_CTL_CS_MANUAL BIT(6)
#define SUN6I_TFR_CTL_CS_LEVEL BIT(7)
#define SUN6I_TFR_CTL_DHB BIT(8)
OpenPOWER on IntegriCloud