lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 23 Jan 2017 16:08:57 +0000 From: Dan O'Donovan <dan@...tex.com> To: linux-acpi@...r.kernel.org, "Rafael J . Wysocki" <rjw@...ysocki.net>, Jarkko Nikula <jarkko.nikula@...el.com>, Mika Westerberg <mika.westerberg@...ux.intel.com>, Mark Brown <broonie@...nel.org> Cc: Len Brown <lenb@...nel.org>, linux-i2c@...r.kernel.org, Wolfram Sang <wsa@...-dreams.de>, linux-spi@...r.kernel.org, linux-kernel@...r.kernel.org, Dan O'Donovan <dan@...tex.com>, Crestez Dan Leonard <leonard.crestez@...el.com> Subject: [PATCH v3 3/3] spi: acpi: Initialize modalias from of_compatible From: Crestez Dan Leonard <leonard.crestez@...el.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@...el.com> Signed-off-by: Dan O'Donovan <dan@...tex.com> --- drivers/spi/spi.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 656dd3e..4b562e8 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1722,13 +1722,21 @@ 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 ((!adev->data.of_compatible) || + 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
Powered by blists - more mailing lists