summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/core/subdev/gpio/base.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-12-07 00:09:17 (GMT)
committerBen Skeggs <bskeggs@redhat.com>2012-12-23 12:59:27 (GMT)
commitd2bcea686f21e11415828fcca21a4eb200c6251f (patch)
treeec7877a2733c2ae117c81cac7af3123858d07696 /drivers/gpu/drm/nouveau/core/subdev/gpio/base.c
parentcaba557020d1e7cbb0dd21811e453589fb51ba53 (diff)
downloadlinux-fsl-qoriq-d2bcea686f21e11415828fcca21a4eb200c6251f.tar.xz
drm/nouveau/bios: update gpio parsing apis to match current design
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/subdev/gpio/base.c')
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/gpio/base.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/gpio/base.c b/drivers/gpu/drm/nouveau/core/subdev/gpio/base.c
index acf818c..39f267c 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/gpio/base.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/gpio/base.c
@@ -43,10 +43,15 @@ static int
nouveau_gpio_find(struct nouveau_gpio *gpio, int idx, u8 tag, u8 line,
struct dcb_gpio_func *func)
{
+ struct nouveau_bios *bios = nouveau_bios(gpio);
+ u8 ver, len;
+ u16 data;
+
if (line == 0xff && tag == 0xff)
return -EINVAL;
- if (!dcb_gpio_parse(nouveau_bios(gpio), idx, tag, line, func))
+ data = dcb_gpio_match(bios, idx, tag, line, &ver, &len, func);
+ if (data)
return 0;
/* Apple iMac G4 NV18 */