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

Commit dc06e366 authored by Martin Peres's avatar Martin Peres Committed by Ben Skeggs
Browse files

drm/nouveau/subdev/iccsense: add new subdev for power sensors 



Signed-off-by: default avatarKarol Herbst <nouveau@karolherbst.de>
Reviewed-by: default avatarMartin Peres <martin.peres@free.fr>
parent 923f1bd2

drivers/gpu/drm/nouveau/include/nvkm/core/device.h

+44 −41
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ enum nvkm_devidx { 
	NVKM_SUBDEV_BAR,

	NVKM_SUBDEV_PMU,

	NVKM_SUBDEV_VOLT,

	NVKM_SUBDEV_ICCSENSE,

	NVKM_SUBDEV_THERM,

	NVKM_SUBDEV_CLK,

	NVKM_SUBDEV_SECBOOT,
@@ -110,6 +111,7 @@ struct nvkm_device { 
	struct nvkm_gpio *gpio;

	struct nvkm_i2c *i2c;

	struct nvkm_subdev *ibus;

	struct nvkm_iccsense *iccsense;

	struct nvkm_instmem *imem;

	struct nvkm_ltc *ltc;

	struct nvkm_mc *mc;
@@ -176,6 +178,7 @@ struct nvkm_device_chip { 
	int (*gpio    )(struct nvkm_device *, int idx, struct nvkm_gpio **);

	int (*i2c     )(struct nvkm_device *, int idx, struct nvkm_i2c **);

	int (*ibus    )(struct nvkm_device *, int idx, struct nvkm_subdev **);

	int (*iccsense)(struct nvkm_device *, int idx, struct nvkm_iccsense **);

	int (*imem    )(struct nvkm_device *, int idx, struct nvkm_instmem **);

	int (*ltc     )(struct nvkm_device *, int idx, struct nvkm_ltc **);

	int (*mc      )(struct nvkm_device *, int idx, struct nvkm_mc **);

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

0 → 100644
+10 −0
Original line number Diff line number Diff line 
#ifndef __NVKM_ICCSENSE_H__

#define __NVKM_ICCSENSE_H__



#include <core/subdev.h>



struct nvkm_iccsense {

	struct nvkm_subdev subdev;

};



#endif

drivers/gpu/drm/nouveau/nvkm/core/subdev.c

+43 −42
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ nvkm_subdev_name[NVKM_SUBDEV_NR] = { 
	[NVKM_SUBDEV_GPIO    ] = "gpio",

	[NVKM_SUBDEV_I2C     ] = "i2c",

	[NVKM_SUBDEV_IBUS    ] = "priv",

	[NVKM_SUBDEV_ICCSENSE] = "iccsense",

	[NVKM_SUBDEV_INSTMEM ] = "imem",

	[NVKM_SUBDEV_LTC     ] = "ltc",

	[NVKM_SUBDEV_MC      ] = "mc",

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

+65 −63
Original line number Diff line number Diff line
@@ -2117,6 +2117,7 @@ nvkm_device_subdev(struct nvkm_device *device, int index) 
	_(GPIO    , device->gpio    , &device->gpio->subdev);

	_(I2C     , device->i2c     , &device->i2c->subdev);

	_(IBUS    , device->ibus    ,  device->ibus);

	_(ICCSENSE, device->iccsense, &device->iccsense->subdev);

	_(INSTMEM , device->imem    , &device->imem->subdev);

	_(LTC     , device->ltc     , &device->ltc->subdev);

	_(MC      , device->mc      , &device->mc->subdev);
@@ -2567,6 +2568,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func, 
		_(NVKM_SUBDEV_GPIO    ,     gpio);

		_(NVKM_SUBDEV_I2C     ,      i2c);

		_(NVKM_SUBDEV_IBUS    ,     ibus);

		_(NVKM_SUBDEV_ICCSENSE, iccsense);

		_(NVKM_SUBDEV_INSTMEM ,     imem);

		_(NVKM_SUBDEV_LTC     ,      ltc);

		_(NVKM_SUBDEV_MC      ,       mc);

drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <subdev/gpio.h>

#include <subdev/i2c.h>

#include <subdev/ibus.h>

#include <subdev/iccsense.h>

#include <subdev/instmem.h>

#include <subdev/ltc.h>

#include <subdev/mc.h>