summaryrefslogtreecommitdiff
path: root/nvkm/subdev/i2c/nv4e.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2014-12-05 12:03:55 +1000
committerBen Skeggs <bskeggs@redhat.com>2015-01-10 23:57:07 +1000
commit7101a897d09bf98a38bf7998295bc0a6070b4ab8 (patch)
tree419d7c4de17307df8f37a83f4fdec58f53c92132 /nvkm/subdev/i2c/nv4e.c
parent0f6561990f72040d69a3d8bf757769ec20f017ac (diff)
downloadnouveau-7101a897d09bf98a38bf7998295bc0a6070b4ab8.tar.gz
i2c: pad/ports do not have an engine
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'nvkm/subdev/i2c/nv4e.c')
-rw-r--r--nvkm/subdev/i2c/nv4e.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/nvkm/subdev/i2c/nv4e.c b/nvkm/subdev/i2c/nv4e.c
index f16c87ce5..0d783890f 100644
--- a/nvkm/subdev/i2c/nv4e.c
+++ b/nvkm/subdev/i2c/nv4e.c
@@ -38,7 +38,7 @@ struct nv4e_i2c_port {
static void
nv4e_i2c_drive_scl(struct nouveau_i2c_port *base, int state)
{
- struct nv4e_i2c_priv *priv = (void *)nv_object(base)->engine;
+ struct nv4e_i2c_priv *priv = (void *)nouveau_i2c(base);
struct nv4e_i2c_port *port = (void *)base;
nv_mask(priv, port->addr, 0x2f, state ? 0x21 : 0x01);
}
@@ -46,7 +46,7 @@ nv4e_i2c_drive_scl(struct nouveau_i2c_port *base, int state)
static void
nv4e_i2c_drive_sda(struct nouveau_i2c_port *base, int state)
{
- struct nv4e_i2c_priv *priv = (void *)nv_object(base)->engine;
+ struct nv4e_i2c_priv *priv = (void *)nouveau_i2c(base);
struct nv4e_i2c_port *port = (void *)base;
nv_mask(priv, port->addr, 0x1f, state ? 0x11 : 0x01);
}
@@ -54,7 +54,7 @@ nv4e_i2c_drive_sda(struct nouveau_i2c_port *base, int state)
static int
nv4e_i2c_sense_scl(struct nouveau_i2c_port *base)
{
- struct nv4e_i2c_priv *priv = (void *)nv_object(base)->engine;
+ struct nv4e_i2c_priv *priv = (void *)nouveau_i2c(base);
struct nv4e_i2c_port *port = (void *)base;
return !!(nv_rd32(priv, port->addr) & 0x00040000);
}
@@ -62,7 +62,7 @@ nv4e_i2c_sense_scl(struct nouveau_i2c_port *base)
static int
nv4e_i2c_sense_sda(struct nouveau_i2c_port *base)
{
- struct nv4e_i2c_priv *priv = (void *)nv_object(base)->engine;
+ struct nv4e_i2c_priv *priv = (void *)nouveau_i2c(base);
struct nv4e_i2c_port *port = (void *)base;
return !!(nv_rd32(priv, port->addr) & 0x00080000);
}