3 files changed, 29 insertions, 16 deletions
diff --git a/src/soc/mediatek/mt8183/include/soc/dramc_pi_api.h b/src/soc/mediatek/mt8183/include/soc/dramc_pi_api.h
index 23b5cf032c..a2ff08d1c3 100644
--- a/src/soc/mediatek/mt8183/include/soc/dramc_pi_api.h
+++ b/src/soc/mediatek/mt8183/include/soc/dramc_pi_api.h
@@ -85,8 +85,8 @@ enum {
 };
 
 enum {
-	SAVE_VALUE,
-	RESTORE_VALUE
+	DLL_MASTER = 0,
+	DLL_SLAVE,
 };
 
 struct reg_value {
@@ -94,6 +94,9 @@ struct reg_value {
 	u32 value;
 };
 
+#define _SELPH_DQS_BITS(l, h) ((l << 0) | (l << 4) | (l << 8) | (l << 12) | \
+			       (h << 16) | (h << 20) | (h << 24) | (h << 28))
+
 enum {
 	DQ_DIV_SHIFT = 3,
 	DQ_DIV_MASK = BIT(DQ_DIV_SHIFT) - 1,
@@ -103,30 +106,30 @@ enum {
 	DQS_DELAY_0P5T = 4,
 	DQS_DELAY = ((DQS_DELAY_2T << DQ_DIV_SHIFT) + DQS_DELAY_0P5T) << 5,
 
-	DQS_OEN_DELAY_2T = 3,
-	DQS_OEN_DELAY_0P5T = 1,
-
-	SELPH_DQS0 = (DQS_DELAY_2T << 0) | (DQS_DELAY_2T << 4) |
-		     (DQS_DELAY_2T << 8) | (DQS_DELAY_2T << 12) |
-		     (DQS_OEN_DELAY_2T << 16) | (DQS_OEN_DELAY_2T << 20) |
-		     (DQS_OEN_DELAY_2T << 24) | (DQS_OEN_DELAY_2T << 28),
-
-	SELPH_DQS1 = (DQS_DELAY_0P5T << 0) | (DQS_DELAY_0P5T << 4) |
-		     (DQS_DELAY_0P5T << 8) | (DQS_DELAY_0P5T << 12) |
-		     (DQS_OEN_DELAY_0P5T << 16) | (DQS_OEN_DELAY_0P5T << 20) |
-		     (DQS_OEN_DELAY_0P5T << 24) | (DQS_OEN_DELAY_0P5T << 28)
+	SELPH_DQS0 = _SELPH_DQS_BITS(0x3, 0x3),
+	SELPH_DQS1 = _SELPH_DQS_BITS(0x4, 0x1),
+	SELPH_DQS0_1600 = _SELPH_DQS_BITS(0x2, 0x1),
+	SELPH_DQS1_1600 = _SELPH_DQS_BITS(0x1, 0x6),
+	SELPH_DQS0_2400 = _SELPH_DQS_BITS(0x3, 0x2),
+	SELPH_DQS1_2400 = _SELPH_DQS_BITS(0x1, 0x6),
+	SELPH_DQS0_3600 = _SELPH_DQS_BITS(0x4, 0x3),
+	SELPH_DQS1_3600 = _SELPH_DQS_BITS(0x1, 0x6),
 };
 
 void dramc_get_rank_size(u64 *dram_rank_size);
 void dramc_runtime_config(void);
 void dramc_set_broadcast(u32 onoff);
 u32 dramc_get_broadcast(void);
-void dramc_init(void);
-void dramc_sw_impedance(const struct sdram_params *params);
+u8 get_freq_fsq(u8 freq_group);
+void dramc_init(const struct sdram_params *params, u8 freq_group);
+void dramc_sw_impedance_save_reg(u8 freq_group);
+void dramc_sw_impedance_cal(const struct sdram_params *params, u8 term_option);
 void dramc_apply_config_before_calibration(void);
 void dramc_apply_config_after_calibration(void);
 void dramc_calibrate_all_channels(const struct sdram_params *params);
 void dramc_hw_gating_onoff(u8 chn, bool onoff);
 void dramc_enable_phy_dcm(bool bEn);
+void dramc_mode_reg_write(u8 chn, u8 mr_idx, u8 value);
+void dramc_cke_fix_onoff(u8 chn, bool fix_on, bool fix_off);
 
 #endif /* _DRAMC_PI_API_MT8183_H */
diff --git a/src/soc/mediatek/mt8183/include/soc/dramc_register.h b/src/soc/mediatek/mt8183/include/soc/dramc_register.h
index f0720a7272..8bed1baef5 100644
--- a/src/soc/mediatek/mt8183/include/soc/dramc_register.h
+++ b/src/soc/mediatek/mt8183/include/soc/dramc_register.h
@@ -986,6 +986,8 @@ enum {
 	SPCMD_DQSGCNTRST_SHIFT = 9,
 	SPCMD_DQSGCNTEN_SHIFT = 8,
 	SPCMD_RDDQCEN_SHIFT = 7,
+	SPCMD_ZQLATEN_SHIFT = 6,
+	SPCMD_ZQCEN_SHIFT = 4,
 	SPCMD_MRWEN_SHIFT = 0,
 };
 
diff --git a/src/soc/mediatek/mt8183/include/soc/emi.h b/src/soc/mediatek/mt8183/include/soc/emi.h
index 2c04a50e9e..264d91869a 100644
--- a/src/soc/mediatek/mt8183/include/soc/emi.h
+++ b/src/soc/mediatek/mt8183/include/soc/emi.h
@@ -33,6 +33,14 @@ struct sdram_params {
 	u16 delay_cell_unit;
 };
 
+enum {
+	LP4X_DDR1600,
+	LP4X_DDR2400,
+	LP4X_DDR3200,
+	LP4X_DDR3600,
+	LP4X_DDRFREQ_MAX,
+};
+
 extern const u8 phy_mapping[CHANNEL_MAX][16];
 
 int complex_mem_test(u8 *start, unsigned int len);