Merge remote-tracking branch 'spi/topic/tegra-slink' into spi-next (f88df3a7) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/spi/spi-tegra20-slink.c

+67 −72

Original line number	Diff line number	Diff line
		@@ -707,8 +707,7 @@ static void tegra_slink_deinit_dma_param(struct tegra_slink_data *tspi,
		}

		static int tegra_slink_start_transfer_one(struct spi_device *spi,
		struct spi_transfer *t, bool is_first_of_msg,
		bool is_single_xfer)
		struct spi_transfer *t)
		{
		struct tegra_slink_data *tspi = spi_master_get_devdata(spi->master);
		u32 speed;
		@@ -732,32 +731,12 @@ static int tegra_slink_start_transfer_one(struct spi_device *spi,
		tspi->curr_xfer = t;
		total_fifo_words = tegra_slink_calculate_curr_xfer_param(spi, tspi, t);

		if (is_first_of_msg) {
		tegra_slink_clear_status(tspi);

		command = tspi->def_command_reg;
		command \|= SLINK_BIT_LENGTH(bits_per_word - 1);
		command \|= SLINK_CS_SW \| SLINK_CS_VALUE;

		command2 = tspi->def_command2_reg;
		command2 \|= SLINK_SS_EN_CS(spi->chip_select);

		command &= ~SLINK_MODES;
		if (spi->mode & SPI_CPHA)
		command \|= SLINK_CK_SDA;

		if (spi->mode & SPI_CPOL)
		command \|= SLINK_IDLE_SCLK_DRIVE_HIGH;
		else
		command \|= SLINK_IDLE_SCLK_DRIVE_LOW;
		} else {
		command = tspi->command_reg;
		command &= ~SLINK_BIT_LENGTH(~0);
		command \|= SLINK_BIT_LENGTH(bits_per_word - 1);

		command2 = tspi->command2_reg;
		command2 &= ~(SLINK_RXEN \| SLINK_TXEN);
		}

		tegra_slink_writel(tspi, command, SLINK_COMMAND);
		tspi->command_reg = command;
		@@ -824,58 +803,72 @@ static int tegra_slink_setup(struct spi_device *spi)
		return 0;
		}

		static int tegra_slink_transfer_one_message(struct spi_master *master,
		static int tegra_slink_prepare_message(struct spi_master *master,
		struct spi_message *msg)
		{
		bool is_first_msg = true;
		int single_xfer;
		struct tegra_slink_data *tspi = spi_master_get_devdata(master);
		struct spi_transfer *xfer;
		struct spi_device *spi = msg->spi;
		int ret;

		msg->status = 0;
		msg->actual_length = 0;
		tegra_slink_clear_status(tspi);

		tspi->command_reg = tspi->def_command_reg;
		tspi->command_reg \|= SLINK_CS_SW \| SLINK_CS_VALUE;

		tspi->command2_reg = tspi->def_command2_reg;
		tspi->command2_reg \|= SLINK_SS_EN_CS(spi->chip_select);

		tspi->command_reg &= ~SLINK_MODES;
		if (spi->mode & SPI_CPHA)
		tspi->command_reg \|= SLINK_CK_SDA;

		if (spi->mode & SPI_CPOL)
		tspi->command_reg \|= SLINK_IDLE_SCLK_DRIVE_HIGH;
		else
		tspi->command_reg \|= SLINK_IDLE_SCLK_DRIVE_LOW;

		return 0;
		}

		static int tegra_slink_transfer_one(struct spi_master *master,
		struct spi_device *spi,
		struct spi_transfer *xfer)
		{
		struct tegra_slink_data *tspi = spi_master_get_devdata(master);
		int ret;

		single_xfer = list_is_singular(&msg->transfers);
		list_for_each_entry(xfer, &msg->transfers, transfer_list) {
		INIT_COMPLETION(tspi->xfer_completion);
		ret = tegra_slink_start_transfer_one(spi, xfer,
		is_first_msg, single_xfer);
		ret = tegra_slink_start_transfer_one(spi, xfer);
		if (ret < 0) {
		dev_err(tspi->dev,
		"spi can not start transfer, err %d\n", ret);
		goto exit;
		return ret;
		}
		is_first_msg = false;

		ret = wait_for_completion_timeout(&tspi->xfer_completion,
		SLINK_DMA_TIMEOUT);
		if (WARN_ON(ret == 0)) {
		dev_err(tspi->dev,
		"spi trasfer timeout, err %d\n", ret);
		ret = -EIO;
		goto exit;
		return -EIO;
		}

		if (tspi->tx_status \|\| tspi->rx_status) {
		dev_err(tspi->dev, "Error in Transfer\n");
		ret = -EIO;
		goto exit;
		}
		msg->actual_length += xfer->len;
		if (xfer->cs_change && xfer->delay_usecs) {
		tegra_slink_writel(tspi, tspi->def_command_reg,
		SLINK_COMMAND);
		udelay(xfer->delay_usecs);
		}
		if (tspi->tx_status)
		return tspi->tx_status;
		if (tspi->rx_status)
		return tspi->rx_status;

		return 0;
		}
		ret = 0;
		exit:

		static int tegra_slink_unprepare_message(struct spi_master *master,
		struct spi_message *msg)
		{
		struct tegra_slink_data *tspi = spi_master_get_devdata(master);

		tegra_slink_writel(tspi, tspi->def_command_reg, SLINK_COMMAND);
		tegra_slink_writel(tspi, tspi->def_command2_reg, SLINK_COMMAND2);
		msg->status = ret;
		spi_finalize_current_message(master);
		return ret;

		return 0;
		}

		static irqreturn_t handle_cpu_based_xfer(struct tegra_slink_data *tspi)
		@@ -1078,7 +1071,9 @@ static int tegra_slink_probe(struct platform_device *pdev)
		/* the spi->mode bits understood by this driver: */
		master->mode_bits = SPI_CPOL \| SPI_CPHA \| SPI_CS_HIGH;
		master->setup = tegra_slink_setup;
		master->transfer_one_message = tegra_slink_transfer_one_message;
		master->prepare_message = tegra_slink_prepare_message;
		master->transfer_one = tegra_slink_transfer_one;
		master->unprepare_message = tegra_slink_unprepare_message;
		master->auto_runtime_pm = true;
		master->num_chipselect = MAX_CHIP_SELECT;
		master->bus_num = -1;