Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82c2b5ed authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/gf117/i2c: no aux channels on this chipset 



Reported-by: default avatarMaarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 0946807a

drivers/gpu/drm/nouveau/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ nouveau-y += core/subdev/i2c/nv4e.o 
nouveau-y += core/subdev/i2c/nv50.o

nouveau-y += core/subdev/i2c/nv94.o

nouveau-y += core/subdev/i2c/nvd0.o

nouveau-y += core/subdev/i2c/gf117.o

nouveau-y += core/subdev/i2c/nve0.o

nouveau-y += core/subdev/ibus/nvc0.o

nouveau-y += core/subdev/ibus/nve0.o

drivers/gpu/drm/nouveau/core/engine/device/nvc0.c

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->cname = "GF117";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nvd0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nvd0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  gf117_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

		device->oclass[NVDEV_SUBDEV_MXM    ] = &nv50_mxm_oclass;

drivers/gpu/drm/nouveau/core/include/subdev/i2c.h

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ extern struct nouveau_oclass *nv4e_i2c_oclass; 
extern struct nouveau_oclass *nv50_i2c_oclass;

extern struct nouveau_oclass *nv94_i2c_oclass;

extern struct nouveau_oclass *nvd0_i2c_oclass;

extern struct nouveau_oclass *gf117_i2c_oclass;

extern struct nouveau_oclass *nve0_i2c_oclass;



static inline int

drivers/gpu/drm/nouveau/core/subdev/i2c/gf117.c

0 → 100644
+39 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2012 Red Hat Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 * Authors: Ben Skeggs

 */



#include "nv50.h"



struct nouveau_oclass *

gf117_i2c_oclass = &(struct nouveau_i2c_impl) {

	.base.handle = NV_SUBDEV(I2C, 0xd7),

	.base.ofuncs = &(struct nouveau_ofuncs) {

		.ctor = _nouveau_i2c_ctor,

		.dtor = _nouveau_i2c_dtor,

		.init = _nouveau_i2c_init,

		.fini = _nouveau_i2c_fini,

	},

	.sclass = nvd0_i2c_sclass,

	.pad_x = &nv04_i2c_pad_oclass,

	.pad_s = &nv04_i2c_pad_oclass,

}.base;