Merge branch 'parisc-4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[cascardo/linux.git] / drivers / spi / spi-xlp.c

diff --git a/drivers/spi/spi-xlp.c b/drivers/spi/spi-xlp.c
index 8f04fec..4071a72 100644 (file)
--- 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);