linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: rf@opensource.wolfsonmicro.com (Richard Fitzgerald)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ASoC: samsung-i2s: Add 192kHz config option
Date: Mon, 17 Nov 2014 10:57:54 +0000	[thread overview]
Message-ID: <1416221874-22092-1-git-send-email-rf@opensource.wolfsonmicro.com> (raw)

Adds QUIRK_SUPPORTS_192KHZ to allow 192kHz rate
to be selected for hardware that supports it.

Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
---
 .../devicetree/bindings/sound/samsung-i2s.txt      |    2 ++
 include/linux/platform_data/asoc-s3c.h             |    1 +
 sound/soc/samsung/i2s.c                            |    8 ++++++++
 3 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/Documentation/devicetree/bindings/sound/samsung-i2s.txt b/Documentation/devicetree/bindings/sound/samsung-i2s.txt
index d188296..c3f3950 100644
--- a/Documentation/devicetree/bindings/sound/samsung-i2s.txt
+++ b/Documentation/devicetree/bindings/sound/samsung-i2s.txt
@@ -40,6 +40,8 @@ Optional SoC Specific Properties:
   sub system(used in secondary sound source).
 - pinctrl-0: Should specify pin control groups used for this controller.
 - pinctrl-names: Should contain only one value - "default".
+- samsung,supports-192khz: specify this (without a value) if you want to allow
+    192000 sample rate over the I2S link.
 
 Example:
 
diff --git a/include/linux/platform_data/asoc-s3c.h b/include/linux/platform_data/asoc-s3c.h
index 5e0bc77..6d0702d 100644
--- a/include/linux/platform_data/asoc-s3c.h
+++ b/include/linux/platform_data/asoc-s3c.h
@@ -28,6 +28,7 @@ struct samsung_i2s {
 #define QUIRK_NEED_RSTCLR	(1 << 3)
 #define QUIRK_SUPPORTS_TDM	(1 << 4)
 #define QUIRK_SUPPORTS_IDMA	(1 << 5)
+#define QUIRK_SUPPORTS_192KHZ	(1 << 6)
 	/* Quirks of the I2S controller */
 	u32 quirks;
 	dma_addr_t idma_addr;
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 947352d..f688e89 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -1219,6 +1219,9 @@ static int samsung_i2s_probe(struct platform_device *pdev)
 						"specified");
 			}
 		}
+
+		if (of_find_property(np, "samsung,supports-192khz", NULL))
+			quirks |= QUIRK_SUPPORTS_192KHZ;
 	}
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -1247,6 +1250,11 @@ static int samsung_i2s_probe(struct platform_device *pdev)
 	if (quirks & QUIRK_PRI_6CHAN)
 		pri_dai->i2s_dai_drv.playback.channels_max = 6;
 
+	if (quirks & QUIRK_SUPPORTS_192KHZ) {
+		pri_dai->i2s_dai_drv.playback.rates |= SNDRV_PCM_RATE_192000;
+		pri_dai->i2s_dai_drv.capture.rates |= SNDRV_PCM_RATE_192000;
+	}
+
 	if (quirks & QUIRK_SEC_DAI) {
 		sec_dai = i2s_alloc_dai(pdev, true);
 		if (!sec_dai) {
-- 
1.7.2.5

             reply	other threads:[~2014-11-17 10:57 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-17 10:57 Richard Fitzgerald [this message]
2014-11-17 14:57 ` [PATCH] ASoC: samsung-i2s: Add 192kHz config option Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1416221874-22092-1-git-send-email-rf@opensource.wolfsonmicro.com \
    --to=rf@opensource.wolfsonmicro.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).