From 45a9e9f4577cc7b6151966d1733dbc7e2e6cb304 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Tue, 13 May 2014 14:50:25 +1000
Subject: i2c/g94: add aux channel interrupt driver

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---
 nvkm/subdev/i2c/nv94.c | 33 +++++++++++++++++++++++++++++++++
 nvkm/subdev/i2c/nvd0.c |  3 +++
 nvkm/subdev/i2c/priv.h |  3 +++
 3 files changed, 39 insertions(+)

diff --git a/nvkm/subdev/i2c/nv94.c b/nvkm/subdev/i2c/nv94.c
index 900f464c..ec0bd68a 100644
--- a/nvkm/subdev/i2c/nv94.c
+++ b/nvkm/subdev/i2c/nv94.c
@@ -24,6 +24,36 @@
 
 #include "nv50.h"
 
+void
+nv94_aux_stat(struct nouveau_i2c *i2c, u32 *hi, u32 *lo, u32 *rq, u32 *tx)
+{
+	u32 intr = nv_rd32(i2c, 0x00e06c);
+	u32 stat = nv_rd32(i2c, 0x00e068) & intr, i;
+	for (i = 0, *hi = *lo = *rq = *tx = 0; i < 8; i++) {
+		if ((stat & (1 << (i * 4)))) *hi |= 1 << i;
+		if ((stat & (2 << (i * 4)))) *lo |= 1 << i;
+		if ((stat & (4 << (i * 4)))) *rq |= 1 << i;
+		if ((stat & (8 << (i * 4)))) *tx |= 1 << i;
+	}
+	nv_wr32(i2c, 0x00e06c, intr);
+}
+
+void
+nv94_aux_mask(struct nouveau_i2c *i2c, u32 type, u32 mask, u32 data)
+{
+	u32 temp = nv_rd32(i2c, 0x00e068), i;
+	for (i = 0; i < 8; i++) {
+		if (mask & (1 << i)) {
+			if (!(data & (1 << i))) {
+				temp &= ~(type << (i * 4));
+				continue;
+			}
+			temp |= type << (i * 4);
+		}
+	}
+	nv_wr32(i2c, 0x00e068, temp);
+}
+
 #define AUX_DBG(fmt, args...) nv_debug(aux, "AUXCH(%d): " fmt, ch, ##args)
 #define AUX_ERR(fmt, args...) nv_error(aux, "AUXCH(%d): " fmt, ch, ##args)
 
@@ -273,4 +303,7 @@ nv94_i2c_oclass = &(struct nouveau_i2c_impl) {
 		.fini = _nouveau_i2c_fini,
 	},
 	.sclass = nv94_i2c_sclass,
+	.aux = 4,
+	.aux_stat = nv94_aux_stat,
+	.aux_mask = nv94_aux_mask,
 }.base;
diff --git a/nvkm/subdev/i2c/nvd0.c b/nvkm/subdev/i2c/nvd0.c
index 5237906e..b0b8047f 100644
--- a/nvkm/subdev/i2c/nvd0.c
+++ b/nvkm/subdev/i2c/nvd0.c
@@ -106,4 +106,7 @@ nvd0_i2c_oclass = &(struct nouveau_i2c_impl) {
 		.fini = _nouveau_i2c_fini,
 	},
 	.sclass = nvd0_i2c_sclass,
+	.aux = 4,
+	.aux_stat = nv94_aux_stat,
+	.aux_mask = nv94_aux_mask,
 }.base;
diff --git a/nvkm/subdev/i2c/priv.h b/nvkm/subdev/i2c/priv.h
index 27b9a971..a835d9e9 100644
--- a/nvkm/subdev/i2c/priv.h
+++ b/nvkm/subdev/i2c/priv.h
@@ -73,4 +73,7 @@ struct nouveau_i2c_impl {
 	void (*aux_mask)(struct nouveau_i2c *, u32, u32, u32);
 };
 
+void nv94_aux_stat(struct nouveau_i2c *, u32 *, u32 *, u32 *, u32 *);
+void nv94_aux_mask(struct nouveau_i2c *, u32, u32, u32);
+
 #endif
-- 
cgit v1.2.3