All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/3] ALSA: hdspm - Add support for 128-192kHz WordClock input
@ 2013-05-31 10:57 Adrian Knoth
  2013-05-31 10:57 ` [PATCH 2/3] ALSA: hdspm - Refactor SS/DS/QS clock multiplier into function Adrian Knoth
  2013-05-31 13:09 ` [PATCH 1/3] ALSA: hdspm - Add support for 128-192kHz WordClock input Takashi Iwai
  0 siblings, 2 replies; 4+ messages in thread
From: Adrian Knoth @ 2013-05-31 10:57 UTC (permalink / raw)
  To: patch; +Cc: Adrian Knoth, alsa-devel

Allow WordClock input rates of 128, 176.4 and 192kHz.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>

diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index ef3cbc0..e070ea8 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -400,8 +400,8 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 
 #define HDSPM_wc_freq0 (1<<5)	/* input freq detected via autosync  */
 #define HDSPM_wc_freq1 (1<<6)	/* 001=32, 010==44.1, 011=48, */
-#define HDSPM_wc_freq2 (1<<7)	/* 100=64, 101=88.2, 110=96, */
-/* missing Bit   for               111=128, 1000=176.4, 1001=192 */
+#define HDSPM_wc_freq2 (1<<7)	/* 100=64, 101=88.2, 110=96, 111=128 */
+#define HDSPM_wc_freq3 0x800	/* 1000=176.4, 1001=192 */
 
 #define HDSPM_SyncRef0 0x10000  /* Sync Reference */
 #define HDSPM_SyncRef1 0x20000
@@ -412,13 +412,17 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
 
 #define HDSPM_wc_valid (HDSPM_wcLock|HDSPM_wcSync)
 
-#define HDSPM_wcFreqMask  (HDSPM_wc_freq0|HDSPM_wc_freq1|HDSPM_wc_freq2)
+#define HDSPM_wcFreqMask  (HDSPM_wc_freq0|HDSPM_wc_freq1|HDSPM_wc_freq2|\
+			    HDSPM_wc_freq3)
 #define HDSPM_wcFreq32    (HDSPM_wc_freq0)
 #define HDSPM_wcFreq44_1  (HDSPM_wc_freq1)
 #define HDSPM_wcFreq48    (HDSPM_wc_freq0|HDSPM_wc_freq1)
 #define HDSPM_wcFreq64    (HDSPM_wc_freq2)
 #define HDSPM_wcFreq88_2  (HDSPM_wc_freq0|HDSPM_wc_freq2)
 #define HDSPM_wcFreq96    (HDSPM_wc_freq1|HDSPM_wc_freq2)
+#define HDSPM_wcFreq128   (HDSPM_wc_freq0|HDSPM_wc_freq1|HDSPM_wc_freq2)
+#define HDSPM_wcFreq176_4 (HDSPM_wc_freq3)
+#define HDSPM_wcFreq192   (HDSPM_wc_freq0|HDSPM_wc_freq3)
 
 #define HDSPM_status1_F_0 0x0400000
 #define HDSPM_status1_F_1 0x0800000
@@ -1181,6 +1185,15 @@ static int hdspm_external_sample_rate(struct hdspm *hdspm)
 			case HDSPM_wcFreq96:
 				rate = 96000;
 				break;
+			case HDSPM_wcFreq128:
+				rate = 128000;
+				break;
+			case HDSPM_wcFreq176_4:
+				rate = 176400;
+				break;
+			case HDSPM_wcFreq192:
+				rate = 192000;
+				break;
 			default:
 				rate = 0;
 				break;
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH 2/3] ALSA: hdspm - Refactor SS/DS/QS clock multiplier into function
  2013-05-31 10:57 [PATCH 1/3] ALSA: hdspm - Add support for 128-192kHz WordClock input Adrian Knoth
