Commit 7356859a authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/gpio: split g92 class from nv50 



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

drivers/gpu/drm/nouveau/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ nouveau-y += core/subdev/fb/gddr5.o 
nouveau-y += core/subdev/gpio/base.o

nouveau-y += core/subdev/gpio/nv10.o

nouveau-y += core/subdev/gpio/nv50.o

nouveau-y += core/subdev/gpio/nv92.o

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

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

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

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

+11 −11
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ nv50_identify(struct nouveau_device *device) 
	case 0x92:

		device->cname = "G92";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv92_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv50_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nv84_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;
@@ -169,7 +169,7 @@ nv50_identify(struct nouveau_device *device) 
	case 0x94:

		device->cname = "G94";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv92_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nv84_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;
@@ -197,7 +197,7 @@ nv50_identify(struct nouveau_device *device) 
	case 0x96:

		device->cname = "G96";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv92_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nv84_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;
@@ -225,7 +225,7 @@ nv50_identify(struct nouveau_device *device) 
	case 0x98:

		device->cname = "G98";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv92_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nv84_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;
@@ -253,7 +253,7 @@ nv50_identify(struct nouveau_device *device) 
	case 0xa0:

		device->cname = "G200";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv92_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv50_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nv84_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;
@@ -281,7 +281,7 @@ nv50_identify(struct nouveau_device *device) 
	case 0xaa:

		device->cname = "MCP77/MCP78";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv92_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nvaa_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;
@@ -309,7 +309,7 @@ nv50_identify(struct nouveau_device *device) 
	case 0xac:

		device->cname = "MCP79/MCP7A";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv92_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] =  nvaa_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv84_therm_oclass;
@@ -337,7 +337,7 @@ nv50_identify(struct nouveau_device *device) 
	case 0xa3:

		device->cname = "GT215";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv92_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nva3_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;
@@ -367,7 +367,7 @@ nv50_identify(struct nouveau_device *device) 
	case 0xa5:

		device->cname = "GT216";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv92_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nva3_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;
@@ -396,7 +396,7 @@ nv50_identify(struct nouveau_device *device) 
	case 0xa8:

		device->cname = "GT218";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv92_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nva3_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;
@@ -425,7 +425,7 @@ nv50_identify(struct nouveau_device *device) 
	case 0xaf:

		device->cname = "MCP89";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv92_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nva3_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

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

+7 −7
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ nvc0_identify(struct nouveau_device *device) 
	case 0xc0:

		device->cname = "GF100";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv92_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;
@@ -92,7 +92,7 @@ nvc0_identify(struct nouveau_device *device) 
	case 0xc4:

		device->cname = "GF104";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv92_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;
@@ -124,7 +124,7 @@ nvc0_identify(struct nouveau_device *device) 
	case 0xc3:

		device->cname = "GF106";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv92_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;
@@ -155,7 +155,7 @@ nvc0_identify(struct nouveau_device *device) 
	case 0xce:

		device->cname = "GF114";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv92_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;
@@ -187,7 +187,7 @@ nvc0_identify(struct nouveau_device *device) 
	case 0xcf:

		device->cname = "GF116";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv92_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;
@@ -219,7 +219,7 @@ nvc0_identify(struct nouveau_device *device) 
	case 0xc1:

		device->cname = "GF108";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv92_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;
@@ -250,7 +250,7 @@ nvc0_identify(struct nouveau_device *device) 
	case 0xc8:

		device->cname = "GF110";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv50_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] =  nv92_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nv94_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nva3_therm_oclass;

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

+1 −14
Original line number Diff line number Diff line
@@ -31,22 +31,9 @@ nouveau_gpio(void *obj) 
	return (void *)nv_device(obj)->subdev[NVDEV_SUBDEV_GPIO];

}



#define nouveau_gpio_create(p,e,o,l,d)                                         \

	nouveau_gpio_create_((p), (e), (o), (l), sizeof(**d), (void **)d)

#define nouveau_gpio_destroy(p) ({                                             \

	struct nouveau_gpio *gpio = (p);                                       \

	_nouveau_gpio_dtor(nv_object(gpio));                                   \

})

#define nouveau_gpio_fini(p,s)                                                 \

	nouveau_subdev_fini(&(p)->base, (s))



int  nouveau_gpio_create_(struct nouveau_object *, struct nouveau_object *,

			  struct nouveau_oclass *, int, int, void **);

void _nouveau_gpio_dtor(struct nouveau_object *);

int  nouveau_gpio_init(struct nouveau_gpio *);



extern struct nouveau_oclass *nv10_gpio_oclass;

extern struct nouveau_oclass *nv50_gpio_oclass;

extern struct nouveau_oclass *nv92_gpio_oclass;

extern struct nouveau_oclass *nvd0_gpio_oclass;

extern struct nouveau_oclass *nve0_gpio_oclass;

drivers/gpu/drm/nouveau/core/subdev/gpio/base.c

+5 −3
Original line number Diff line number Diff line
@@ -22,10 +22,11 @@ 
 * Authors: Ben Skeggs

 */



#include <subdev/gpio.h>

#include <subdev/bios.h>

#include <subdev/bios/gpio.h>



#include "priv.h"



static int

nouveau_gpio_drive(struct nouveau_gpio *gpio,

		   int idx, int line, int dir, int out)
@@ -113,9 +114,10 @@ _nouveau_gpio_dtor(struct nouveau_object *object) 
int

nouveau_gpio_create_(struct nouveau_object *parent,

		     struct nouveau_object *engine,

		     struct nouveau_oclass *oclass, int lines,

		     struct nouveau_oclass *oclass,

		     int length, void **pobject)

{

	const struct nouveau_gpio_impl *impl = (void *)oclass;

	struct nouveau_gpio *gpio;

	int ret;
@@ -125,7 +127,7 @@ nouveau_gpio_create_(struct nouveau_object *parent, 
	if (ret)

		return ret;



	ret = nouveau_event_create(1, lines, &gpio->events);

	ret = nouveau_event_create(1, impl->lines, &gpio->events);

	if (ret)

		return ret;