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

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

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv50.c b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv50.c
index fba5b26..75640ab 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv50.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/nv50.c
@@ -21,113 +21,16 @@
  *
  * Authors: Ben Skeggs
  */
-#include "nv50.h"
-
-void
-nv50_i2c_drive_scl(struct nvkm_i2c_port *base, int state)
-{
-       struct nv50_i2c_priv *priv = (void *)nvkm_i2c(base);
-       struct nv50_i2c_port *port = (void *)base;
-       if (state) port->state |= 0x01;
-       else       port->state &= 0xfe;
-       nv_wr32(priv, port->addr, port->state);
-}
-
-void
-nv50_i2c_drive_sda(struct nvkm_i2c_port *base, int state)
-{
-       struct nv50_i2c_priv *priv = (void *)nvkm_i2c(base);
-       struct nv50_i2c_port *port = (void *)base;
-       if (state) port->state |= 0x02;
-       else       port->state &= 0xfd;
-       nv_wr32(priv, port->addr, port->state);
-}
-
-int
-nv50_i2c_sense_scl(struct nvkm_i2c_port *base)
-{
-       struct nv50_i2c_priv *priv = (void *)nvkm_i2c(base);
-       struct nv50_i2c_port *port = (void *)base;
-       return !!(nv_rd32(priv, port->addr) & 0x00000001);
-}
-
-int
-nv50_i2c_sense_sda(struct nvkm_i2c_port *base)
-{
-       struct nv50_i2c_priv *priv = (void *)nvkm_i2c(base);
-       struct nv50_i2c_port *port = (void *)base;
-       return !!(nv_rd32(priv, port->addr) & 0x00000002);
-}
+#include "priv.h"
+#include "pad.h"
 
 static const struct nvkm_i2c_func
-nv50_i2c_func = {
-       .drive_scl = nv50_i2c_drive_scl,
-       .drive_sda = nv50_i2c_drive_sda,
-       .sense_scl = nv50_i2c_sense_scl,
-       .sense_sda = nv50_i2c_sense_sda,
-};
-
-const u32 nv50_i2c_addr[] = {
-       0x00e138, 0x00e150, 0x00e168, 0x00e180,
-       0x00e254, 0x00e274, 0x00e764, 0x00e780,
-       0x00e79c, 0x00e7b8
+nv50_i2c = {
+       .pad_x_new = nv50_i2c_pad_new,
 };
-const int nv50_i2c_addr_nr = ARRAY_SIZE(nv50_i2c_addr);
-
-static int
-nv50_i2c_port_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
-                  struct nvkm_oclass *oclass, void *data, u32 index,
-                  struct nvkm_object **pobject)
-{
-       struct dcb_i2c_entry *info = data;
-       struct nv50_i2c_port *port;
-       int ret;
-
-       ret = nvkm_i2c_port_create(parent, engine, oclass, index,
-                                  &nvkm_i2c_bit_algo, &nv50_i2c_func, &port);
-       *pobject = nv_object(port);
-       if (ret)
-               return ret;
-
-       if (info->drive >= nv50_i2c_addr_nr)
-               return -EINVAL;
-
-       port->state = 0x00000007;
-       port->addr = nv50_i2c_addr[info->drive];
-       return 0;
-}
 
 int
-nv50_i2c_port_init(struct nvkm_object *object)
+nv50_i2c_new(struct nvkm_device *device, int index, struct nvkm_i2c **pi2c)
 {
-       struct nv50_i2c_priv *priv = (void *)nvkm_i2c(object);
-       struct nv50_i2c_port *port = (void *)object;
-       nv_wr32(priv, port->addr, port->state);
-       return nvkm_i2c_port_init(&port->base);
+       return nvkm_i2c_new_(&nv50_i2c, device, index, pi2c);
 }
-
-static struct nvkm_oclass
-nv50_i2c_sclass[] = {
-       { .handle = NV_I2C_TYPE_DCBI2C(DCB_I2C_NVIO_BIT),
-         .ofuncs = &(struct nvkm_ofuncs) {
-                 .ctor = nv50_i2c_port_ctor,
-                 .dtor = _nvkm_i2c_port_dtor,
-                 .init = nv50_i2c_port_init,
-                 .fini = _nvkm_i2c_port_fini,
-         },
-       },
-       {}
-};
-
-struct nvkm_oclass *
-nv50_i2c_oclass = &(struct nvkm_i2c_impl) {
-       .base.handle = NV_SUBDEV(I2C, 0x50),
-       .base.ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = _nvkm_i2c_ctor,
-               .dtor = _nvkm_i2c_dtor,
-               .init = _nvkm_i2c_init,
-               .fini = _nvkm_i2c_fini,
-       },
-       .sclass = nv50_i2c_sclass,
-       .pad_x = &nv04_i2c_pad_oclass,
-}.base;