drm/nouveau/clk: remove references to "daemon"

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/clk.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/clk.h
index 8708f0a4e188003be3c57280d9da4422d5bd133e..22e125fdc29b6d0c88c687b812d60b51f67ab541 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/clk.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/clk.h
@@ -38,7 +38,7 @@ enum nv_clk_src {
        nv_clk_src_hubk06,
        nv_clk_src_hubk07,
        nv_clk_src_copy,
-       nv_clk_src_daemon,
+       nv_clk_src_pmu,
        nv_clk_src_disp,
        nv_clk_src_vdec,
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gf100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gf100.c
index a52b7e7fce4126fa5cb8580ca605841be833e157..78c449b417b74c18b6d03c0eacb9b1b4894026a9 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gf100.c
@@ -188,7 +188,7 @@ gf100_clk_read(struct nvkm_clk *base, enum nv_clk_src src)
                return read_clk(clk, 0x08);
        case nv_clk_src_copy:
                return read_clk(clk, 0x09);
-       case nv_clk_src_daemon:
+       case nv_clk_src_pmu:
                return read_clk(clk, 0x0c);
        case nv_clk_src_vdec:
                return read_clk(clk, 0x0e);
@@ -325,7 +325,7 @@ gf100_clk_calc(struct nvkm_clk *base, struct nvkm_cstate *cstate)
            (ret = calc_clk(clk, cstate, 0x07, nv_clk_src_hubk06)) ||
            (ret = calc_clk(clk, cstate, 0x08, nv_clk_src_hubk01)) ||
            (ret = calc_clk(clk, cstate, 0x09, nv_clk_src_copy)) ||
-           (ret = calc_clk(clk, cstate, 0x0c, nv_clk_src_daemon)) ||
+           (ret = calc_clk(clk, cstate, 0x0c, nv_clk_src_pmu)) ||
            (ret = calc_clk(clk, cstate, 0x0e, nv_clk_src_vdec)))
                return ret;
 
@@ -447,7 +447,7 @@ gf100_clk = {
                { nv_clk_src_rop    , 0x04 },
                { nv_clk_src_mem    , 0x05, 0, "memory", 1000 },
                { nv_clk_src_vdec   , 0x06 },
-               { nv_clk_src_daemon , 0x0a },
+               { nv_clk_src_pmu    , 0x0a },
                { nv_clk_src_hubk07 , 0x0b },
                { nv_clk_src_max }
        }

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk104.c
index 396f7e4dad0ac804ad3994750cb9e900ece18ba4..975c401bccab8c4e3ab69e5daec2de65ffd09ea6 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk104.c
@@ -209,7 +209,7 @@ gk104_clk_read(struct nvkm_clk *base, enum nv_clk_src src)
                return read_clk(clk, 0x07);
        case nv_clk_src_hubk01:
                return read_clk(clk, 0x08);
-       case nv_clk_src_daemon:
+       case nv_clk_src_pmu:
                return read_clk(clk, 0x0c);
        case nv_clk_src_vdec:
                return read_clk(clk, 0x0e);
@@ -346,7 +346,7 @@ gk104_clk_calc(struct nvkm_clk *base, struct nvkm_cstate *cstate)
            (ret = calc_clk(clk, cstate, 0x02, nv_clk_src_hubk07)) ||
            (ret = calc_clk(clk, cstate, 0x07, nv_clk_src_hubk06)) ||
            (ret = calc_clk(clk, cstate, 0x08, nv_clk_src_hubk01)) ||
-           (ret = calc_clk(clk, cstate, 0x0c, nv_clk_src_daemon)) ||
+           (ret = calc_clk(clk, cstate, 0x0c, nv_clk_src_pmu)) ||
            (ret = calc_clk(clk, cstate, 0x0e, nv_clk_src_vdec)))
                return ret;
 
@@ -492,7 +492,7 @@ gk104_clk = {
                { nv_clk_src_hubk06 , 0x04, NVKM_CLK_DOM_FLAG_CORE },
                { nv_clk_src_hubk01 , 0x05 },
                { nv_clk_src_vdec   , 0x06 },
-               { nv_clk_src_daemon , 0x07 },
+               { nv_clk_src_pmu    , 0x07 },
                { nv_clk_src_max }
        }
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c
index c233e3f653ce23168a579c36e07d153182333021..056702ef69aa44eb5ce6cacb330674a68225ffbd 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/gt215.c
@@ -158,7 +158,7 @@ gt215_clk_read(struct nvkm_clk *base, enum nv_clk_src src)
                return read_clk(clk, 0x20, false);
        case nv_clk_src_vdec:
                return read_clk(clk, 0x21, false);
-       case nv_clk_src_daemon:
+       case nv_clk_src_pmu:
                return read_clk(clk, 0x25, false);
        case nv_clk_src_host:
                hsrc = (nvkm_rd32(device, 0xc040) & 0x30000000) >> 28;