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

Commit 29896178 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPI / SPI: Use parent's ACPI_HANDLE() in acpi_register_spi_devices() 



The ACPI handle of struct spi_master's dev member should not be
set, because this causes that struct spi_master to be associated
with the ACPI device node corresponding to its parent as the
second "physical_device", which is incorrect (this happens during
the registration of struct spi_master).  Consequently,
acpi_register_spi_devices() should use the ACPI handle of the
parent of the struct spi_master it is called for rather than that
struct spi_master's ACPI handle (which should be NULL).

Make that happen and modify the spi-pxa2xx driver, which currently is
the only driver for ACPI-enumerated SPI controller chips, not to set
the ACPI handle for the struct spi_master it creates.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 07961ac7

drivers/spi/spi-pxa2xx.c

+0 −1
Original line number Diff line number Diff line
@@ -1168,7 +1168,6 @@ static int pxa2xx_spi_probe(struct platform_device *pdev) 


	master->dev.parent = &pdev->dev;

	master->dev.of_node = pdev->dev.of_node;

	ACPI_HANDLE_SET(&master->dev, ACPI_HANDLE(&pdev->dev));

	/* the spi->mode bits understood by this driver: */

	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LOOP;

drivers/spi/spi.c

+1 −1
Original line number Diff line number Diff line
@@ -984,7 +984,7 @@ static void acpi_register_spi_devices(struct spi_master *master) 
	acpi_status status;

	acpi_handle handle;



	handle = ACPI_HANDLE(&master->dev);

	handle = ACPI_HANDLE(master->dev.parent);

	if (!handle)

		return;