diff options
author | Rafał Miłecki <rafal@milecki.pl> | 2017-03-01 06:52:23 +0100 |
---|---|---|
committer | Rafał Miłecki <rafal@milecki.pl> | 2017-03-01 07:02:17 +0100 |
commit | 9209511d61fce02b0af48b44d963150e076e0f7e (patch) | |
tree | 2791f6e6e7370c8c977bd51e88bfe94eb9b5a022 /target/linux/bcm53xx/patches-4.4/083-0005-spi-bcm-qspi-fix-suspend-resume-ifdef.patch | |
parent | ebf846b00559a326d6ea5a1711d11335d89d1218 (diff) | |
download | upstream-9209511d61fce02b0af48b44d963150e076e0f7e.tar.gz upstream-9209511d61fce02b0af48b44d963150e076e0f7e.tar.bz2 upstream-9209511d61fce02b0af48b44d963150e076e0f7e.zip |
bcm53xx: backport Broadcom's iProc QSPI driver
This driver has been added instead of improving spi-bcm53xx. It has some
advantages: allows SPI speed control & hopefully doesn't have bug that
was stopping us from using multiple SPI messages for writing flash data.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/bcm53xx/patches-4.4/083-0005-spi-bcm-qspi-fix-suspend-resume-ifdef.patch')
-rw-r--r-- | target/linux/bcm53xx/patches-4.4/083-0005-spi-bcm-qspi-fix-suspend-resume-ifdef.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/target/linux/bcm53xx/patches-4.4/083-0005-spi-bcm-qspi-fix-suspend-resume-ifdef.patch b/target/linux/bcm53xx/patches-4.4/083-0005-spi-bcm-qspi-fix-suspend-resume-ifdef.patch new file mode 100644 index 0000000000..aad22d2ee8 --- /dev/null +++ b/target/linux/bcm53xx/patches-4.4/083-0005-spi-bcm-qspi-fix-suspend-resume-ifdef.patch @@ -0,0 +1,63 @@ +From a0319f8b12c0fb9800da61f4cba9bd6fd80e37a4 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann <arnd@arndb.de> +Date: Thu, 15 Sep 2016 17:46:53 +0200 +Subject: [PATCH] spi: bcm-qspi: fix suspend/resume #ifdef + +The two power management functions are define inside of an #ifdef +but referenced unconditionally, which is obviously broken when +CONFIG_PM_SLEEP is not set: + +drivers/spi/spi-bcm-qspi.c:1300:13: error: 'bcm_qspi_suspend' undeclared here (not in a function) +drivers/spi/spi-bcm-qspi.c:1301:13: error: 'bcm_qspi_resume' undeclared here (not in a function) + +This replaces the #ifdef with a __maybe_unused annotation that lets +the compiler figure out whether to drop the functions itself, +and uses SIMPLE_DEV_PM_OPS() to refer to the functions. + +This will also fill the freeze/thaw/poweroff/restore callback +pointers in addition to suspend/resume, but as far as I can tell, +this is what we want. + +Signed-off-by: Arnd Bergmann <arnd@arndb.de> +Fixes: fa236a7ef240 ("spi: bcm-qspi: Add Broadcom MSPI driver") +Signed-off-by: Mark Brown <broonie@kernel.org> +--- + drivers/spi/spi-bcm-qspi.c | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +--- a/drivers/spi/spi-bcm-qspi.c ++++ b/drivers/spi/spi-bcm-qspi.c +@@ -1268,8 +1268,7 @@ int bcm_qspi_remove(struct platform_devi + /* function to be called by SoC specific platform driver remove() */ + EXPORT_SYMBOL_GPL(bcm_qspi_remove); + +-#ifdef CONFIG_PM_SLEEP +-static int bcm_qspi_suspend(struct device *dev) ++static int __maybe_unused bcm_qspi_suspend(struct device *dev) + { + struct bcm_qspi *qspi = dev_get_drvdata(dev); + +@@ -1280,7 +1279,7 @@ static int bcm_qspi_suspend(struct devic + return 0; + }; + +-static int bcm_qspi_resume(struct device *dev) ++static int __maybe_unused bcm_qspi_resume(struct device *dev) + { + struct bcm_qspi *qspi = dev_get_drvdata(dev); + int ret = 0; +@@ -1293,12 +1292,9 @@ static int bcm_qspi_resume(struct device + + return ret; + } +-#endif /* CONFIG_PM_SLEEP */ + +-const struct dev_pm_ops bcm_qspi_pm_ops = { +- .suspend = bcm_qspi_suspend, +- .resume = bcm_qspi_resume, +-}; ++SIMPLE_DEV_PM_OPS(bcm_qspi_pm_ops, bcm_qspi_suspend, bcm_qspi_resume); ++ + /* pm_ops to be called by SoC specific platform driver */ + EXPORT_SYMBOL_GPL(bcm_qspi_pm_ops); + |