Unverified Commit 5ccd191c authored by Mark Brown's avatar Mark Brown
Browse files

RSPI driver support for RZ/G2L 

Merge series from Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>:

This patch series adds RSPI driver and dt binding support to RZ/G2L SoC.
parents 61f6e38a 1d734f59

Documentation/devicetree/bindings/spi/renesas,rspi.yaml

+3 −1
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ properties: 
          - enum:

              - renesas,rspi-r7s72100  # RZ/A1H

              - renesas,rspi-r7s9210   # RZ/A2

          - const: renesas,rspi-rz     # RZ/A

              - renesas,r9a07g044-rspi # RZ/G2{L,LC}

          - const: renesas,rspi-rz     # RZ/A and RZ/G2{L,LC}



      - items:

          - enum:
@@ -122,6 +123,7 @@ allOf: 
          contains:

            enum:

              - renesas,qspi

              - renesas,r9a07g044-rspi

    then:

      required:

        - resets

drivers/spi/spi-rspi.c

+26 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/dma-mapping.h>

#include <linux/of_device.h>

#include <linux/pm_runtime.h>

#include <linux/reset.h>

#include <linux/sh_dma.h>

#include <linux/spi/spi.h>

#include <linux/spi/rspi.h>
@@ -834,7 +835,7 @@ static int qspi_transfer_in(struct rspi_data *rspi, struct spi_transfer *xfer) 
	int ret;



	if (rspi->ctlr->can_dma && __rspi_can_dma(rspi, xfer)) {

		int ret = rspi_dma_transfer(rspi, NULL, &xfer->rx_sg);

		ret = rspi_dma_transfer(rspi, NULL, &xfer->rx_sg);

		if (ret != -EAGAIN)

			return ret;

	}
@@ -1225,8 +1226,14 @@ static const struct of_device_id rspi_of_match[] = { 


MODULE_DEVICE_TABLE(of, rspi_of_match);



static void rspi_reset_control_assert(void *data)

{

	reset_control_assert(data);

}



static int rspi_parse_dt(struct device *dev, struct spi_controller *ctlr)

{

	struct reset_control *rstc;

	u32 num_cs;

	int error;
@@ -1238,6 +1245,24 @@ static int rspi_parse_dt(struct device *dev, struct spi_controller *ctlr) 
	}



	ctlr->num_chipselect = num_cs;



	rstc = devm_reset_control_get_optional_exclusive(dev, NULL);

	if (IS_ERR(rstc))

		return dev_err_probe(dev, PTR_ERR(rstc),

					     "failed to get reset ctrl\n");



	error = reset_control_deassert(rstc);

	if (error) {

		dev_err(dev, "failed to deassert reset %d\n", error);

		return error;

	}



	error = devm_add_action_or_reset(dev, rspi_reset_control_assert, rstc);

	if (error) {

		dev_err(dev, "failed to register assert devm action, %d\n", error);

		return error;

	}



	return 0;

}

#else