Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

drivers: i2c_dw: add devicetree property to offset clock settings #80181

Merged
merged 1 commit into from
Dec 16, 2024
+31 −24
Merged

drivers: i2c_dw: add devicetree property to offset clock settings #80181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 19 additions & 24 deletions drivers/i2c/i2c_dw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,6 +739,7 @@ static int i2c_dw_transfer(const struct device *dev, struct i2c_msg *msgs, uint8
static int i2c_dw_runtime_configure(const struct device *dev, uint32_t config)
{
struct i2c_dw_dev_config *const dw = dev->data;
const struct i2c_dw_rom_config *const rom = dev->config;
uint32_t value = 0U;
uint32_t rc = 0U;
uint32_t reg_base = get_regs(dev);
Expand All @@ -752,21 +753,19 @@ static int i2c_dw_runtime_configure(const struct device *dev, uint32_t config)
/* Following the directions on DW spec page 59, IC_SS_SCL_LCNT
* must have register values larger than IC_FS_SPKLEN + 7
*/
if (I2C_STD_LCNT <= (read_fs_spklen(reg_base) + 7)) {
value = I2C_STD_LCNT + rom->lcnt_offset;
if (value <= (read_fs_spklen(reg_base) + 7)) {
value = read_fs_spklen(reg_base) + 8;
} else {
value = I2C_STD_LCNT;
}

dw->lcnt = value;

/* Following the directions on DW spec page 59, IC_SS_SCL_HCNT
* must have register values larger than IC_FS_SPKLEN + 5
*/
if (I2C_STD_HCNT <= (read_fs_spklen(reg_base) + 5)) {
value = I2C_STD_HCNT + rom->hcnt_offset;
if (value <= (read_fs_spklen(reg_base) + 5)) {
value = read_fs_spklen(reg_base) + 6;
} else {
value = I2C_STD_HCNT;
}

dw->hcnt = value;
Expand All @@ -776,10 +775,9 @@ static int i2c_dw_runtime_configure(const struct device *dev, uint32_t config)
* Following the directions on DW spec page 59, IC_FS_SCL_LCNT
* must have register values larger than IC_FS_SPKLEN + 7
*/
if (I2C_FS_LCNT <= (read_fs_spklen(reg_base) + 7)) {
value = I2C_FS_LCNT + rom->lcnt_offset;
if (value <= (read_fs_spklen(reg_base) + 7)) {
value = read_fs_spklen(reg_base) + 8;
} else {
value = I2C_FS_LCNT;
}

dw->lcnt = value;
Expand All @@ -788,10 +786,9 @@ static int i2c_dw_runtime_configure(const struct device *dev, uint32_t config)
* Following the directions on DW spec page 59, IC_FS_SCL_HCNT
* must have register values larger than IC_FS_SPKLEN + 5
*/
if (I2C_FS_HCNT <= (read_fs_spklen(reg_base) + 5)) {
value = I2C_FS_HCNT + rom->hcnt_offset;
if (value <= (read_fs_spklen(reg_base) + 5)) {
value = read_fs_spklen(reg_base) + 6;
} else {
value = I2C_FS_HCNT;
}

dw->hcnt = value;
Expand All @@ -801,10 +798,9 @@ static int i2c_dw_runtime_configure(const struct device *dev, uint32_t config)
* Following the directions on DW spec page 59, IC_FS_SCL_LCNT
* must have register values larger than IC_FS_SPKLEN + 7
*/
if (I2C_FSP_LCNT <= (read_fs_spklen(reg_base) + 7)) {
value = I2C_FSP_LCNT + rom->lcnt_offset;
if (value <= (read_fs_spklen(reg_base) + 7)) {
value = read_fs_spklen(reg_base) + 8;
} else {
value = I2C_FSP_LCNT;
}

dw->lcnt = value;
Expand All @@ -813,28 +809,25 @@ static int i2c_dw_runtime_configure(const struct device *dev, uint32_t config)
* Following the directions on DW spec page 59, IC_FS_SCL_HCNT
* must have register values larger than IC_FS_SPKLEN + 5
*/
if (I2C_FSP_HCNT <= (read_fs_spklen(reg_base) + 5)) {
value = I2C_FSP_HCNT + rom->hcnt_offset;
if (value <= (read_fs_spklen(reg_base) + 5)) {
value = read_fs_spklen(reg_base) + 6;
} else {
value = I2C_FSP_HCNT;
}

dw->hcnt = value;
break;
case I2C_SPEED_HIGH:
if (dw->support_hs_mode) {
if (I2C_HS_LCNT <= (read_hs_spklen(reg_base) + 7)) {
value = I2C_HS_LCNT + rom->lcnt_offset;
if (value <= (read_hs_spklen(reg_base) + 7)) {
value = read_hs_spklen(reg_base) + 8;
} else {
value = I2C_HS_LCNT;
}

dw->lcnt = value;

if (I2C_HS_HCNT <= (read_hs_spklen(reg_base) + 5)) {
value = I2C_HS_HCNT + rom->hcnt_offset;
if (value <= (read_hs_spklen(reg_base) + 5)) {
value = read_hs_spklen(reg_base) + 6;
} else {
value = I2C_HS_HCNT;
}

dw->hcnt = value;
Expand Down Expand Up @@ -1215,6 +1208,8 @@ static int i2c_dw_initialize(const struct device *dev)
static const struct i2c_dw_rom_config i2c_config_dw_##n = { \
I2C_CONFIG_REG_INIT(n).config_func = i2c_config_##n, \
.bitrate = DT_INST_PROP(n, clock_frequency), \
.lcnt_offset = (int16_t)DT_INST_PROP_OR(n, lcnt_offset, 0), \
.hcnt_offset = (int16_t)DT_INST_PROP_OR(n, hcnt_offset, 0), \
RESET_DW_CONFIG(n) PINCTRL_DW_CONFIG(n) I2C_DW_INIT_PCIE(n) \
I2C_CONFIG_DMA_INIT(n)}; \
static struct i2c_dw_dev_config i2c_##n##_runtime; \
Expand Down
2 changes: 2 additions & 0 deletions drivers/i2c/i2c_dw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ struct i2c_dw_rom_config {
DEVICE_MMIO_ROM;
i2c_isr_cb_t config_func;
uint32_t bitrate;
int16_t lcnt_offset;
int16_t hcnt_offset;

#if defined(CONFIG_PINCTRL)
const struct pinctrl_dev_config *pcfg;
Expand Down
10 changes: 10 additions & 0 deletions dts/bindings/i2c/snps,designware-i2c.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,13 @@ include: [i2c-controller.yaml, pinctrl-device.yaml, pcie-device.yaml]
properties:
interrupts:
required: true

lcnt-offset:
type: int
description: |
A fixed offset to apply to the SCL lcnt setting.

hcnt-offset:
type: int
description: |
A fixed offset to apply to the SCL hcnt setting.
Loading