Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1568362

[PATCH v4 3/3] spi: acpi: Initialize modalias from of_compatible

Show all headers | View raw

From: Crestez Dan Leonard <leonard.crestez@intel.com>

When using devicetree spi_device.modalias is set to the compatible
string with the vendor prefix removed. For SPI devices described via
ACPI the spi_device.modalias string is initialized by acpi_device_hid.
When using ACPI and DT ids this string ends up something like "PRP0001".

Change acpi_register_spi_device to use the of_compatible property if
present. This makes it easier to instantiate spi drivers through ACPI
with DT ids.

Signed-off-by: Crestez Dan Leonard <leonard.crestez@intel.com>
Signed-off-by: Dan O'Donovan <dan@emutex.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Tested-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
---
 drivers/spi/spi.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 656dd3e..9a8c880 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1722,13 +1722,20 @@ static acpi_status acpi_register_spi_device(struct spi_master *master,
 		return AE_OK;
 	}
 
+	/*
+	 * Populate modalias from compatible property if available,
+	 * otherwise use native ACPI information
+	 */
+	if (acpi_of_modalias(adev, spi->modalias, sizeof(spi->modalias)))
+		strlcpy(spi->modalias, acpi_device_hid(adev),
+			sizeof(spi->modalias));
+
 	if (spi->irq < 0)
 		spi->irq = acpi_dev_gpio_irq_get(adev, 0);
 
 	acpi_device_set_enumerated(adev);
 
 	adev->power.flags.ignore_parent = true;
-	strlcpy(spi->modalias, acpi_device_hid(adev), sizeof(spi->modalias));
 	if (spi_add_device(spi)) {
 		adev->power.flags.ignore_parent = false;
 		dev_err(&master->dev, "failed to add SPI device %s from ACPI\n",
-- 
2.7.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 0/3] Init device ids from ACPI of_compatible Dan O'Donovan <dan@emutex.com> - 2017-01-23 17:50 +0100
  [PATCH v3 1/3] ACPI / bus: Export acpi_of_modalias equiv of of_modalias_node Dan O'Donovan <dan@emutex.com> - 2017-01-23 17:50 +0100
  [PATCH v3 3/3] spi: acpi: Initialize modalias from of_compatible Dan O'Donovan <dan@emutex.com> - 2017-01-23 17:50 +0100
    Re: [PATCH v3 3/3] spi: acpi: Initialize modalias from of_compatible Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-01-23 18:20 +0100
      Re: [PATCH v3 3/3] spi: acpi: Initialize modalias from of_compatible Dan O'Donovan <dan@emutex.com> - 2017-01-27 12:20 +0100
        Re: [PATCH v3 3/3] spi: acpi: Initialize modalias from of_compatible Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-01-27 15:00 +0100
    Re: [PATCH v3 3/3] spi: acpi: Initialize modalias from of_compatible "Rafael J. Wysocki" <rafael@kernel.org> - 2017-01-30 10:50 +0100
  Re: [PATCH v3 0/3] Init device ids from ACPI of_compatible Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-01-23 18:20 +0100
  Re: [PATCH v3 0/3] Init device ids from ACPI of_compatible Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-01-24 16:20 +0100
  Re: [PATCH v3 0/3] Init device ids from ACPI of_compatible Jarkko Nikula <jarkko.nikula@intel.com> - 2017-01-24 16:20 +0100
  [PATCH v4 0/3] Init device ids from ACPI of_compatible Dan O'Donovan <dan@emutex.com> - 2017-01-27 14:40 +0100
    [PATCH v4 1/3] ACPI / bus: Export acpi_of_modalias equiv of of_modalias_node Dan O'Donovan <dan@emutex.com> - 2017-01-27 14:40 +0100
    [PATCH v4 3/3] spi: acpi: Initialize modalias from of_compatible Dan O'Donovan <dan@emutex.com> - 2017-01-27 14:40 +0100
    [PATCH v4 2/3] i2c: acpi: Initialize info.type from of_compatible Dan O'Donovan <dan@emutex.com> - 2017-01-27 14:40 +0100
      Re: [PATCH v4 2/3] i2c: acpi: Initialize info.type from of_compatible Wolfram Sang <wsa@the-dreams.de> - 2017-01-28 22:40 +0100

csiph-web