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

Commit a3a42460 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'spi/topic/cadence', 'spi/topic/dt',... 

Merge remote-tracking branches 'spi/topic/cadence', 'spi/topic/dt', 'spi/topic/ep93xx' and 'spi/topic/falcon' into spi-next
parents 45cfc32b 80274089 25c56c88 d9a01771 1a41aa13

drivers/spi/spi-cadence.c

+3 −1
Original line number Diff line number Diff line
@@ -576,10 +576,10 @@ static int cdns_spi_probe(struct platform_device *pdev) 
		goto clk_dis_apb;

	}



	pm_runtime_enable(&pdev->dev);

	pm_runtime_use_autosuspend(&pdev->dev);

	pm_runtime_set_autosuspend_delay(&pdev->dev, SPI_AUTOSUSPEND_TIMEOUT);

	pm_runtime_set_active(&pdev->dev);

	pm_runtime_enable(&pdev->dev);



	ret = of_property_read_u32(pdev->dev.of_node, "num-cs", &num_cs);

	if (ret < 0)
@@ -704,7 +704,9 @@ static int __maybe_unused cdns_spi_resume(struct device *dev) 
{

	struct platform_device *pdev = to_platform_device(dev);

	struct spi_master *master = platform_get_drvdata(pdev);

	struct cdns_spi *xspi = spi_master_get_devdata(master);



	cdns_spi_init_hw(xspi);

	return spi_master_resume(master);

}

drivers/spi/spi-ep93xx.c

+177 −324

File changed.

Preview size limit exceeded, changes collapsed.

drivers/spi/spi-falcon.c

+0 −5
Original line number Diff line number Diff line
@@ -395,11 +395,6 @@ static int falcon_sflash_probe(struct platform_device *pdev) 
	struct spi_master *master;

	int ret;



	if (ltq_boot_select() != BS_SPI) {

		dev_err(&pdev->dev, "invalid bootstrap options\n");

		return -ENODEV;

	}



	master = spi_alloc_master(&pdev->dev, sizeof(*priv));

	if (!master)

		return -ENOMEM;

drivers/spi/spi-orion.c

+2 −2
Original line number Diff line number Diff line
@@ -669,8 +669,8 @@ static int orion_spi_probe(struct platform_device *pdev) 
		status = of_property_read_u32(np, "reg", &cs);

		if (status) {

			dev_err(&pdev->dev,

				"%s has no valid 'reg' property (%d)\n",

				np->full_name, status);

				"%pOF has no valid 'reg' property (%d)\n",

				np, status);

			status = 0;

			continue;

		}

drivers/spi/spi.c

+11 −16
Original line number Diff line number Diff line
@@ -1587,8 +1587,8 @@ static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi, 


	if (spi_controller_is_slave(ctlr)) {

		if (strcmp(nc->name, "slave")) {

			dev_err(&ctlr->dev, "%s is not called 'slave'\n",

				nc->full_name);

			dev_err(&ctlr->dev, "%pOF is not called 'slave'\n",

				nc);

			return -EINVAL;

		}

		return 0;
@@ -1597,8 +1597,8 @@ static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi, 
	/* Device address */

	rc = of_property_read_u32(nc, "reg", &value);

	if (rc) {

		dev_err(&ctlr->dev, "%s has no valid 'reg' property (%d)\n",

			nc->full_name, rc);

		dev_err(&ctlr->dev, "%pOF has no valid 'reg' property (%d)\n",

			nc, rc);

		return rc;

	}

	spi->chip_select = value;
@@ -1607,8 +1607,7 @@ static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi, 
	rc = of_property_read_u32(nc, "spi-max-frequency", &value);

	if (rc) {

		dev_err(&ctlr->dev,

			"%s has no valid 'spi-max-frequency' property (%d)\n",

			nc->full_name, rc);

			"%pOF has no valid 'spi-max-frequency' property (%d)\n", nc, rc);

		return rc;

	}

	spi->max_speed_hz = value;
@@ -1625,8 +1624,7 @@ of_register_spi_device(struct spi_controller *ctlr, struct device_node *nc) 
	/* Alloc an spi_device */

	spi = spi_alloc_device(ctlr);

	if (!spi) {

		dev_err(&ctlr->dev, "spi_device alloc error for %s\n",

			nc->full_name);

		dev_err(&ctlr->dev, "spi_device alloc error for %pOF\n", nc);

		rc = -ENOMEM;

		goto err_out;

	}
@@ -1635,8 +1633,7 @@ of_register_spi_device(struct spi_controller *ctlr, struct device_node *nc) 
	rc = of_modalias_node(nc, spi->modalias,

				sizeof(spi->modalias));

	if (rc < 0) {

		dev_err(&ctlr->dev, "cannot find modalias for %s\n",

			nc->full_name);

		dev_err(&ctlr->dev, "cannot find modalias for %pOF\n", nc);

		goto err_out;

	}
@@ -1651,8 +1648,7 @@ of_register_spi_device(struct spi_controller *ctlr, struct device_node *nc) 
	/* Register the new device */

	rc = spi_add_device(spi);

	if (rc) {

		dev_err(&ctlr->dev, "spi_device register error %s\n",

			nc->full_name);

		dev_err(&ctlr->dev, "spi_device register error %pOF\n", nc);

		goto err_of_node_put;

	}
@@ -1686,8 +1682,7 @@ static void of_register_spi_devices(struct spi_controller *ctlr) 
		spi = of_register_spi_device(ctlr, nc);

		if (IS_ERR(spi)) {

			dev_warn(&ctlr->dev,

				 "Failed to create SPI device for %s\n",

				 nc->full_name);

				 "Failed to create SPI device for %pOF\n", nc);

			of_node_clear_flag(nc, OF_POPULATED);

		}

	}
@@ -3346,8 +3341,8 @@ static int of_spi_notify(struct notifier_block *nb, unsigned long action, 
		put_device(&ctlr->dev);



		if (IS_ERR(spi)) {

			pr_err("%s: failed to create for '%s'\n",

					__func__, rd->dn->full_name);

			pr_err("%s: failed to create for '%pOF'\n",

					__func__, rd->dn);

			of_node_clear_flag(rd->dn, OF_POPULATED);

			return notifier_from_errno(PTR_ERR(spi));

		}