Commit b5510d1e authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/i2c/gk110: split out from i2c/gk104 



No functional changes here yet.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent e05e06cd

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

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ int g94_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **); 
int gf117_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);

int gf119_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);

int gk104_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);

int gk110_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);

int gm200_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);



static inline int

drivers/gpu/drm/nouveau/nvkm/engine/device/base.c

+6 −6
Original line number Diff line number Diff line
@@ -1815,7 +1815,7 @@ nvf0_chipset = { 
	.fb = gk110_fb_new,

	.fuse = gf100_fuse_new,

	.gpio = gk104_gpio_new,

	.i2c = gk104_i2c_new,

	.i2c = gk110_i2c_new,

	.ibus = gk104_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,
@@ -1853,7 +1853,7 @@ nvf1_chipset = { 
	.fb = gk110_fb_new,

	.fuse = gf100_fuse_new,

	.gpio = gk104_gpio_new,

	.i2c = gk104_i2c_new,

	.i2c = gk110_i2c_new,

	.ibus = gk104_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,
@@ -1891,7 +1891,7 @@ nv106_chipset = { 
	.fb = gk110_fb_new,

	.fuse = gf100_fuse_new,

	.gpio = gk104_gpio_new,

	.i2c = gk104_i2c_new,

	.i2c = gk110_i2c_new,

	.ibus = gk104_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,
@@ -1929,7 +1929,7 @@ nv108_chipset = { 
	.fb = gk110_fb_new,

	.fuse = gf100_fuse_new,

	.gpio = gk104_gpio_new,

	.i2c = gk104_i2c_new,

	.i2c = gk110_i2c_new,

	.ibus = gk104_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,
@@ -1967,7 +1967,7 @@ nv117_chipset = { 
	.fb = gm107_fb_new,

	.fuse = gm107_fuse_new,

	.gpio = gk104_gpio_new,

	.i2c = gk104_i2c_new,

	.i2c = gk110_i2c_new,

	.ibus = gk104_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,
@@ -2003,7 +2003,7 @@ nv118_chipset = { 
	.fb = gm107_fb_new,

	.fuse = gm107_fuse_new,

	.gpio = gk104_gpio_new,

	.i2c = gk104_i2c_new,

	.i2c = gk110_i2c_new,

	.ibus = gk104_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,

drivers/gpu/drm/nouveau/nvkm/subdev/i2c/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ nvkm-y += nvkm/subdev/i2c/g94.o 
nvkm-y += nvkm/subdev/i2c/gf117.o

nvkm-y += nvkm/subdev/i2c/gf119.o

nvkm-y += nvkm/subdev/i2c/gk104.o

nvkm-y += nvkm/subdev/i2c/gk110.o

nvkm-y += nvkm/subdev/i2c/gm200.o



nvkm-y += nvkm/subdev/i2c/pad.o

drivers/gpu/drm/nouveau/nvkm/subdev/i2c/gk110.c

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

 * Copyright 2021 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.

 */

#include "priv.h"

#include "pad.h"



static const struct nvkm_i2c_func

gk110_i2c = {

	.pad_x_new = gf119_i2c_pad_x_new,

	.pad_s_new = gf119_i2c_pad_s_new,

	.aux = 4,

	.aux_stat = gk104_aux_stat,

	.aux_mask = gk104_aux_mask,

};



int

gk110_i2c_new(struct nvkm_device *device, int index, struct nvkm_i2c **pi2c)

{

	return nvkm_i2c_new_(&gk110_i2c, device, index, pi2c);

}