summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/core/subdev/gpio/nvd0.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-12-07 10:09:17 +1000
committerBen Skeggs <bskeggs@redhat.com>2012-12-23 22:59:27 +1000
commitd2bcea686f21e11415828fcca21a4eb200c6251f (patch)
treeec7877a2733c2ae117c81cac7af3123858d07696 /drivers/gpu/drm/nouveau/core/subdev/gpio/nvd0.c
parentcaba557020d1e7cbb0dd21811e453589fb51ba53 (diff)
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/nvd0.c')
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/gpio/nvd0.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/gpio/nvd0.c b/drivers/gpu/drm/nouveau/core/subdev/gpio/nvd0.c
index 8d18fcad26e..cda607f2423 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/gpio/nvd0.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/gpio/nvd0.c
@@ -33,11 +33,11 @@ nvd0_gpio_reset(struct nouveau_gpio *gpio)
{
struct nouveau_bios *bios = nouveau_bios(gpio);
struct nvd0_gpio_priv *priv = (void *)gpio;
+ u8 ver, len;
u16 entry;
- u8 ver;
int ent = -1;
- while ((entry = dcb_gpio_entry(bios, 0, ++ent, &ver))) {
+ while ((entry = dcb_gpio_entry(bios, 0, ++ent, &ver, &len))) {
u32 data = nv_ro32(bios, entry);
u8 line = (data & 0x0000003f);
u8 defs = !!(data & 0x00000080);