diff --git a/sound/soc/tegra-alt/include/tegra210_ope_alt.h b/sound/soc/tegra-alt/include/tegra210_ope_alt.h
index 38476a2e..a717e1a1 100644
--- a/sound/soc/tegra-alt/include/tegra210_ope_alt.h
+++ b/sound/soc/tegra-alt/include/tegra210_ope_alt.h
@@ -1,7 +1,7 @@
 /*
  * tegra210_ope_alt.h - Definitions for Tegra210 OPE driver
  *
- * Copyright (c) 2014-2017 NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2018 NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -19,6 +19,8 @@
 #ifndef __TEGRA210_OPE_ALT_H__
 #define __TEGRA210_OPE_ALT_H__
 
+#include "tegra210_peq_alt.h"
+
 /* Register offsets from TEGRA210_OPE*_BASE */
 /*
  * OPE_AXBAR_RX registers are with respect to AXBAR.
@@ -87,12 +89,15 @@ struct tegra210_ope {
 	struct regmap *peq_regmap;
 	struct regmap *mbdrc_regmap;
 	const struct tegra210_ope_soc_data *soc_data;
+	u32 peq_biquad_gains[TEGRA210_PEQ_GAIN_PARAM_SIZE_PER_CH];
+	u32 peq_biquad_shifts[TEGRA210_PEQ_SHIFT_PARAM_SIZE_PER_CH];
 	bool is_shutdown;
 };
 
 extern int tegra210_peq_init(struct platform_device *pdev, int id);
 extern int tegra210_peq_codec_init(struct snd_soc_codec *codec);
-extern int tegra210_peq_hw_params(struct snd_soc_codec *codec);
+extern void tegra210_peq_restore(struct tegra210_ope *ope);
+extern void tegra210_peq_save(struct tegra210_ope *ope);
 extern int tegra210_mbdrc_init(struct platform_device *pdev, int id);
 extern int tegra210_mbdrc_codec_init(struct snd_soc_codec *codec);
 extern int tegra210_mbdrc_hw_params(struct snd_soc_codec *codec);
diff --git a/sound/soc/tegra-alt/tegra210_ope_alt.c b/sound/soc/tegra-alt/tegra210_ope_alt.c
index 1a93b738..68221c88 100644
--- a/sound/soc/tegra-alt/tegra210_ope_alt.c
+++ b/sound/soc/tegra-alt/tegra210_ope_alt.c
@@ -1,7 +1,7 @@
 /*
  * tegra210_ope_alt.c - Tegra210 OPE driver
  *
- * Copyright (c) 2014-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -49,6 +49,8 @@ static int tegra210_ope_runtime_suspend(struct device *dev)
 {
 	struct tegra210_ope *ope = dev_get_drvdata(dev);
 
+	tegra210_peq_save(ope);
+
 	regcache_cache_only(ope->mbdrc_regmap, true);
 	regcache_cache_only(ope->peq_regmap, true);
 	regcache_cache_only(ope->regmap, true);
@@ -71,6 +73,8 @@ static int tegra210_ope_runtime_resume(struct device *dev)
 		regcache_sync(ope->regmap);
 		regcache_sync(ope->peq_regmap);
 		regcache_sync(ope->mbdrc_regmap);
+
+		tegra210_peq_restore(ope);
 	}
 
 	return 0;
@@ -151,7 +155,6 @@ static int tegra210_ope_hw_params(struct snd_pcm_substream *substream,
 		return ret;
 	}
 
-	ope->soc_data->peq_soc_data.hw_params(dai->codec);
 	ope->soc_data->mbdrc_soc_data.hw_params(dai->codec);
 
 	return ret;
@@ -332,7 +335,6 @@ static const struct tegra210_ope_soc_data soc_data_tegra210 = {
 	.peq_soc_data = {
 		.init = tegra210_peq_init,
 		.codec_init = tegra210_peq_codec_init,
-		.hw_params = tegra210_peq_hw_params,
 	},
 	.mbdrc_soc_data = {
 		.init = tegra210_mbdrc_init,
diff --git a/sound/soc/tegra-alt/tegra210_peq_alt.c b/sound/soc/tegra-alt/tegra210_peq_alt.c
index e328e474..d021ebe1 100644
--- a/sound/soc/tegra-alt/tegra210_peq_alt.c
+++ b/sound/soc/tegra-alt/tegra210_peq_alt.c
@@ -1,7 +1,7 @@
 /*
  * tegra210_peq_alt.c - Tegra210 PEQ driver
  *
- * Copyright (c) 2014-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -281,35 +281,51 @@ static const struct regmap_config tegra210_peq_regmap_config = {
 	.cache_type = REGCACHE_FLAT,
 };
 
-int tegra210_peq_hw_params(struct snd_soc_codec *codec)
+void tegra210_peq_restore(struct tegra210_ope *ope)
 {
-	struct tegra210_ope *ope = snd_soc_codec_get_drvdata(codec);
-	u32 val = 0;
-	int i = 0;
-
-	regmap_read(ope->peq_regmap, TEGRA210_PEQ_CONFIG, &val);
-	if (!(val & TEGRA210_PEQ_CONFIG_MODE_ACTIVE))
-		return 0;
+	unsigned int i;
 
 	for (i = 0; i < TEGRA210_PEQ_MAX_CHANNELS; i++) {
 		tegra210_xbar_write_ahubram(ope->peq_regmap,
 			TEGRA210_PEQ_AHUBRAMCTL_CONFIG_RAM_CTRL,
 			TEGRA210_PEQ_AHUBRAMCTL_CONFIG_RAM_DATA,
 			(i * TEGRA210_PEQ_GAIN_PARAM_SIZE_PER_CH),
-			(u32 *)&biquad_init_gains,
+			(u32 *)&ope->peq_biquad_gains,
 			TEGRA210_PEQ_GAIN_PARAM_SIZE_PER_CH);
 
 		tegra210_xbar_write_ahubram(ope->peq_regmap,
 			TEGRA210_PEQ_AHUBRAMCTL_CONFIG_RAM_SHIFT_CTRL,
 			TEGRA210_PEQ_AHUBRAMCTL_CONFIG_RAM_SHIFT_DATA,
 			(i * TEGRA210_PEQ_SHIFT_PARAM_SIZE_PER_CH),
-			(u32 *)&biquad_init_shifts,
+			(u32 *)&ope->peq_biquad_shifts,
 			TEGRA210_PEQ_SHIFT_PARAM_SIZE_PER_CH);
 
 	}
-	return 0;
 }
-EXPORT_SYMBOL_GPL(tegra210_peq_hw_params);
+EXPORT_SYMBOL_GPL(tegra210_peq_restore);
+
+void tegra210_peq_save(struct tegra210_ope *ope)
+{
+	unsigned int i;
+
+	for (i = 0; i < TEGRA210_PEQ_MAX_CHANNELS; i++) {
+		tegra210_xbar_read_ahubram(ope->peq_regmap,
+			TEGRA210_PEQ_AHUBRAMCTL_CONFIG_RAM_CTRL,
+			TEGRA210_PEQ_AHUBRAMCTL_CONFIG_RAM_DATA,
+			(i * TEGRA210_PEQ_GAIN_PARAM_SIZE_PER_CH),
+			(u32 *)&ope->peq_biquad_gains,
+			TEGRA210_PEQ_GAIN_PARAM_SIZE_PER_CH);
+
+		tegra210_xbar_read_ahubram(ope->peq_regmap,
+			TEGRA210_PEQ_AHUBRAMCTL_CONFIG_RAM_SHIFT_CTRL,
+			TEGRA210_PEQ_AHUBRAMCTL_CONFIG_RAM_SHIFT_DATA,
+			(i * TEGRA210_PEQ_SHIFT_PARAM_SIZE_PER_CH),
+			(u32 *)&ope->peq_biquad_shifts,
+			TEGRA210_PEQ_SHIFT_PARAM_SIZE_PER_CH);
+
+	}
+}
+EXPORT_SYMBOL_GPL(tegra210_peq_save);
 
 int tegra210_peq_codec_init(struct snd_soc_codec *codec)
 {