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

Commit 4511e8ef authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "spi: spi-geni-qcom: Set SPI gpios to sleep state conditionally"

parents 990c18a4 702018d9

drivers/spi/spi-geni-qcom.c

+9 −7
Original line number Diff line number Diff line
@@ -1506,12 +1506,17 @@ static int spi_geni_probe(struct platform_device *pdev) 
		goto spi_geni_probe_err;

	}



	geni_mas->disable_dma_mode = of_property_read_bool(pdev->dev.of_node,

			"qcom,disable-dma");

	if (!geni_mas->disable_dma_mode) {

		ret = pinctrl_select_state(rsc->geni_pinctrl,

					rsc->geni_gpio_sleep);

		if (ret) {

		dev_err(&pdev->dev, "Failed to set sleep configuration\n");

			dev_err(&pdev->dev,

					"Failed to set sleep configuration\n");

			goto spi_geni_probe_err;

		}

	}



	rsc->se_clk = devm_clk_get(&pdev->dev, "se-clk");

	if (IS_ERR(rsc->se_clk)) {
@@ -1594,9 +1599,6 @@ static int spi_geni_probe(struct platform_device *pdev) 
		spi->slave_abort = spi_slv_abort;

	}



	geni_mas->disable_dma_mode = of_property_read_bool(pdev->dev.of_node,

			"qcom,disable-dma");



	spi->mode_bits = (SPI_CPOL | SPI_CPHA | SPI_LOOP | SPI_CS_HIGH);

	spi->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32);

	spi->num_chipselect = SPI_NUM_CHIPSELECT;