Merge branch 'feature/esp32h2_clock_basic_support' into 'master'
clk: Add basic clock support for esp32h2 Closes IDF-6265 and IDF-5973 See merge request espressif/esp-idf!21943
This commit is contained in:
@@ -55,8 +55,3 @@ PROVIDE ( esp_rom_spiflash_fix_dummylen = spi_dummy_len_fix );
|
||||
PROVIDE ( esp_rom_spiflash_set_drvs = SetSpiDrvs);
|
||||
PROVIDE ( esp_rom_spiflash_select_padsfunc = SelectSpiFunction );
|
||||
PROVIDE ( esp_rom_spiflash_common_cmd = SPI_Common_Command );
|
||||
|
||||
PROVIDE ( esp_rom_regi2c_read = rom_i2c_readReg );
|
||||
PROVIDE ( esp_rom_regi2c_read_mask = rom_i2c_readReg_Mask );
|
||||
PROVIDE ( esp_rom_regi2c_write = rom_i2c_writeReg );
|
||||
PROVIDE ( esp_rom_regi2c_write_mask = rom_i2c_writeReg_Mask );
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
#define REGI2C_SAR_I2C_DEVICE_EN (BIT(7) << 4)
|
||||
#define REGI2C_BBPLL_DEVICE_EN (BIT(5) << 4)
|
||||
#define REGI2C_BIAS_DEVICE_EN (BIT(4) << 4)
|
||||
#define REGI2C_DIG_REG_DEVICE_EN (BIT(8) << 4)
|
||||
#define REGI2C_PMU_DEVICE_EN (BIT(8) << 4)
|
||||
|
||||
#define REGI2C_RTC_BUSY (BIT(25))
|
||||
#define REGI2C_RTC_BUSY_M (BIT(25))
|
||||
@@ -58,8 +58,8 @@
|
||||
#define REGI2C_BIAS (0x6a)
|
||||
#define REGI2C_BIAS_HOSTID 0
|
||||
|
||||
#define REGI2C_DIG_REG (0x6d)
|
||||
#define REGI2C_DIG_REG_HOSTID 0
|
||||
#define REGI2C_PMU (0x6d)
|
||||
#define REGI2C_PMU_HOSTID 0
|
||||
|
||||
#define REGI2C_ULP_CAL (0x61)
|
||||
#define REGI2C_ULP_CAL_HOSTID 0
|
||||
@@ -82,8 +82,8 @@ static IRAM_ATTR void regi2c_enable_block(uint8_t block)
|
||||
case REGI2C_BIAS :
|
||||
REG_SET_BIT(I2C_MST_ANA_CONF2_REG, REGI2C_BIAS_DEVICE_EN);
|
||||
break;
|
||||
case REGI2C_DIG_REG:
|
||||
REG_SET_BIT(I2C_MST_ANA_CONF2_REG, REGI2C_DIG_REG_DEVICE_EN);
|
||||
case REGI2C_PMU :
|
||||
REG_SET_BIT(I2C_MST_ANA_CONF2_REG, REGI2C_PMU_DEVICE_EN);
|
||||
break;
|
||||
case REGI2C_ULP_CAL:
|
||||
REG_SET_BIT(I2C_MST_ANA_CONF2_REG, REGI2C_ULP_CAL_DEVICE_EN);
|
||||
@@ -105,8 +105,8 @@ static IRAM_ATTR void regi2c_disable_block(uint8_t block)
|
||||
case REGI2C_BIAS :
|
||||
REG_SET_BIT(I2C_MST_ANA_CONF2_REG, REGI2C_BIAS_DEVICE_EN);
|
||||
break;
|
||||
case REGI2C_DIG_REG:
|
||||
REG_SET_BIT(I2C_MST_ANA_CONF2_REG, REGI2C_DIG_REG_DEVICE_EN);
|
||||
case REGI2C_PMU:
|
||||
REG_SET_BIT(I2C_MST_ANA_CONF2_REG, REGI2C_PMU_DEVICE_EN);
|
||||
break;
|
||||
case REGI2C_ULP_CAL:
|
||||
REG_SET_BIT(I2C_MST_ANA_CONF2_REG, REGI2C_ULP_CAL_DEVICE_EN);
|
||||
|
||||
Reference in New Issue
Block a user