Skip to content

[Backport v4.1-branch] drivers: gpio_adp5585: fix non-contiguous pin layout issue #91845

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

Merged
merged 2 commits into from
Jul 25, 2025
Merged

[Backport v4.1-branch] drivers: gpio_adp5585: fix non-contiguous pin layout issue #91845

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6329b6b
drivers: gpio_adp5585: fix non-contiguous pin layout issue
CkovMk May 29, 2025
b4b737a
drivers: gpio_adp5585: fix input register address
CkovMk Jun 9, 2025
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
13 changes: 8 additions & 5 deletions drivers/gpio/gpio_adp5585.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ static int gpio_adp5585_config(const struct device *dev, gpio_pin_t pin, gpio_fl
uint8_t reg_value;

/* ADP5585 has non-contiguous gpio pin layouts, account for this */
if ((pin & cfg->common.port_pin_mask) == 0) {
LOG_ERR("pin %d is invalid for this device", pin);
if ((BIT(pin) & cfg->common.port_pin_mask) == 0) {
return -ENOTSUP;
}

Expand Down Expand Up @@ -194,7 +193,7 @@ static int gpio_adp5585_port_read(const struct device *dev, gpio_port_value_t *v

/** Read Input Register */

uint8_t gpi_status_reg;
uint8_t gpi_status_reg = ADP5585_GPI_STATUS_A;
uint8_t gpi_status_buf[2];

ret = i2c_write_read_dt(&parent_cfg->i2c_bus, &gpi_status_reg, 1U,
Expand Down Expand Up @@ -225,6 +224,11 @@ static int gpio_adp5585_port_write(const struct device *dev, gpio_port_pins_t ma
uint8_t reg_value;
int ret;

/* ADP5585 has non-contiguous gpio pin layouts, account for this */
if ((mask & cfg->common.port_pin_mask) == 0) {
return -ENOTSUP;
}

/* Can't do I2C bus operations from an ISR */
if (k_is_in_isr()) {
return -EWOULDBLOCK;
Expand Down Expand Up @@ -288,8 +292,7 @@ static int gpio_adp5585_pin_interrupt_configure(const struct device *dev, gpio_p
}

/* ADP5585 has non-contiguous gpio pin layouts, account for this */
if ((pin & cfg->common.port_pin_mask) == 0) {
LOG_ERR("pin %d is invalid for this device", pin);
if ((BIT(pin) & cfg->common.port_pin_mask) == 0) {
return -ENOTSUP;
}

Expand Down
Loading