From: Mark Brown <broonie(a)linaro.org>
All ASoC CODEC drivers that use SPI have now been converted to use regmap
so we can delete SND_SOC_SPI, preventing any new users being added.
Signed-off-by: Mark Brown <broonie(a)linaro.org>
---
include/sound/soc.h | 1 -
sound/soc/soc-io.c | 7 -------
2 files changed, 8 deletions(-)
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 21d025e..21038e0 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -356,7 +356,6 @@ extern struct snd_ac97_bus_ops *soc_ac97_ops;
enum snd_soc_control_type {
SND_SOC_I2C = 1,
- SND_SOC_SPI,
SND_SOC_REGMAP,
};
diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c
index aa886cc..3a0d99e 100644
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c
@@ -106,13 +106,6 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
break;
#endif
-#if IS_ENABLED(CONFIG_REGMAP_SPI)
- case SND_SOC_SPI:
- codec->control_data = regmap_init_spi(to_spi_device(codec->dev),
- &config);
- break;
-#endif
-
case SND_SOC_REGMAP:
/* Device has made its own regmap arrangements */
codec->using_regmap = true;
--
1.9.0.rc3
Patchset related to hibernation resume:
- enhancement to make the use of an existing resume file more general
Patch is based on the 3.13 tag. This was tested on a Beaglebone black
with partial hibernation support, also compiled for x86_64.
[PATCH v9 1/1] PM / Hibernate: use name_to_dev_t to parse resume
kernel/power/hibernate.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
Use name_to_dev_t to parse the /sys/power/resume file making the
syntax more flexible. It supports the previous use syntax
and additionally can support other formats such as
/dev/devicenode and UUID= formats.
By changing /sys/debug/resume to accept the same syntax as
the resume=device parameter, we can parse the resume=device
in the initrd init script and use the resume device directly
from the kernel command line.
Changes in v9:
--------------
* Dropped util changes based on feedback
* Reverted to special newline handling in resume_store
Changes in v8:
--------------
* Dropped cleanup checkpatch warnings in hibernate.c file
* Review comments for more compact checking in hibernate.c
Changes in v7:
--------------
* Switch to trim only one trailing newline if present using kstrdup_trimnl
* remove kstrimdup patch
* add kstrdup_trimnl patch
* Add clean up patch for kernel/power/hibernate.c checkpatch warnings
Changes in v6:
--------------
* Revert tricky / confusing while loop indexing
Changes in v5:
--------------
* Change kstrimdup to minimize allocated memory. Now allocates only
the memory needed for the string instead of using strim.
Changes in v4:
--------------
* Dropped name_to_dev_t rework in favor of adding kstrimdup
* adjusted resume_store
Changes in v3:
--------------
* Dropped documentation patch as it went in through trivial
* Added patch for name_to_dev_t to support directly parsing userspace
buffer
Changes in v2:
--------------
* Added check for null return of kstrndup in hibernate.c
Thanks,
Sebastian
