Merge "spi: spi-geni-qcom : Don't configure SPI WORD LEN for SPI Slave" (c28abd88) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/spi/spi-geni-qcom.c

+12 −3

Original line number	Diff line number	Diff line
		@@ -283,6 +283,7 @@ static int get_spi_clk_cfg(u32 speed_hz, struct spi_geni_master *mas,
		static void spi_setup_word_len(struct spi_geni_master *mas, u32 mode,
		int bits_per_word)
		{
		struct spi_master *spi = get_spi_master(mas->dev);
		int pack_words = 1;
		bool msb_first = (mode & SPI_LSB_FIRST) ? false : true;
		u32 word_len = geni_read_reg(mas->base, SE_SPI_WORD_LEN);
		@@ -294,10 +295,18 @@ static void spi_setup_word_len(struct spi_geni_master *mas, u32 mode,
		*/
		if (!(mas->tx_fifo_width % bits_per_word))
		pack_words = mas->tx_fifo_width / bits_per_word;
		se_config_packing(mas->base, bits_per_word, pack_words, msb_first);

		/*
		* Don't configure SPI word length for SPI Slave it is an optional
		* property for SPI Slave. H/W will take care of SPI slave word
		* if SPI_SLAVE_EN bit is set.
		*/
		if (!spi->slave) {
		word_len &= ~WORD_LEN_MSK;
		word_len \|= ((bits_per_word - MIN_WORD_LEN) & WORD_LEN_MSK);
		se_config_packing(mas->base, bits_per_word, pack_words, msb_first);
		geni_write_reg(word_len, mas->base, SE_SPI_WORD_LEN);
		}
		se_get_packing_config(bits_per_word, pack_words, msb_first,
		&cfg0, &cfg1);
		GENI_SE_DBG(mas->ipc, false, mas->dev,