ACPI / spi: attach GPIO IRQ from ACPI description to SPI device

cricard13 · rafaeljw · commit 33ada67da352 · 2016-01-01T03:20:25.000+01:00
spi-&gt;irq was ignoring GpioInt property setting it to -1.
acpi_dev_gpio_irq_get returns and configure the slave IRQ according to
the ACPI slave node description.

It is now inline with devicetree behavior.

Acked-by: Mark Brown &lt;broonie@kernel.org&gt;
Signed-off-by: Christophe Ricard &lt;christophe-h.ricard@st.com&gt;
Acked-by: Mika Westerberg &lt;mika.westerberg@linux.intel.com&gt;
Signed-off-by: Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
@@ -1623,6 +1623,9 @@ static acpi_status acpi_spi_add_device(acpi_handle handle, u32 level,
 		return AE_OK;
 	}
 
+	if (spi->irq < 0)
+		spi->irq = acpi_dev_gpio_irq_get(adev, 0);
+
 	adev->power.flags.ignore_parent = true;
 	strlcpy(spi->modalias, acpi_device_hid(adev), sizeof(spi->modalias));
 	if (spi_add_device(spi)) {

Original file line number	Diff line number	Diff line change
`@@ -1623,6 +1623,9 @@ static acpi_status acpi_spi_add_device(acpi_handle handle, u32 level,`
`1623`	`1623`	`return AE_OK;`
`1624`	`1624`	`}`
`1625`	`1625`
	`1626`	`+ if (spi->irq < 0)`
	`1627`	`+ spi->irq = acpi_dev_gpio_irq_get(adev, 0);`
	`1628`	`+`
`1626`	`1629`	`adev->power.flags.ignore_parent = true;`
`1627`	`1630`	`strlcpy(spi->modalias, acpi_device_hid(adev), sizeof(spi->modalias));`
`1628`	`1631`	`if (spi_add_device(spi)) {`