diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 04:54:20 (GMT) |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 02:40:43 (GMT) |
| commit | 49bd8da5130aa2de1c891c71163a033254eaf932 (patch) | |
| tree | 80f5bd05d1d3d2b233b36b3b45d71c130493302d /drivers/gpu/drm/nouveau/nvkm/engine/device | |
| parent | 2ea7249fe2d4815fc6d0b50021bcbd8bb72b8437 (diff) | |
| download | linux-49bd8da5130aa2de1c891c71163a033254eaf932.tar.xz | |
drm/nouveau/i2c: convert to new-style nvkm_subdev
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/device')
10 files changed, 67 insertions, 135 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c index 3caaa9c..4c31496 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c @@ -81,7 +81,7 @@ nv4_chipset = { .clk = nv04_clk_new, .devinit = nv04_devinit_new, .fb = nv04_fb_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv04_instmem_new, // .mc = nv04_mc_new, // .mmu = nv04_mmu_new, @@ -101,7 +101,7 @@ nv5_chipset = { .clk = nv04_clk_new, .devinit = nv05_devinit_new, .fb = nv04_fb_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv04_instmem_new, // .mc = nv04_mc_new, // .mmu = nv04_mmu_new, @@ -122,7 +122,7 @@ nv10_chipset = { .devinit = nv10_devinit_new, .fb = nv10_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv04_instmem_new, // .mc = nv04_mc_new, // .mmu = nv04_mmu_new, @@ -141,7 +141,7 @@ nv11_chipset = { .devinit = nv10_devinit_new, .fb = nv10_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv04_instmem_new, // .mc = nv04_mc_new, // .mmu = nv04_mmu_new, @@ -162,7 +162,7 @@ nv15_chipset = { .devinit = nv10_devinit_new, .fb = nv10_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv04_instmem_new, // .mc = nv04_mc_new, // .mmu = nv04_mmu_new, @@ -183,7 +183,7 @@ nv17_chipset = { .devinit = nv10_devinit_new, .fb = nv10_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv04_instmem_new, // .mc = nv04_mc_new, // .mmu = nv04_mmu_new, @@ -204,7 +204,7 @@ nv18_chipset = { .devinit = nv10_devinit_new, .fb = nv10_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv04_instmem_new, // .mc = nv04_mc_new, // .mmu = nv04_mmu_new, @@ -225,7 +225,7 @@ nv1a_chipset = { .devinit = nv1a_devinit_new, .fb = nv1a_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv04_instmem_new, // .mc = nv04_mc_new, // .mmu = nv04_mmu_new, @@ -246,7 +246,7 @@ nv1f_chipset = { .devinit = nv1a_devinit_new, .fb = nv1a_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv04_instmem_new, // .mc = nv04_mc_new, // .mmu = nv04_mmu_new, @@ -267,7 +267,7 @@ nv20_chipset = { .devinit = nv20_devinit_new, .fb = nv20_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv04_instmem_new, // .mc = nv04_mc_new, // .mmu = nv04_mmu_new, @@ -288,7 +288,7 @@ nv25_chipset = { .devinit = nv20_devinit_new, .fb = nv25_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv04_instmem_new, // .mc = nv04_mc_new, // .mmu = nv04_mmu_new, @@ -309,7 +309,7 @@ nv28_chipset = { .devinit = nv20_devinit_new, .fb = nv25_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv04_instmem_new, // .mc = nv04_mc_new, // .mmu = nv04_mmu_new, @@ -330,7 +330,7 @@ nv2a_chipset = { .devinit = nv20_devinit_new, .fb = nv25_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv04_instmem_new, // .mc = nv04_mc_new, // .mmu = nv04_mmu_new, @@ -351,7 +351,7 @@ nv30_chipset = { .devinit = nv20_devinit_new, .fb = nv30_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv04_instmem_new, // .mc = nv04_mc_new, // .mmu = nv04_mmu_new, @@ -372,7 +372,7 @@ nv31_chipset = { .devinit = nv20_devinit_new, .fb = nv30_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv04_instmem_new, // .mc = nv04_mc_new, // .mmu = nv04_mmu_new, @@ -394,7 +394,7 @@ nv34_chipset = { .devinit = nv10_devinit_new, .fb = nv10_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv04_instmem_new, // .mc = nv04_mc_new, // .mmu = nv04_mmu_new, @@ -416,7 +416,7 @@ nv35_chipset = { .devinit = nv20_devinit_new, .fb = nv35_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv04_instmem_new, // .mc = nv04_mc_new, // .mmu = nv04_mmu_new, @@ -437,7 +437,7 @@ nv36_chipset = { .devinit = nv20_devinit_new, .fb = nv36_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv04_instmem_new, // .mc = nv04_mc_new, // .mmu = nv04_mmu_new, @@ -459,7 +459,7 @@ nv40_chipset = { .devinit = nv1a_devinit_new, .fb = nv40_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv40_instmem_new, // .mc = nv40_mc_new, // .mmu = nv04_mmu_new, @@ -484,7 +484,7 @@ nv41_chipset = { .devinit = nv1a_devinit_new, .fb = nv41_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv40_instmem_new, // .mc = nv40_mc_new, // .mmu = nv41_mmu_new, @@ -509,7 +509,7 @@ nv42_chipset = { .devinit = nv1a_devinit_new, .fb = nv41_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv40_instmem_new, // .mc = nv40_mc_new, // .mmu = nv41_mmu_new, @@ -534,7 +534,7 @@ nv43_chipset = { .devinit = nv1a_devinit_new, .fb = nv41_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv40_instmem_new, // .mc = nv40_mc_new, // .mmu = nv41_mmu_new, @@ -559,7 +559,7 @@ nv44_chipset = { .devinit = nv1a_devinit_new, .fb = nv44_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv40_instmem_new, // .mc = nv44_mc_new, // .mmu = nv44_mmu_new, @@ -584,7 +584,7 @@ nv45_chipset = { .devinit = nv1a_devinit_new, .fb = nv40_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv40_instmem_new, // .mc = nv40_mc_new, // .mmu = nv04_mmu_new, @@ -609,7 +609,7 @@ nv46_chipset = { .devinit = nv1a_devinit_new, .fb = nv46_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv40_instmem_new, // .mc = nv44_mc_new, // .mmu = nv44_mmu_new, @@ -634,7 +634,7 @@ nv47_chipset = { .devinit = nv1a_devinit_new, .fb = nv47_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv40_instmem_new, // .mc = nv40_mc_new, // .mmu = nv41_mmu_new, @@ -659,7 +659,7 @@ nv49_chipset = { .devinit = nv1a_devinit_new, .fb = nv49_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv40_instmem_new, // .mc = nv40_mc_new, // .mmu = nv41_mmu_new, @@ -684,7 +684,7 @@ nv4a_chipset = { .devinit = nv1a_devinit_new, .fb = nv44_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv40_instmem_new, // .mc = nv44_mc_new, // .mmu = nv44_mmu_new, @@ -709,7 +709,7 @@ nv4b_chipset = { .devinit = nv1a_devinit_new, .fb = nv49_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv40_instmem_new, // .mc = nv40_mc_new, // .mmu = nv41_mmu_new, @@ -734,7 +734,7 @@ nv4c_chipset = { .devinit = nv1a_devinit_new, .fb = nv46_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv40_instmem_new, // .mc = nv4c_mc_new, // .mmu = nv44_mmu_new, @@ -759,7 +759,7 @@ nv4e_chipset = { .devinit = nv1a_devinit_new, .fb = nv4e_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv4e_i2c_new, + .i2c = nv4e_i2c_new, // .imem = nv40_instmem_new, // .mc = nv4c_mc_new, // .mmu = nv44_mmu_new, @@ -786,7 +786,7 @@ nv50_chipset = { .fb = nv50_fb_new, .fuse = nv50_fuse_new, .gpio = nv50_gpio_new, -// .i2c = nv50_i2c_new, + .i2c = nv50_i2c_new, // .imem = nv50_instmem_new, // .mc = nv50_mc_new, // .mmu = nv50_mmu_new, @@ -812,7 +812,7 @@ nv63_chipset = { .devinit = nv1a_devinit_new, .fb = nv46_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv40_instmem_new, // .mc = nv4c_mc_new, // .mmu = nv44_mmu_new, @@ -837,7 +837,7 @@ nv67_chipset = { .devinit = nv1a_devinit_new, .fb = nv46_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv40_instmem_new, // .mc = nv4c_mc_new, // .mmu = nv44_mmu_new, @@ -862,7 +862,7 @@ nv68_chipset = { .devinit = nv1a_devinit_new, .fb = nv46_fb_new, .gpio = nv10_gpio_new, -// .i2c = nv04_i2c_new, + .i2c = nv04_i2c_new, // .imem = nv40_instmem_new, // .mc = nv4c_mc_new, // .mmu = nv44_mmu_new, @@ -889,7 +889,7 @@ nv84_chipset = { .fb = g84_fb_new, .fuse = nv50_fuse_new, .gpio = nv50_gpio_new, -// .i2c = nv50_i2c_new, + .i2c = nv50_i2c_new, // .imem = nv50_instmem_new, // .mc = nv50_mc_new, // .mmu = nv50_mmu_new, @@ -920,7 +920,7 @@ nv86_chipset = { .fb = g84_fb_new, .fuse = nv50_fuse_new, .gpio = nv50_gpio_new, -// .i2c = nv50_i2c_new, + .i2c = nv50_i2c_new, // .imem = nv50_instmem_new, // .mc = nv50_mc_new, // .mmu = nv50_mmu_new, @@ -951,7 +951,7 @@ nv92_chipset = { .fb = g84_fb_new, .fuse = nv50_fuse_new, .gpio = nv50_gpio_new, -// .i2c = nv50_i2c_new, + .i2c = nv50_i2c_new, // .imem = nv50_instmem_new, // .mc = nv50_mc_new, // .mmu = nv50_mmu_new, @@ -982,7 +982,7 @@ nv94_chipset = { .fb = g84_fb_new, .fuse = nv50_fuse_new, .gpio = g94_gpio_new, -// .i2c = g94_i2c_new, + .i2c = g94_i2c_new, // .imem = nv50_instmem_new, // .mc = g94_mc_new, // .mmu = nv50_mmu_new, @@ -1007,7 +1007,7 @@ nv96_chipset = { .name = "G96", .bios = nvkm_bios_new, .gpio = g94_gpio_new, -// .i2c = g94_i2c_new, + .i2c = g94_i2c_new, .fuse = nv50_fuse_new, .clk = g84_clk_new, // .therm = g84_therm_new, @@ -1038,7 +1038,7 @@ nv98_chipset = { .name = "G98", .bios = nvkm_bios_new, .gpio = g94_gpio_new, -// .i2c = g94_i2c_new, + .i2c = g94_i2c_new, .fuse = nv50_fuse_new, .clk = g84_clk_new, // .therm = g84_therm_new, @@ -1075,7 +1075,7 @@ nva0_chipset = { .fb = g84_fb_new, .fuse = nv50_fuse_new, .gpio = g94_gpio_new, -// .i2c = nv50_i2c_new, + .i2c = nv50_i2c_new, // .imem = nv50_instmem_new, // .mc = g98_mc_new, // .mmu = nv50_mmu_new, @@ -1106,7 +1106,7 @@ nva3_chipset = { .fb = gt215_fb_new, .fuse = nv50_fuse_new, .gpio = g94_gpio_new, -// .i2c = g94_i2c_new, + .i2c = g94_i2c_new, // .imem = nv50_instmem_new, // .mc = g98_mc_new, // .mmu = nv50_mmu_new, @@ -1139,7 +1139,7 @@ nva5_chipset = { .fb = gt215_fb_new, .fuse = nv50_fuse_new, .gpio = g94_gpio_new, -// .i2c = g94_i2c_new, + .i2c = g94_i2c_new, // .imem = nv50_instmem_new, // .mc = g98_mc_new, // .mmu = nv50_mmu_new, @@ -1171,7 +1171,7 @@ nva8_chipset = { .fb = gt215_fb_new, .fuse = nv50_fuse_new, .gpio = g94_gpio_new, -// .i2c = g94_i2c_new, + .i2c = g94_i2c_new, // .imem = nv50_instmem_new, // .mc = g98_mc_new, // .mmu = nv50_mmu_new, @@ -1203,7 +1203,7 @@ nvaa_chipset = { .fb = mcp77_fb_new, .fuse = nv50_fuse_new, .gpio = g94_gpio_new, -// .i2c = g94_i2c_new, + .i2c = g94_i2c_new, // .imem = nv50_instmem_new, // .mc = g98_mc_new, // .mmu = nv50_mmu_new, @@ -1234,7 +1234,7 @@ nvac_chipset = { .fb = mcp77_fb_new, .fuse = nv50_fuse_new, .gpio = g94_gpio_new, -// .i2c = g94_i2c_new, + .i2c = g94_i2c_new, // .imem = nv50_instmem_new, // .mc = g98_mc_new, // .mmu = nv50_mmu_new, @@ -1265,7 +1265,7 @@ nvaf_chipset = { .fb = mcp89_fb_new, .fuse = nv50_fuse_new, .gpio = g94_gpio_new, -// .i2c = g94_i2c_new, + .i2c = g94_i2c_new, // .imem = nv50_instmem_new, // .mc = g98_mc_new, // .mmu = nv50_mmu_new, @@ -1297,7 +1297,7 @@ nvc0_chipset = { .fb = gf100_fb_new, .fuse = gf100_fuse_new, .gpio = g94_gpio_new, -// .i2c = g94_i2c_new, + .i2c = g94_i2c_new, // .ibus = gf100_ibus_new, // .imem = nv50_instmem_new, // .ltc = gf100_ltc_new, @@ -1332,7 +1332,7 @@ nvc1_chipset = { .fb = gf100_fb_new, .fuse = gf100_fuse_new, .gpio = g94_gpio_new, -// .i2c = g94_i2c_new, + .i2c = g94_i2c_new, // .ibus = gf100_ibus_new, // .imem = nv50_instmem_new, // .ltc = gf100_ltc_new, @@ -1366,7 +1366,7 @@ nvc3_chipset = { .fb = gf100_fb_new, .fuse = gf100_fuse_new, .gpio = g94_gpio_new, -// .i2c = g94_i2c_new, + .i2c = g94_i2c_new, // .ibus = gf100_ibus_new, // .imem = nv50_instmem_new, // .ltc = gf100_ltc_new, @@ -1400,7 +1400,7 @@ nvc4_chipset = { .fb = gf100_fb_new, .fuse = gf100_fuse_new, .gpio = g94_gpio_new, -// .i2c = g94_i2c_new, + .i2c = g94_i2c_new, // .ibus = gf100_ibus_new, // .imem = nv50_instmem_new, // .ltc = gf100_ltc_new, @@ -1435,7 +1435,7 @@ nvc8_chipset = { .fb = gf100_fb_new, .fuse = gf100_fuse_new, .gpio = g94_gpio_new, -// .i2c = g94_i2c_new, + .i2c = g94_i2c_new, // .ibus = gf100_ibus_new, // .imem = nv50_instmem_new, // .ltc = gf100_ltc_new, @@ -1470,7 +1470,7 @@ nvce_chipset = { .fb = gf100_fb_new, .fuse = gf100_fuse_new, .gpio = g94_gpio_new, -// .i2c = g94_i2c_new, + .i2c = g94_i2c_new, // .ibus = gf100_ibus_new, // .imem = nv50_instmem_new, // .ltc = gf100_ltc_new, @@ -1505,7 +1505,7 @@ nvcf_chipset = { .fb = gf100_fb_new, .fuse = gf100_fuse_new, .gpio = g94_gpio_new, -// .i2c = g94_i2c_new, + .i2c = g94_i2c_new, // .ibus = gf100_ibus_new, // .imem = nv50_instmem_new, // .ltc = gf100_ltc_new, @@ -1539,7 +1539,7 @@ nvd7_chipset = { .fb = gf100_fb_new, .fuse = gf100_fuse_new, .gpio = gf119_gpio_new, -// .i2c = gf117_i2c_new, + .i2c = gf117_i2c_new, // .ibus = gf100_ibus_new, // .imem = nv50_instmem_new, // .ltc = gf100_ltc_new, @@ -1571,7 +1571,7 @@ nvd9_chipset = { .fb = gf100_fb_new, .fuse = gf100_fuse_new, .gpio = gf119_gpio_new, -// .i2c = gf110_i2c_new, + .i2c = gf119_i2c_new, // .ibus = gf100_ibus_new, // .imem = nv50_instmem_new, // .ltc = gf100_ltc_new, @@ -1605,7 +1605,7 @@ nve4_chipset = { .fb = gk104_fb_new, .fuse = gf100_fuse_new, .gpio = gk104_gpio_new, -// .i2c = gk104_i2c_new, + .i2c = gk104_i2c_new, // .ibus = gk104_ibus_new, // .imem = nv50_instmem_new, // .ltc = gk104_ltc_new, @@ -1641,7 +1641,7 @@ nve6_chipset = { .fb = gk104_fb_new, .fuse = gf100_fuse_new, .gpio = gk104_gpio_new, -// .i2c = gk104_i2c_new, + .i2c = gk104_i2c_new, // .ibus = gk104_ibus_new, // .imem = nv50_instmem_new, // .ltc = gk104_ltc_new, @@ -1677,7 +1677,7 @@ nve7_chipset = { .fb = gk104_fb_new, .fuse = gf100_fuse_new, .gpio = gk104_gpio_new, -// .i2c = gk104_i2c_new, + .i2c = gk104_i2c_new, // .ibus = gk104_ibus_new, // .imem = nv50_instmem_new, // .ltc = gk104_ltc_new, @@ -1737,7 +1737,7 @@ nvf0_chipset = { .fb = gk104_fb_new, .fuse = gf100_fuse_new, .gpio = gk104_gpio_new, -// .i2c = gk104_i2c_new, + .i2c = gk104_i2c_new, // .ibus = gk104_ibus_new, // .imem = nv50_instmem_new, // .ltc = gk104_ltc_new, @@ -1773,7 +1773,7 @@ nvf1_chipset = { .fb = gk104_fb_new, .fuse = gf100_fuse_new, .gpio = gk104_gpio_new, -// .i2c = gf110_i2c_new, + .i2c = gf119_i2c_new, // .ibus = gk104_ibus_new, // .imem = nv50_instmem_new, // .ltc = gk104_ltc_new, @@ -1809,7 +1809,7 @@ nv106_chipset = { .fb = gk104_fb_new, .fuse = gf100_fuse_new, .gpio = gk104_gpio_new, -// .i2c = gk104_i2c_new, + .i2c = gk104_i2c_new, // .ibus = gk104_ibus_new, // .imem = nv50_instmem_new, // .ltc = gk104_ltc_new, @@ -1844,7 +1844,7 @@ nv108_chipset = { .fb = gk104_fb_new, .fuse = gf100_fuse_new, .gpio = gk104_gpio_new, -// .i2c = gk104_i2c_new, + .i2c = gk104_i2c_new, // .ibus = gk104_ibus_new, // .imem = nv50_instmem_new, // .ltc = gk104_ltc_new, @@ -1879,7 +1879,7 @@ nv117_chipset = { .fb = gm107_fb_new, .fuse = gm107_fuse_new, .gpio = gk104_gpio_new, -// .i2c = gf110_i2c_new, + .i2c = gf119_i2c_new, // .ibus = gk104_ibus_new, // .imem = nv50_instmem_new, // .ltc = gm107_ltc_new, @@ -1908,7 +1908,7 @@ nv124_chipset = { .fb = gm107_fb_new, .fuse = gm107_fuse_new, .gpio = gk104_gpio_new, -// .i2c = gm204_i2c_new, + .i2c = gm204_i2c_new, // .ibus = gk104_ibus_new, // .imem = nv50_instmem_new, // .ltc = gm107_ltc_new, @@ -1937,7 +1937,7 @@ nv126_chipset = { .fb = gm107_fb_new, .fuse = gm107_fuse_new, .gpio = gk104_gpio_new, -// .i2c = gm204_i2c_new, + .i2c = gm204_i2c_new, // .ibus = gk104_ibus_new, // .imem = nv50_instmem_new, // .ltc = gm107_ltc_new, diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/gf100.c index 9059b43..0ed4eb7 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/gf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/gf100.c @@ -28,7 +28,6 @@ gf100_identify(struct nvkm_device *device) { switch (device->chipset) { case 0xc0: - device->oclass[NVDEV_SUBDEV_I2C ] = g94_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = >215_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = gf100_mc_oclass; @@ -52,7 +51,6 @@ gf100_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = gf100_pm_oclass; break; case 0xc4: - device->oclass[NVDEV_SUBDEV_I2C ] = g94_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = >215_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = gf100_mc_oclass; @@ -76,7 +74,6 @@ gf100_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = gf100_pm_oclass; break; case 0xc3: - device->oclass[NVDEV_SUBDEV_I2C ] = g94_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = >215_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = gf106_mc_oclass; @@ -99,7 +96,6 @@ gf100_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = gf100_pm_oclass; break; case 0xce: - device->oclass[NVDEV_SUBDEV_I2C ] = g94_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = >215_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = gf100_mc_oclass; @@ -123,7 +119,6 @@ gf100_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = gf100_pm_oclass; break; case 0xcf: - device->oclass[NVDEV_SUBDEV_I2C ] = g94_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = >215_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = gf106_mc_oclass; @@ -146,7 +141,6 @@ gf100_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = gf100_pm_oclass; break; case 0xc1: - device->oclass[NVDEV_SUBDEV_I2C ] = g94_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = >215_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = gf106_mc_oclass; @@ -169,7 +163,6 @@ gf100_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = gf108_pm_oclass; break; case 0xc8: - device->oclass[NVDEV_SUBDEV_I2C ] = g94_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = >215_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = gf100_mc_oclass; @@ -193,7 +186,6 @@ gf100_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = gf100_pm_oclass; break; case 0xd9: - device->oclass[NVDEV_SUBDEV_I2C ] = gf110_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &gf110_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = gf106_mc_oclass; @@ -216,7 +208,6 @@ gf100_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = gf117_pm_oclass; break; case 0xd7: - device->oclass[NVDEV_SUBDEV_I2C ] = gf117_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &gf110_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = gf106_mc_oclass; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/gk104.c index 89eabad..05d8d27 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/gk104.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/gk104.c @@ -28,7 +28,6 @@ gk104_identify(struct nvkm_device *device) { switch (device->chipset) { case 0xe4: - device->oclass[NVDEV_SUBDEV_I2C ] = gk104_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &gf110_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = gf106_mc_oclass; @@ -53,7 +52,6 @@ gk104_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = gk104_pm_oclass; break; case 0xe7: - device->oclass[NVDEV_SUBDEV_I2C ] = gk104_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &gf110_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = gf106_mc_oclass; @@ -78,7 +76,6 @@ gk104_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = gk104_pm_oclass; break; case 0xe6: - device->oclass[NVDEV_SUBDEV_I2C ] = gk104_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &gf110_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = gf106_mc_oclass; @@ -119,7 +116,6 @@ gk104_identify(struct nvkm_device *device) device->oclass[NVDEV_SUBDEV_PMU ] = gk20a_pmu_oclass; break; case 0xf0: - device->oclass[NVDEV_SUBDEV_I2C ] = gk104_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &gf110_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = gf106_mc_oclass; @@ -144,7 +140,6 @@ gk104_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = &gk110_pm_oclass; break; case 0xf1: - device->oclass[NVDEV_SUBDEV_I2C ] = gf110_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &gf110_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = gf106_mc_oclass; @@ -169,7 +164,6 @@ gk104_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = &gk110_pm_oclass; break; case 0x106: - device->oclass[NVDEV_SUBDEV_I2C ] = gk104_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &gf110_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = gk20a_mc_oclass; @@ -193,7 +187,6 @@ gk104_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_MSPPP ] = &gf100_msppp_oclass; break; case 0x108: - device->oclass[NVDEV_SUBDEV_I2C ] = gk104_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &gf110_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = gk20a_mc_oclass; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c index a57db5f..a04bd5b 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c @@ -28,7 +28,6 @@ gm100_identify(struct nvkm_device *device) { switch (device->chipset) { case 0x117: - device->oclass[NVDEV_SUBDEV_I2C ] = gf110_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &gm107_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = gk20a_mc_oclass; @@ -59,7 +58,6 @@ gm100_identify(struct nvkm_device *device) #endif break; case 0x124: - device->oclass[NVDEV_SUBDEV_I2C ] = gm204_i2c_oclass; #if 0 /* looks to be some non-trivial changes */ /* priv ring says no to 0x10eb14 writes */ @@ -91,7 +89,6 @@ gm100_identify(struct nvkm_device *device) #endif break; case 0x126: - device->oclass[NVDEV_SUBDEV_I2C ] = gm204_i2c_oclass; #if 0 /* looks to be some non-trivial changes */ /* priv ring says no to 0x10eb14 writes */ diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv04.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv04.c index d65d294..de456b2 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv04.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv04.c @@ -28,7 +28,6 @@ nv04_identify(struct nvkm_device *device) { switch (device->chipset) { case 0x04: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv04_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; device->oclass[NVDEV_SUBDEV_INSTMEM] = nv04_instmem_oclass; @@ -40,7 +39,6 @@ nv04_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_DISP ] = nv04_disp_oclass; break; case 0x05: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv04_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; device->oclass[NVDEV_SUBDEV_INSTMEM] = nv04_instmem_oclass; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv10.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv10.c index ac2994a..6e58a0e 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv10.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv10.c @@ -28,7 +28,6 @@ nv10_identify(struct nvkm_device *device) { switch (device->chipset) { case 0x10: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv04_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; device->oclass[NVDEV_SUBDEV_INSTMEM] = nv04_instmem_oclass; @@ -38,7 +37,6 @@ nv10_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_DISP ] = nv04_disp_oclass; break; case 0x15: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv04_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; device->oclass[NVDEV_SUBDEV_INSTMEM] = nv04_instmem_oclass; @@ -50,7 +48,6 @@ nv10_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_DISP ] = nv04_disp_oclass; break; case 0x16: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv04_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; device->oclass[NVDEV_SUBDEV_INSTMEM] = nv04_instmem_oclass; @@ -62,7 +59,6 @@ nv10_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_DISP ] = nv04_disp_oclass; break; case 0x1a: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv04_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; device->oclass[NVDEV_SUBDEV_INSTMEM] = nv04_instmem_oclass; @@ -74,7 +70,6 @@ nv10_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_DISP ] = nv04_disp_oclass; break; case 0x11: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv04_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; device->oclass[NVDEV_SUBDEV_INSTMEM] = nv04_instmem_oclass; @@ -86,7 +81,6 @@ nv10_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_DISP ] = nv04_disp_oclass; break; case 0x17: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv04_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; device->oclass[NVDEV_SUBDEV_INSTMEM] = nv04_instmem_oclass; @@ -98,7 +92,6 @@ nv10_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_DISP ] = nv04_disp_oclass; break; case 0x1f: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv04_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; device->oclass[NVDEV_SUBDEV_INSTMEM] = nv04_instmem_oclass; @@ -110,7 +103,6 @@ nv10_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_DISP ] = nv04_disp_oclass; break; case 0x18: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv04_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; device->oclass[NVDEV_SUBDEV_INSTMEM] = nv04_instmem_oclass; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv20.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv20.c index 8029030..1467737 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv20.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv20.c @@ -28,7 +28,6 @@ nv20_identify(struct nvkm_device *device) { switch (device->chipset) { case 0x20: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv04_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; device->oclass[NVDEV_SUBDEV_INSTMEM] = nv04_instmem_oclass; @@ -40,7 +39,6 @@ nv20_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_DISP ] = nv04_disp_oclass; break; case 0x25: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv04_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; device->oclass[NVDEV_SUBDEV_INSTMEM] = nv04_instmem_oclass; @@ -52,7 +50,6 @@ nv20_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_DISP ] = nv04_disp_oclass; break; case 0x28: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv04_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; device->oclass[NVDEV_SUBDEV_INSTMEM] = nv04_instmem_oclass; @@ -64,7 +61,6 @@ nv20_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_DISP ] = nv04_disp_oclass; break; case 0x2a: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv04_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; device->oclass[NVDEV_SUBDEV_INSTMEM] = nv04_instmem_oclass; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv30.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv30.c index ce66504..e4d5fc6 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv30.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv30.c @@ -28,7 +28,6 @@ nv30_identify(struct nvkm_device *device) { switch (device->chipset) { case 0x30: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv04_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; device->oclass[NVDEV_SUBDEV_INSTMEM] = nv04_instmem_oclass; @@ -40,7 +39,6 @@ nv30_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_DISP ] = nv04_disp_oclass; break; case 0x35: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv04_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; device->oclass[NVDEV_SUBDEV_INSTMEM] = nv04_instmem_oclass; @@ -52,7 +50,6 @@ nv30_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_DISP ] = nv04_disp_oclass; break; case 0x31: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv04_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; device->oclass[NVDEV_SUBDEV_INSTMEM] = nv04_instmem_oclass; @@ -65,7 +62,6 @@ nv30_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_DISP ] = nv04_disp_oclass; break; case 0x36: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv04_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; device->oclass[NVDEV_SUBDEV_INSTMEM] = nv04_instmem_oclass; @@ -78,7 +74,6 @@ nv30_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_DISP ] = nv04_disp_oclass; break; case 0x34: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv04_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; device->oclass[NVDEV_SUBDEV_INSTMEM] = nv04_instmem_oclass; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c index 513fb7e..0bf4fce 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c @@ -28,7 +28,6 @@ nv40_identify(struct nvkm_device *device) { switch (device->chipset) { case 0x40: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nv40_therm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv40_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; @@ -44,7 +43,6 @@ nv40_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x41: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nv40_therm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv40_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; @@ -60,7 +58,6 @@ nv40_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x42: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nv40_therm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv40_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; @@ -76,7 +73,6 @@ nv40_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x43: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nv40_therm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv40_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; @@ -92,7 +88,6 @@ nv40_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x45: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nv40_therm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv40_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; @@ -108,7 +103,6 @@ nv40_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x47: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nv40_therm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv40_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; @@ -124,7 +118,6 @@ nv40_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x49: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nv40_therm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv40_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; @@ -140,7 +133,6 @@ nv40_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x4b: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nv40_therm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv40_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; @@ -156,7 +148,6 @@ nv40_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x44: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nv40_therm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv44_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; @@ -172,7 +163,6 @@ nv40_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x46: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nv40_therm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv4c_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; @@ -188,7 +178,6 @@ nv40_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x4a: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nv40_therm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv44_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; @@ -204,7 +193,6 @@ nv40_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x4c: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nv40_therm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv4c_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; @@ -220,7 +208,6 @@ nv40_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x4e: - device->oclass[NVDEV_SUBDEV_I2C ] = nv4e_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nv40_therm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv4c_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; @@ -236,7 +223,6 @@ nv40_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x63: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nv40_therm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv4c_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; @@ -252,7 +238,6 @@ nv40_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x67: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nv40_therm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv4c_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; @@ -268,7 +253,6 @@ nv40_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = nv40_pm_oclass; break; case 0x68: - device->oclass[NVDEV_SUBDEV_I2C ] = nv04_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nv40_therm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv4c_mc_oclass; device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c index cf8839c..956ea9c 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c @@ -28,7 +28,6 @@ nv50_identify(struct nvkm_device *device) { switch (device->chipset) { case 0x50: - device->oclass[NVDEV_SUBDEV_I2C ] = nv50_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &nv50_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv50_mc_oclass; @@ -45,7 +44,6 @@ nv50_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = nv50_pm_oclass; break; case 0x84: - device->oclass[NVDEV_SUBDEV_I2C ] = nv50_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &g84_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv50_mc_oclass; @@ -65,7 +63,6 @@ nv50_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = g84_pm_oclass; break; case 0x86: - device->oclass[NVDEV_SUBDEV_I2C ] = nv50_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &g84_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv50_mc_oclass; @@ -85,7 +82,6 @@ nv50_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = g84_pm_oclass; break; case 0x92: - device->oclass[NVDEV_SUBDEV_I2C ] = nv50_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &g84_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = nv50_mc_oclass; @@ -105,7 +101,6 @@ nv50_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = g84_pm_oclass; break; case 0x94: - device->oclass[NVDEV_SUBDEV_I2C ] = g94_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &g84_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = g94_mc_oclass; @@ -125,7 +120,6 @@ nv50_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = g84_pm_oclass; break; case 0x96: - device->oclass[NVDEV_SUBDEV_I2C ] = g94_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &g84_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = g94_mc_oclass; @@ -145,7 +139,6 @@ nv50_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = g84_pm_oclass; break; case 0x98: - device->oclass[NVDEV_SUBDEV_I2C ] = g94_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &g84_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = g98_mc_oclass; @@ -165,7 +158,6 @@ nv50_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = g84_pm_oclass; break; case 0xa0: - device->oclass[NVDEV_SUBDEV_I2C ] = nv50_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &g84_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = g98_mc_oclass; @@ -185,7 +177,6 @@ nv50_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = gt200_pm_oclass; break; case 0xaa: - device->oclass[NVDEV_SUBDEV_I2C ] = g94_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &g84_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = g98_mc_oclass; @@ -205,7 +196,6 @@ nv50_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = g84_pm_oclass; break; case 0xac: - device->oclass[NVDEV_SUBDEV_I2C ] = g94_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = &g84_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = g98_mc_oclass; @@ -225,7 +215,6 @@ nv50_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = g84_pm_oclass; break; case 0xa3: - device->oclass[NVDEV_SUBDEV_I2C ] = g94_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = >215_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = g98_mc_oclass; @@ -247,7 +236,6 @@ nv50_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = gt215_pm_oclass; break; case 0xa5: - device->oclass[NVDEV_SUBDEV_I2C ] = g94_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = >215_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = g98_mc_oclass; @@ -268,7 +256,6 @@ nv50_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = gt215_pm_oclass; break; case 0xa8: - device->oclass[NVDEV_SUBDEV_I2C ] = g94_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = >215_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = g98_mc_oclass; @@ -289,7 +276,6 @@ nv50_identify(struct nvkm_device *device) device->oclass[NVDEV_ENGINE_PM ] = gt215_pm_oclass; break; case 0xaf: - device->oclass[NVDEV_SUBDEV_I2C ] = g94_i2c_oclass; device->oclass[NVDEV_SUBDEV_THERM ] = >215_therm_oclass; device->oclass[NVDEV_SUBDEV_MXM ] = &nv50_mxm_oclass; device->oclass[NVDEV_SUBDEV_MC ] = g98_mc_oclass; |