ALSA: hdspm - AES32: Enable TCO input in hdspm_external_sample_rate()

This patch adds support to read the TCO sample rate in
hdspm_external_sample_rate() on RME AES(32) cards.

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

1 files changed, 28 insertions, 9 deletions

diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index a9f4c7c4b6f4..80b2247dc8f9 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -1176,17 +1176,36 @@ static int hdspm_external_sample_rate(struct hdspm *hdspm)
                 timecode = hdspm_read(hdspm, HDSPM_timecodeRegister);
 
                 syncref = hdspm_autosync_ref(hdspm);
+                switch (syncref) {
+                case HDSPM_AES32_AUTOSYNC_FROM_WORD:
+                /* Check WC sync and get sample rate */
+                        if (hdspm_wc_sync_check(hdspm))
+                                return HDSPM_bit2freq(hdspm_get_wc_sample_rate(hdspm));
+                        break;
+
+                case HDSPM_AES32_AUTOSYNC_FROM_AES1:
+                case HDSPM_AES32_AUTOSYNC_FROM_AES2:
+                case HDSPM_AES32_AUTOSYNC_FROM_AES3:
+                case HDSPM_AES32_AUTOSYNC_FROM_AES4:
+                case HDSPM_AES32_AUTOSYNC_FROM_AES5:
+                case HDSPM_AES32_AUTOSYNC_FROM_AES6:
+                case HDSPM_AES32_AUTOSYNC_FROM_AES7:
+                case HDSPM_AES32_AUTOSYNC_FROM_AES8:
+                /* Check AES sync and get sample rate */
+                        if (hdspm_aes_sync_check(hdspm, syncref - HDSPM_AES32_AUTOSYNC_FROM_AES1))
+                                return HDSPM_bit2freq(hdspm_get_aes_sample_rate(hdspm,
+                                                        syncref - HDSPM_AES32_AUTOSYNC_FROM_AES1));
+                        break;
 
-                if (syncref == HDSPM_AES32_AUTOSYNC_FROM_WORD &&
-                                status & HDSPM_AES32_wcLock)
-                        return HDSPM_bit2freq((status >> HDSPM_AES32_wcFreq_bit) & 0xF);
 
-                if (syncref >= HDSPM_AES32_AUTOSYNC_FROM_AES1 &&
-                                syncref <= HDSPM_AES32_AUTOSYNC_FROM_AES8 &&
-                                status2 & (HDSPM_LockAES >>
-                                (syncref - HDSPM_AES32_AUTOSYNC_FROM_AES1)))
-                        return HDSPM_bit2freq((timecode >> (4*(syncref-HDSPM_AES32_AUTOSYNC_FROM_AES1))) & 0xF);
-                return 0;
+                case HDSPM_AES32_AUTOSYNC_FROM_TCO:
+                /* Check TCO sync and get sample rate */
+                        if (hdspm_tco_sync_check(hdspm))
+                                return HDSPM_bit2freq(hdspm_get_tco_sample_rate(hdspm));
+                        break;
+                default:
+                        return 0;
+                } /* end switch(syncref) */
                 break;
 
         case MADIface: