Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86bf7255 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "spi: spi-geni-qcom: Add support to specify RT priority to framework"

parents 653305ee bf854fc3

Documentation/devicetree/bindings/spi/qcom,spi-geni-qcom.txt

+4 −0
Original line number Diff line number Diff line
@@ -25,6 +25,10 @@ Required properties: 
		     Documentation/devicetree/bindings/spi/spi-bus.txt

- qcom,wrapper-core: Wrapper QUPv3 core containing this SPI controller.



Optional properties:

- qcom,rt:	Specifies if the framework worker thread for this

		controller device should have "real-time" priority.



SPI slave nodes must be children of the SPI master node and can contain

properties described in Documentation/devicetree/bindings/spi/spi-bus.txt

drivers/spi/spi-geni-qcom.c

+6 −1
Original line number Diff line number Diff line
@@ -716,7 +716,7 @@ static int spi_geni_prepare_message(struct spi_master *spi, 
	if (mas->cur_xfer_mode == FIFO_MODE) {

		geni_se_select_mode(mas->base, FIFO_MODE);

		reinit_completion(&mas->xfer_done);

		setup_fifo_params(spi_msg->spi, spi);

		ret = setup_fifo_params(spi_msg->spi, spi);

	} else if (mas->cur_xfer_mode == GSI_DMA) {

		mas->num_tx_eot = 0;

		mas->num_rx_eot = 0;
@@ -1199,6 +1199,7 @@ static int spi_geni_probe(struct platform_device *pdev) 
	struct resource *res;

	struct platform_device *wrapper_pdev;

	struct device_node *wrapper_ph_node;

	bool rt_pri;



	spi = spi_alloc_master(&pdev->dev, sizeof(struct spi_geni_master));

	if (!spi) {
@@ -1293,6 +1294,10 @@ static int spi_geni_probe(struct platform_device *pdev) 
		goto spi_geni_probe_err;

	}



	rt_pri = of_property_read_bool(pdev->dev.of_node, "qcom,rt");

	if (rt_pri)

		spi->rt = true;



	geni_mas->phys_addr = res->start;

	geni_mas->size = resource_size(res);

	geni_mas->base = devm_ioremap(&pdev->dev, res->start,