2 files changed, 17 insertions, 5 deletions

diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c
index fe4d9e3da793..6e5e369d9693 100644
--- a/sound/soc/fsl/fsl_spdif.c
+++ b/sound/soc/fsl/fsl_spdif.c
@@ -99,7 +99,7 @@ struct fsl_spdif_priv {
         struct platform_device *pdev;
         struct regmap *regmap;
         bool dpll_locked;
-        u16 txrate[SPDIF_TXRATE_MAX];
+        u32 txrate[SPDIF_TXRATE_MAX];
         u8 txclk_df[SPDIF_TXRATE_MAX];
         u8 sysclk_df[SPDIF_TXRATE_MAX];
         u8 txclk_src[SPDIF_TXRATE_MAX];
@@ -392,6 +392,14 @@ static int spdif_set_sample_rate(struct snd_pcm_substream *substream,
                 rate = SPDIF_TXRATE_48000;
                 csfs = IEC958_AES3_CON_FS_48000;
                 break;
+        case 96000:
+                rate = SPDIF_TXRATE_96000;
+                csfs = IEC958_AES3_CON_FS_96000;
+                break;
+        case 192000:
+                rate = SPDIF_TXRATE_192000;
+                csfs = IEC958_AES3_CON_FS_192000;
+                break;
         default:
                 dev_err(&pdev->dev, "unsupported sample rate %d\n", sample_rate);
                 return -EINVAL;
@@ -1044,7 +1052,7 @@ static u32 fsl_spdif_txclk_caldiv(struct fsl_spdif_priv *spdif_priv,
                                 struct clk *clk, u64 savesub,
                                 enum spdif_txrate index, bool round)
 {
-        const u32 rate[] = { 32000, 44100, 48000 };
+        const u32 rate[] = { 32000, 44100, 48000, 96000, 192000 };
         bool is_sysclk = clk == spdif_priv->sysclk;
         u64 rate_ideal, rate_actual, sub;
         u32 sysclk_dfmin, sysclk_dfmax;
@@ -1103,7 +1111,7 @@ out:
 static int fsl_spdif_probe_txclk(struct fsl_spdif_priv *spdif_priv,
                                 enum spdif_txrate index)
 {
-        const u32 rate[] = { 32000, 44100, 48000 };
+        const u32 rate[] = { 32000, 44100, 48000, 96000, 192000 };
         struct platform_device *pdev = spdif_priv->pdev;
         struct device *dev = &pdev->dev;
         u64 savesub = 100000, ret;
diff --git a/sound/soc/fsl/fsl_spdif.h b/sound/soc/fsl/fsl_spdif.h
index b13e30ea1c9e..00bd3514c610 100644
--- a/sound/soc/fsl/fsl_spdif.h
+++ b/sound/soc/fsl/fsl_spdif.h
@@ -166,8 +166,10 @@ enum spdif_txrate {
         SPDIF_TXRATE_32000 = 0,
         SPDIF_TXRATE_44100,
         SPDIF_TXRATE_48000,
+        SPDIF_TXRATE_96000,
+        SPDIF_TXRATE_192000,
 };
-#define SPDIF_TXRATE_MAX                (SPDIF_TXRATE_48000 + 1)
+#define SPDIF_TXRATE_MAX                (SPDIF_TXRATE_192000 + 1)
 
 
 #define SPDIF_CSTATUS_BYTE              6
@@ -177,7 +179,9 @@ enum spdif_txrate {
 
 #define FSL_SPDIF_RATES_PLAYBACK        (SNDRV_PCM_RATE_32000 | \
                                          SNDRV_PCM_RATE_44100 | \
-                                         SNDRV_PCM_RATE_48000)
+                                         SNDRV_PCM_RATE_48000 | \
+                                         SNDRV_PCM_RATE_96000 | \
+                                         SNDRV_PCM_RATE_192000)
 
 #define FSL_SPDIF_RATES_CAPTURE         (SNDRV_PCM_RATE_16000 | \
                                          SNDRV_PCM_RATE_32000 | \