@ 2013-05-31 10:57 ` Adrian Knoth
  2013-05-31 10:57   ` [PATCH 3/3] ALSA: hdspm - Allow SingleSpeed WordClock when in DS/QS mode Adrian Knoth
  2013-05-31 13:09 ` [PATCH 1/3] ALSA: hdspm - Add support for 128-192kHz WordClock input Takashi Iwai
  1 sibling, 1 reply; 4+ messages in thread
From: Adrian Knoth @ 2013-05-31 10:57 UTC (permalink / raw)
  To: patch; +Cc: Adrian Knoth, alsa-devel

When the DoubleSpeed or QuadSpeed bit is set, the SingleSpeed frequency
has to be multiplied accordingly. Since this functionality will be
required at least twice, refactor it into a separate function.

The second reference to the newly introduced hdspm_rate_multiplier()
will be in a separate commit.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>

diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index e070ea8..8eb2070 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -1091,6 +1091,26 @@ static int hdspm_round_frequency(int rate)
 		return 48000;
 }
 
+/* QS and DS rates normally can not be detected
+ * automatically by the card. Only exception is MADI
+ * in 96k frame mode.
+ *
+ * So if we read SS values (32 .. 48k), check for
+ * user-provided DS/QS bits in the control register
+ * and multiply the base frequency accordingly.
+ */
+static int hdspm_rate_multiplier(struct hdspm *hdspm, int rate)
+{
+	if (rate <= 48000) {
+		if (hdspm->control_register & HDSPM_QuadSpeed)
+			return rate * 4;
+		else if (hdspm->control_register &
+				HDSPM_DoubleSpeed)
+			return rate * 2;
+	};
+	return rate;
+}
+
 static int hdspm_tco_sync_check(struct hdspm *hdspm);
 static int hdspm_sync_in_sync_check(struct hdspm *hdspm);
 
@@ -1268,21 +1288,8 @@ static int hdspm_external_sample_rate(struct hdspm *hdspm)
 			}
 		}
 
-		/* QS and DS rates normally can not be detected
-		 * automatically by the card. Only exception is MADI
-		 * in 96k frame mode.
-		 *
-		 * So if we read SS values (32 .. 48k), check for
-		 * user-provided DS/QS bits in the control register
-		 * and multiply the base frequency accordingly.
-		 */
-		if (rate <= 48000) {
-			if (hdspm->control_register & HDSPM_QuadSpeed)
-				rate *= 4;
-			else if (hdspm->control_register &
-					HDSPM_DoubleSpeed)
-				rate *= 2;
-		}
+		rate = hdspm_rate_multiplier(hdspm, rate);
+
 		break;
 	}
 
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH 3/3] ALSA: hdspm - Allow SingleSpeed WordClock when in DS/QS mode
  2013-05-31 10:57 ` [PATCH 2/3] ALSA: hdspm - Refactor SS/DS/QS clock multiplier into function Adrian Knoth
@ 2013-05-31 10:57   ` Adrian Knoth
  0 siblings, 0 replies; 4+ messages in thread
From: Adrian Knoth @ 2013-05-31 10:57 UTC (permalink / raw)
  To: patch; +Cc: Adrian Knoth, alsa-devel

Similarly to MADI, WordClock can also be at SingleSpeed while the card
is actually working at twice or four times this rate. If so, multiply
the base rate accordingly.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>

diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index 8eb2070..bd50193 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -1225,7 +1225,7 @@ static int hdspm_external_sample_rate(struct hdspm *hdspm)
 		 */
 		if (rate != 0 &&
 		(status2 & HDSPM_SelSyncRefMask) == HDSPM_SelSyncRef_WORD)
-			return rate;
+			return hdspm_rate_multiplier(hdspm, rate);
 
 		/* maybe a madi input (which is taken if sel sync is madi) */
 		if (status & HDSPM_madiLock) {
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH 1/3] ALSA: hdspm - Add support for 128-192kHz WordClock input
  2013-05-31 10:57 [PATCH 1/3] ALSA: hdspm - Add support for 128-192kHz WordClock input Adrian Knoth
  2013-05-31 10:57 ` [PATCH 2/3] ALSA: hdspm - Refactor SS/DS/QS clock multiplier into function Adrian Knoth
