These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / nouveau / nvkm / subdev / i2c / nv4e.c

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv4e.c b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv4e.c
index 046fe5e..6b762f7 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv4e.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv4e.c
@@ -22,99 +22,15 @@
  * Authors: Ben Skeggs
  */
 #include "priv.h"
-
-#include <subdev/vga.h>
-
-struct nv4e_i2c_priv {
-       struct nvkm_i2c base;
-};
-
-struct nv4e_i2c_port {
-       struct nvkm_i2c_port base;
-       u32 addr;
-};
-
-static void
-nv4e_i2c_drive_scl(struct nvkm_i2c_port *base, int state)
-{
-       struct nv4e_i2c_priv *priv = (void *)nvkm_i2c(base);
-       struct nv4e_i2c_port *port = (void *)base;
-       nv_mask(priv, port->addr, 0x2f, state ? 0x21 : 0x01);
-}
-
-static void
-nv4e_i2c_drive_sda(struct nvkm_i2c_port *base, int state)
-{
-       struct nv4e_i2c_priv *priv = (void *)nvkm_i2c(base);
-       struct nv4e_i2c_port *port = (void *)base;
-       nv_mask(priv, port->addr, 0x1f, state ? 0x11 : 0x01);
-}
-
-static int
-nv4e_i2c_sense_scl(struct nvkm_i2c_port *base)
-{
-       struct nv4e_i2c_priv *priv = (void *)nvkm_i2c(base);
-       struct nv4e_i2c_port *port = (void *)base;
-       return !!(nv_rd32(priv, port->addr) & 0x00040000);
-}
-
-static int
-nv4e_i2c_sense_sda(struct nvkm_i2c_port *base)
-{
-       struct nv4e_i2c_priv *priv = (void *)nvkm_i2c(base);
-       struct nv4e_i2c_port *port = (void *)base;
-       return !!(nv_rd32(priv, port->addr) & 0x00080000);
-}
+#include "pad.h"
 
 static const struct nvkm_i2c_func
-nv4e_i2c_func = {
-       .drive_scl = nv4e_i2c_drive_scl,
-       .drive_sda = nv4e_i2c_drive_sda,
-       .sense_scl = nv4e_i2c_sense_scl,
-       .sense_sda = nv4e_i2c_sense_sda,
+nv4e_i2c = {
+       .pad_x_new = nv4e_i2c_pad_new,
 };
 
-static int
-nv4e_i2c_port_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
-                  struct nvkm_oclass *oclass, void *data, u32 index,
-                  struct nvkm_object **pobject)
+int
+nv4e_i2c_new(struct nvkm_device *device, int index, struct nvkm_i2c **pi2c)
 {
-       struct dcb_i2c_entry *info = data;
-       struct nv4e_i2c_port *port;
-       int ret;
-
-       ret = nvkm_i2c_port_create(parent, engine, oclass, index,
-                                  &nvkm_i2c_bit_algo, &nv4e_i2c_func, &port);
-       *pobject = nv_object(port);
-       if (ret)
-               return ret;
-
-       port->addr = 0x600800 + info->drive;
-       return 0;
+       return nvkm_i2c_new_(&nv4e_i2c, device, index, pi2c);
 }
-
-static struct nvkm_oclass
-nv4e_i2c_sclass[] = {
-       { .handle = NV_I2C_TYPE_DCBI2C(DCB_I2C_NV4E_BIT),
-         .ofuncs = &(struct nvkm_ofuncs) {
-                 .ctor = nv4e_i2c_port_ctor,
-                 .dtor = _nvkm_i2c_port_dtor,
-                 .init = _nvkm_i2c_port_init,
-                 .fini = _nvkm_i2c_port_fini,
-         },
-       },
-       {}
-};
-
-struct nvkm_oclass *
-nv4e_i2c_oclass = &(struct nvkm_i2c_impl) {
-       .base.handle = NV_SUBDEV(I2C, 0x4e),
-       .base.ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = _nvkm_i2c_ctor,
-               .dtor = _nvkm_i2c_dtor,
-               .init = _nvkm_i2c_init,
-               .fini = _nvkm_i2c_fini,
-       },
-       .sclass = nv4e_i2c_sclass,
-       .pad_x = &nv04_i2c_pad_oclass,
-}.base;