diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-02-23 07:36:46 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-02-23 07:36:46 +0100 |
commit | fb86780bf7708cd6553f592a6318f10eda766127 (patch) | |
tree | b59737c56a407c9f82166576209ef8e8cd09ecc6 /drivers/spi/spi-atmel.c | |
parent | 8f8e2aec9944dd12671182a1a26b8e1a35872a1d (diff) | |
parent | dd71a17b1193dd4a4c35ecd0ba227aac3d110836 (diff) | |
download | linux-fb86780bf7708cd6553f592a6318f10eda766127.tar.bz2 |
Merge branch 'x86/urgent' into x86/platform, to queue up dependent patch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/spi/spi-atmel.c')
-rw-r--r-- | drivers/spi/spi-atmel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index aebad36391c9..8feac599e9ab 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c @@ -1571,6 +1571,7 @@ static int atmel_spi_probe(struct platform_device *pdev) as->use_cs_gpios = true; if (atmel_spi_is_v2(as) && + pdev->dev.of_node && !of_get_property(pdev->dev.of_node, "cs-gpios", NULL)) { as->use_cs_gpios = false; master->num_chipselect = 4; |