Merge branch 'bugfix/fix_s3_bbpll_cali_fail_bug' into 'master'

fix: fix s3 bbpll calibration fail bug

See merge request espressif/esp-idf!29101
This commit is contained in:
Jiang Jiang Jian 2024-03-14 10:42:57 +08:00
commit 7b86fe51fd

View File

@ -311,7 +311,7 @@ static inline __attribute__((always_inline)) void clk_ll_bbpll_set_config(uint32
uint8_t dr3;
uint8_t dchgp;
uint8_t dcur;
uint8_t dbias;
uint8_t dbias = 3;
if (pll_freq_mhz == CLK_LL_PLL_480M_FREQ_MHZ) {
/* Configure 480M PLL */
@ -323,7 +323,6 @@ static inline __attribute__((always_inline)) void clk_ll_bbpll_set_config(uint32
dr3 = 0;
dchgp = 5;
dcur = 3;
dbias = 2;
break;
case SOC_XTAL_FREQ_32M:
div_ref = 1;
@ -332,7 +331,6 @@ static inline __attribute__((always_inline)) void clk_ll_bbpll_set_config(uint32
dr3 = 1;
dchgp = 4;
dcur = 0;
dbias = 2;
break;
default:
div_ref = 0;
@ -341,7 +339,6 @@ static inline __attribute__((always_inline)) void clk_ll_bbpll_set_config(uint32
dr3 = 0;
dchgp = 5;
dcur = 3;
dbias = 2;
break;
}
REGI2C_WRITE(I2C_BBPLL, I2C_BBPLL_MODE_HF, 0x6B);
@ -355,7 +352,6 @@ static inline __attribute__((always_inline)) void clk_ll_bbpll_set_config(uint32
dr3 = 0;
dchgp = 5;
dcur = 3;
dbias = 2;
break;
case SOC_XTAL_FREQ_32M:
div_ref = 1;
@ -364,7 +360,6 @@ static inline __attribute__((always_inline)) void clk_ll_bbpll_set_config(uint32
dr3 = 0;
dchgp = 5;
dcur = 3;
dbias = 2;
break;
default:
div_ref = 0;
@ -373,7 +368,6 @@ static inline __attribute__((always_inline)) void clk_ll_bbpll_set_config(uint32
dr3 = 0;
dchgp = 5;
dcur = 3;
dbias = 2;
break;
}
REGI2C_WRITE(I2C_BBPLL, I2C_BBPLL_MODE_HF, 0x69);