aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorwangyuhang <wangyuhang2014@gmail.com>2013-09-01 05:36:21 -0400
committerMark Brown <broonie@linaro.org>2013-09-01 08:45:14 -0400
commita110f93d8b4672c4ad18d911f62b9e861010e83b (patch)
tree18c131e27442012a89f88f5db880d95a60e4dc1f /drivers/spi
parenta822e99c70f448c4068ea85bb195dac0b2eb3afe (diff)
spi: quad: fix the name of DT property
spi: quad: fix the name of DT property in patch The previous property name spi-tx-nbits and spi-rx-nbits looks not human-readable. To make it consistent with other devices, using property name spi-tx-bus-width and spi-rx-bus-width instead of the previous one specify the number of data wires that spi controller will work in. Add the specification in spi-bus.txt. Signed-off-by: wangyuhang <wangyuhang2014@gmail.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 7557f611457f..0075318f4fa1 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -870,7 +870,7 @@ static void of_register_spi_devices(struct spi_master *master)
870 spi->mode |= SPI_3WIRE; 870 spi->mode |= SPI_3WIRE;
871 871
872 /* Device DUAL/QUAD mode */ 872 /* Device DUAL/QUAD mode */
873 prop = of_get_property(nc, "spi-tx-nbits", &len); 873 prop = of_get_property(nc, "spi-tx-bus-width", &len);
874 if (prop && len == sizeof(*prop)) { 874 if (prop && len == sizeof(*prop)) {
875 switch (be32_to_cpup(prop)) { 875 switch (be32_to_cpup(prop)) {
876 case SPI_NBITS_SINGLE: 876 case SPI_NBITS_SINGLE:
@@ -883,14 +883,14 @@ static void of_register_spi_devices(struct spi_master *master)
883 break; 883 break;
884 default: 884 default:
885 dev_err(&master->dev, 885 dev_err(&master->dev,
886 "spi-tx-nbits %d not supported\n", 886 "spi-tx-bus-width %d not supported\n",
887 be32_to_cpup(prop)); 887 be32_to_cpup(prop));
888 spi_dev_put(spi); 888 spi_dev_put(spi);
889 continue; 889 continue;
890 } 890 }
891 } 891 }
892 892
893 prop = of_get_property(nc, "spi-rx-nbits", &len); 893 prop = of_get_property(nc, "spi-rx-bus-width", &len);
894 if (prop && len == sizeof(*prop)) { 894 if (prop && len == sizeof(*prop)) {
895 switch (be32_to_cpup(prop)) { 895 switch (be32_to_cpup(prop)) {
896 case SPI_NBITS_SINGLE: 896 case SPI_NBITS_SINGLE:
@@ -903,7 +903,7 @@ static void of_register_spi_devices(struct spi_master *master)
903 break; 903 break;
904 default: 904 default:
905 dev_err(&master->dev, 905 dev_err(&master->dev,
906 "spi-rx-nbits %d not supported\n", 906 "spi-rx-bus-width %d not supported\n",
907 be32_to_cpup(prop)); 907 be32_to_cpup(prop));
908 spi_dev_put(spi); 908 spi_dev_put(spi);
909 continue; 909 continue;