Unverified Commit e83ba2e6 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mark Brown
Browse files

spi: cadence-xspi: Replace OF/ACPI specifics by agnostic APIs 



Replace OF/ACPI specific call to get matched driver data with
the agnostic one. This doesn't change functionality. While at
it, add missing property.h include, and drop now unneeded of.h.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://patch.msgid.link/20251129150704.3998301-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6f9e4740

drivers/spi/spi-cadence-xspi.c

+4 −7
Original line number Diff line number Diff line
@@ -11,9 +11,9 @@ 
#include <linux/iopoll.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/platform_device.h>

#include <linux/pm_runtime.h>

#include <linux/property.h>

#include <linux/spi/spi.h>

#include <linux/spi/spi-mem.h>

#include <linux/bitfield.h>
@@ -1143,12 +1143,9 @@ static int cdns_xspi_probe(struct platform_device *pdev) 
		SPI_MODE_0  | SPI_MODE_3;



	cdns_xspi = spi_controller_get_devdata(host);

	cdns_xspi->driver_data = of_device_get_match_data(dev);

	if (!cdns_xspi->driver_data) {

		cdns_xspi->driver_data = acpi_device_get_match_data(dev);

	cdns_xspi->driver_data = device_get_match_data(dev);

	if (!cdns_xspi->driver_data)

		return -ENODEV;

	}



	if (cdns_xspi->driver_data->mrvl_hw_overlay) {

		host->mem_ops = &marvell_xspi_mem_ops;