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

drm/nouveau/i2c: start hiding subdev-internal interfaces 



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

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

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ gm100_identify(struct nouveau_device *device) 
		device->cname = "GM107";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nvd0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nvd0_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nve0_clock_oclass;

#if 0

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

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

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ nv04_identify(struct nouveau_device *device) 
	case 0x04:

		device->cname = "NV04";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv04_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;
@@ -65,7 +65,7 @@ nv04_identify(struct nouveau_device *device) 
	case 0x05:

		device->cname = "NV05";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv05_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

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

+8 −8
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ nv10_identify(struct nouveau_device *device) 
		device->cname = "NV10";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;
@@ -66,7 +66,7 @@ nv10_identify(struct nouveau_device *device) 
		device->cname = "NV15";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;
@@ -85,7 +85,7 @@ nv10_identify(struct nouveau_device *device) 
		device->cname = "NV16";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;
@@ -104,7 +104,7 @@ nv10_identify(struct nouveau_device *device) 
		device->cname = "nForce";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;
@@ -123,7 +123,7 @@ nv10_identify(struct nouveau_device *device) 
		device->cname = "NV11";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;
@@ -142,7 +142,7 @@ nv10_identify(struct nouveau_device *device) 
		device->cname = "NV17";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;
@@ -161,7 +161,7 @@ nv10_identify(struct nouveau_device *device) 
		device->cname = "nForce2";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;
@@ -180,7 +180,7 @@ nv10_identify(struct nouveau_device *device) 
		device->cname = "NV18";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

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

+4 −4
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ nv20_identify(struct nouveau_device *device) 
		device->cname = "NV20";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;
@@ -69,7 +69,7 @@ nv20_identify(struct nouveau_device *device) 
		device->cname = "NV25";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;
@@ -88,7 +88,7 @@ nv20_identify(struct nouveau_device *device) 
		device->cname = "NV28";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;
@@ -107,7 +107,7 @@ nv20_identify(struct nouveau_device *device) 
		device->cname = "NV2A";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;

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

+5 −5
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ nv30_identify(struct nouveau_device *device) 
		device->cname = "NV30";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;
@@ -69,7 +69,7 @@ nv30_identify(struct nouveau_device *device) 
		device->cname = "NV35";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;
@@ -88,7 +88,7 @@ nv30_identify(struct nouveau_device *device) 
		device->cname = "NV31";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;
@@ -108,7 +108,7 @@ nv30_identify(struct nouveau_device *device) 
		device->cname = "NV36";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;
@@ -128,7 +128,7 @@ nv30_identify(struct nouveau_device *device) 
		device->cname = "NV34";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv10_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] =  nv04_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv04_mc_oclass;