From d045354a9014cb5667c82725eb46e4e3aba3934f Mon Sep 17 00:00:00 2001 From: Thierry Strudel Date: Mon, 21 Jun 2021 17:17:18 -0700 Subject: [PATCH] powerstats: fix ODPM device names ============= PowerStats HAL 2.0 energy consumers ============== CPUCL0 : 24968.54 mWs CPUCL1 : 8919.14 mWs CPUCL2 : 11926.69 mWs MODEM : 0.00 mWs GPS : 0.00 mWs Wifi : 0.00 mWs BT : 0.00 mWs display : 71299.61 mWs ========== End of PowerStats HAL 2.0 energy consumers ========== ============= PowerStats HAL 2.0 energy meter ============== Channel Cumulative Energy [PPVAR_VSYS_PWR_DISP]:Display 71299.61 mWs [VSYS_PWR_MODEM]:Modem 0.00 mWs [VSYS_PWR_RFFE]:Cellular 0.00 mWs [S1M_VDD_MIF]:MIF 6768.08 mWs [S2M_VDD_CPUCL2]:CPU(BIG) 11926.69 mWs [S3M_VDD_CPUCL1]:CPU(MID) 8919.14 mWs [S4M_VDD_CPUCL0]:CPU(LITTLE) 24968.54 mWs [S5M_VDD_INT]:INT 6053.63 mWs [S6M_LLDO1]:LDO 4850.91 mWs [S7M_VDD_INT]:INT 3893.55 mWs [S10M_VDD_TPU]:TPU 1246.19 mWs [L1M_VDD_ALIVE]:Alive 2243.80 mWs [S1S_VDD_CAM]:Multimedia 5501.09 mWs [S2S_VDD_G3D]:GPU 6432.73 mWs [S3S_LLDO1]:LDO 15484.51 mWs [S4S_VDD2H_MEM]:DDR 11950.26 mWs [S5S_VDDQ_MEM]:DDR 5148.75 mWs [S6S_LLDO4]:LDO 13688.50 mWs [S7S_MLDO]:LDO 24895.53 mWs [S8S_VDD_G3D_L2]:GPU 6934.05 mWs [S9S_VDD_AOC]:AOC 7403.07 mWs [S10S_VDD2L]:DDR 9040.13 mWs [L9S_GNSS_CORE]:GPS 0.00 mWs [L21S_VDD2L_MEM]:MEM 0.00 mWs ========== End of PowerStats HAL 2.0 energy meter ========== Signed-off-by: Thierry Strudel Change-Id: I83053e4e5b1414cf1410b38fe03d8bbadc70e5bd --- powerstats/Gs201CommonDataProviders.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerstats/Gs201CommonDataProviders.cpp b/powerstats/Gs201CommonDataProviders.cpp index 1c7529b8..1933ec16 100644 --- a/powerstats/Gs201CommonDataProviders.cpp +++ b/powerstats/Gs201CommonDataProviders.cpp @@ -384,7 +384,7 @@ void addSoC(std::shared_ptr p) { } void setEnergyMeter(std::shared_ptr p) { - std::vector deviceNames { "s2mpg10-odpm", "s2mpg11-odpm" }; + std::vector deviceNames { "s2mpg12-odpm", "s2mpg13-odpm" }; p->setEnergyMeterDataProvider(std::make_unique(deviceNames, true)); }