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

spi: nxp-fspi: Propagate fwnode in ACPI case as well 



Propagate fwnode of the ACPI device to the SPI controller Linux device.
Currently only OF case propagates fwnode to the controller.

While at it, replace several calls to dev_fwnode() with a single one
cached in a local variable, and unify checks for fwnode type by using
is_*_node() APIs.

Fixes: 55ab8487 ("spi: spi-nxp-fspi: Add ACPI support")
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarHaibo Chen <haibo.chen@nxp.com>
Link: https://patch.msgid.link/20251126202501.2319679-1-andriy.shevchenko@linux.intel.com


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

drivers/spi/spi-nxp-fspi.c

+5 −5
Original line number Diff line number Diff line
@@ -1287,7 +1287,7 @@ static int nxp_fspi_probe(struct platform_device *pdev) 
{

	struct spi_controller *ctlr;

	struct device *dev = &pdev->dev;

	struct device_node *np = dev->of_node;

	struct fwnode_handle *fwnode = dev_fwnode(dev);

	struct resource *res;

	struct nxp_fspi *f;

	int ret, irq;
@@ -1309,7 +1309,7 @@ static int nxp_fspi_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, f);



	/* find the resources - configuration register address space */

	if (is_acpi_node(dev_fwnode(f->dev)))

	if (is_acpi_node(fwnode))

		f->iobase = devm_platform_ioremap_resource(pdev, 0);

	else

		f->iobase = devm_platform_ioremap_resource_byname(pdev, "fspi_base");
@@ -1317,7 +1317,7 @@ static int nxp_fspi_probe(struct platform_device *pdev) 
		return PTR_ERR(f->iobase);



	/* find the resources - controller memory mapped space */

	if (is_acpi_node(dev_fwnode(f->dev)))

	if (is_acpi_node(fwnode))

		res = platform_get_resource(pdev, IORESOURCE_MEM, 1);

	else

		res = platform_get_resource_byname(pdev,
@@ -1330,7 +1330,7 @@ static int nxp_fspi_probe(struct platform_device *pdev) 
	f->memmap_phy_size = resource_size(res);



	/* find the clocks */

	if (dev_of_node(&pdev->dev)) {

	if (is_of_node(fwnode)) {

		f->clk_en = devm_clk_get(dev, "fspi_en");

		if (IS_ERR(f->clk_en))

			return PTR_ERR(f->clk_en);
@@ -1383,7 +1383,7 @@ static int nxp_fspi_probe(struct platform_device *pdev) 
	else

		ctlr->mem_caps = &nxp_fspi_mem_caps;



	ctlr->dev.of_node = np;

	device_set_node(&ctlr->dev, fwnode);



	ret = devm_add_action_or_reset(dev, nxp_fspi_cleanup, f);

	if (ret)