]> git.baikalelectronics.ru Git - kernel.git/commit
spi: spi-ti-qspi: Fix FLEN and WLEN settings if bits_per_word is overridden
authorBen Hutchings <ben.hutchings@codethink.co.uk>
Tue, 12 Apr 2016 11:56:25 +0000 (12:56 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 13 Apr 2016 07:11:17 +0000 (08:11 +0100)
commit512818b4256bd80270d5afa196df2b6102cd333a
tree5f32e0ab21c2eb7d5edf8af95fd627ec62a5c5cd
parentc40b63c04950cd745a34a62bdf37894058201eab
spi: spi-ti-qspi: Fix FLEN and WLEN settings if bits_per_word is overridden

Each transfer can specify 8, 16 or 32 bits per word independently of
the default for the device being addressed.  However, currently we
calculate the number of words in the frame assuming that the word size
is the device default.

If multiple transfers in the same message have differing
bits_per_word, we bitwise-or the different values in the WLEN register
field.

Fix both of these.  Also rename 'frame_length' to 'frame_len_words' to
make clear that it's not a byte count like spi_message::frame_length.

Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
drivers/spi/spi-ti-qspi.c