diff options
| author | Kamlakant Patel <kamlakant.patel@broadcom.com> | 2016-08-09 16:05:22 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-08-09 16:25:43 +0200 |
| commit | 097d06192caf6db29ff6b8a9117cfaf7a514821f (patch) | |
| tree | 622f4a2cccd51bd554a2222609c4fd4664807230 /drivers/spi/spi-xlp.c | |
| parent | Linux 4.8-rc1 (diff) | |
| download | linux-097d06192caf6db29ff6b8a9117cfaf7a514821f.tar.xz linux-097d06192caf6db29ff6b8a9117cfaf7a514821f.zip | |
spi: xlp: Add ACPI support for Vulcan SPI controller
Add ACPI support for SPI controller on Broadcom Vulcan ARM64.
Signed-off-by: Kamlakant Patel <kamlakant.patel@broadcom.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-xlp.c')
| -rw-r--r-- | drivers/spi/spi-xlp.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/spi/spi-xlp.c b/drivers/spi/spi-xlp.c index 8f04feca6ee3..4071a729eb2f 100644 --- a/drivers/spi/spi-xlp.c +++ b/drivers/spi/spi-xlp.c @@ -11,6 +11,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ +#include <linux/acpi.h> #include <linux/clk.h> #include <linux/kernel.h> #include <linux/module.h> @@ -405,8 +406,9 @@ static int xlp_spi_probe(struct platform_device *pdev) clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(clk)) { dev_err(&pdev->dev, "could not get spi clock\n"); - return -ENODEV; + return PTR_ERR(clk); } + xspi->spi_clk = clk_get_rate(clk); master = spi_alloc_master(&pdev->dev, 0); @@ -437,6 +439,14 @@ static int xlp_spi_probe(struct platform_device *pdev) return 0; } +#ifdef CONFIG_ACPI +static const struct acpi_device_id xlp_spi_acpi_match[] = { + { "BRCM900D", 0 }, + { }, +}; +MODULE_DEVICE_TABLE(acpi, xlp_spi_acpi_match); +#endif + static const struct of_device_id xlp_spi_dt_id[] = { { .compatible = "netlogic,xlp832-spi" }, { }, @@ -447,6 +457,7 @@ static struct platform_driver xlp_spi_driver = { .driver = { .name = "xlp-spi", .of_match_table = xlp_spi_dt_id, + .acpi_match_table = ACPI_PTR(xlp_spi_acpi_match), }, }; module_platform_driver(xlp_spi_driver); |