diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-05-13 15:30:15 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-06-11 16:02:07 +1000 |
| commit | 6bfa52ad8c0534da593af9ef993cad6964d0de09 (patch) | |
| tree | b6de2337f5790de0402372c7777f54e108fa13ed /nvkm/subdev/gpio | |
| parent | 64db56233cd5edc68bdb1c7084b7a4eaa0ead00f (diff) | |
| download | nouveau-6bfa52ad8c0534da593af9ef993cad6964d0de09.tar.gz | |
core: allow event source to handle multiple event types per index
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'nvkm/subdev/gpio')
| -rw-r--r-- | nvkm/subdev/gpio/base.c | 2 | ||||
| -rw-r--r-- | nvkm/subdev/gpio/nv10.c | 2 | ||||
| -rw-r--r-- | nvkm/subdev/gpio/nv50.c | 2 | ||||
| -rw-r--r-- | nvkm/subdev/gpio/nve0.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/nvkm/subdev/gpio/base.c b/nvkm/subdev/gpio/base.c index f572c2804..c2f074274 100644 --- a/nvkm/subdev/gpio/base.c +++ b/nvkm/subdev/gpio/base.c @@ -125,7 +125,7 @@ nouveau_gpio_create_(struct nouveau_object *parent, if (ret) return ret; - ret = nouveau_event_create(lines, &gpio->events); + ret = nouveau_event_create(1, lines, &gpio->events); if (ret) return ret; diff --git a/nvkm/subdev/gpio/nv10.c b/nvkm/subdev/gpio/nv10.c index 76d5d5465..c0eaa5cd9 100644 --- a/nvkm/subdev/gpio/nv10.c +++ b/nvkm/subdev/gpio/nv10.c @@ -93,7 +93,7 @@ nv10_gpio_intr(struct nouveau_subdev *subdev) for (i = 0; (hi | lo) && i < 32; i++) { if ((hi | lo) & (1 << i)) - nouveau_event_trigger(priv->base.events, i); + nouveau_event_trigger(priv->base.events, 1, i); } nv_wr32(priv, 0x001104, intr); diff --git a/nvkm/subdev/gpio/nv50.c b/nvkm/subdev/gpio/nv50.c index 2ef774731..06dde2fe6 100644 --- a/nvkm/subdev/gpio/nv50.c +++ b/nvkm/subdev/gpio/nv50.c @@ -112,7 +112,7 @@ nv50_gpio_intr(struct nouveau_subdev *subdev) for (i = 0; (hi | lo) && i < 32; i++) { if ((hi | lo) & (1 << i)) - nouveau_event_trigger(priv->base.events, i); + nouveau_event_trigger(priv->base.events, 1, i); } nv_wr32(priv, 0xe054, intr0); diff --git a/nvkm/subdev/gpio/nve0.c b/nvkm/subdev/gpio/nve0.c index 898862137..66a3a6c64 100644 --- a/nvkm/subdev/gpio/nve0.c +++ b/nvkm/subdev/gpio/nve0.c @@ -40,7 +40,7 @@ nve0_gpio_intr(struct nouveau_subdev *subdev) for (i = 0; (hi | lo) && i < 32; i++) { if ((hi | lo) & (1 << i)) - nouveau_event_trigger(priv->base.events, i); + nouveau_event_trigger(priv->base.events, 1, i); } nv_wr32(priv, 0xdc00, intr0); |