@ 2013-05-31 13:09 ` Takashi Iwai
  1 sibling, 0 replies; 4+ messages in thread
From: Takashi Iwai @ 2013-05-31 13:09 UTC (permalink / raw)
  To: Adrian Knoth; +Cc: alsa-devel

At Fri, 31 May 2013 12:57:09 +0200,
Adrian Knoth wrote:
> 
> Allow WordClock input rates of 128, 176.4 and 192kHz.
> 
> Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>

Thanks, applied all three patches.


Takashi

> 
> diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
> index ef3cbc0..e070ea8 100644
> --- a/sound/pci/rme9652/hdspm.c
> +++ b/sound/pci/rme9652/hdspm.c
> @@ -400,8 +400,8 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
>  
>  #define HDSPM_wc_freq0 (1<<5)	/* input freq detected via autosync  */
>  #define HDSPM_wc_freq1 (1<<6)	/* 001=32, 010==44.1, 011=48, */
> -#define HDSPM_wc_freq2 (1<<7)	/* 100=64, 101=88.2, 110=96, */
> -/* missing Bit   for               111=128, 1000=176.4, 1001=192 */
> +#define HDSPM_wc_freq2 (1<<7)	/* 100=64, 101=88.2, 110=96, 111=128 */
> +#define HDSPM_wc_freq3 0x800	/* 1000=176.4, 1001=192 */
>  
>  #define HDSPM_SyncRef0 0x10000  /* Sync Reference */
>  #define HDSPM_SyncRef1 0x20000
> @@ -412,13 +412,17 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
>  
>  #define HDSPM_wc_valid (HDSPM_wcLock|HDSPM_wcSync)
>  
> -#define HDSPM_wcFreqMask  (HDSPM_wc_freq0|HDSPM_wc_freq1|HDSPM_wc_freq2)
> +#define HDSPM_wcFreqMask  (HDSPM_wc_freq0|HDSPM_wc_freq1|HDSPM_wc_freq2|\
> +			    HDSPM_wc_freq3)
>  #define HDSPM_wcFreq32    (HDSPM_wc_freq0)
>  #define HDSPM_wcFreq44_1  (HDSPM_wc_freq1)
>  #define HDSPM_wcFreq48    (HDSPM_wc_freq0|HDSPM_wc_freq1)
>  #define HDSPM_wcFreq64    (HDSPM_wc_freq2)
>  #define HDSPM_wcFreq88_2  (HDSPM_wc_freq0|HDSPM_wc_freq2)
>  #define HDSPM_wcFreq96    (HDSPM_wc_freq1|HDSPM_wc_freq2)
> +#define HDSPM_wcFreq128   (HDSPM_wc_freq0|HDSPM_wc_freq1|HDSPM_wc_freq2)
> +#define HDSPM_wcFreq176_4 (HDSPM_wc_freq3)
> +#define HDSPM_wcFreq192   (HDSPM_wc_freq0|HDSPM_wc_freq3)
>  
>  #define HDSPM_status1_F_0 0x0400000
>  #define HDSPM_status1_F_1 0x0800000
> @@ -1181,6 +1185,15 @@ static int hdspm_external_sample_rate(struct hdspm *hdspm)
>  			case HDSPM_wcFreq96:
>  				rate = 96000;
>  				break;
> +			case HDSPM_wcFreq128:
> +				rate = 128000;
> +				break;
> +			case HDSPM_wcFreq176_4:
> +				rate = 176400;
> +				break;
> +			case HDSPM_wcFreq192:
> +				rate = 192000;
> +				break;
>  			default:
>  				rate = 0;
>  				break;
> -- 
> 1.7.10.4
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-05-31 13:08 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-05-31 10:57 [PATCH 1/3] ALSA: hdspm - Add support for 128-192kHz WordClock input Adrian Knoth
2013-05-31 10:57 ` [PATCH 2/3] ALSA: hdspm - Refactor SS/DS/QS clock multiplier into function Adrian Knoth
2013-05-31 10:57   ` [PATCH 3/3] ALSA: hdspm - Allow SingleSpeed WordClock when in DS/QS mode Adrian Knoth
2013-05-31 13:09 ` [PATCH 1/3] ALSA: hdspm - Add support for 128-192kHz WordClock input Takashi Iwai

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.