Commit 909a0a18 authored by Jacopo Mondi's avatar Jacopo Mondi Committed by Mauro Carvalho Chehab

media: max9271: Fix GPIO enable/disable

Fix GPIO enable/disable operations which wrongly read the 0x0f register
to obtain the current mask of the enabled lines instead of using
the correct 0x0e register.

Also fix access to bit 0 of the register which is marked as reserved.

Fixes: 34009bff ("media: i2c: Add RDACM20 driver")
Signed-off-by: default avatarJacopo Mondi <jacopo+renesas@jmondi.org>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 0ae426eb
...@@ -223,12 +223,12 @@ int max9271_enable_gpios(struct max9271_device *dev, u8 gpio_mask) ...@@ -223,12 +223,12 @@ int max9271_enable_gpios(struct max9271_device *dev, u8 gpio_mask)
{ {
int ret; int ret;
ret = max9271_read(dev, 0x0f); ret = max9271_read(dev, 0x0e);
if (ret < 0) if (ret < 0)
return 0; return 0;
/* BIT(0) reserved: GPO is always enabled. */ /* BIT(0) reserved: GPO is always enabled. */
ret |= gpio_mask | BIT(0); ret |= (gpio_mask & ~BIT(0));
ret = max9271_write(dev, 0x0e, ret); ret = max9271_write(dev, 0x0e, ret);
if (ret < 0) { if (ret < 0) {
dev_err(&dev->client->dev, "Failed to enable gpio (%d)\n", ret); dev_err(&dev->client->dev, "Failed to enable gpio (%d)\n", ret);
...@@ -245,12 +245,12 @@ int max9271_disable_gpios(struct max9271_device *dev, u8 gpio_mask) ...@@ -245,12 +245,12 @@ int max9271_disable_gpios(struct max9271_device *dev, u8 gpio_mask)
{ {
int ret; int ret;
ret = max9271_read(dev, 0x0f); ret = max9271_read(dev, 0x0e);
if (ret < 0) if (ret < 0)
return 0; return 0;
/* BIT(0) reserved: GPO cannot be disabled */ /* BIT(0) reserved: GPO cannot be disabled */
ret &= (~gpio_mask | BIT(0)); ret &= ~(gpio_mask | BIT(0));
ret = max9271_write(dev, 0x0e, ret); ret = max9271_write(dev, 0x0e, ret);
if (ret < 0) { if (ret < 0) {
dev_err(&dev->client->dev, "Failed to disable gpio (%d)\n", ret); dev_err(&dev->client->dev, "Failed to disable gpio (%d)\n", ret);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment