From 3db5a829b05a90f357fa32729c76a72728787ba4 Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez Buchillon Date: Wed, 9 May 2018 10:00:18 +0800 Subject: powerlog: allow port & addr in the .board file Allow board & addr in the board file instead of channel, to make board file creation and configuration simpler. This is part of the efforts in the BUG to make sweetberry under chrome os simpler to use. In that case, we allow now (with crrev.com/c/1051215) to generate .board files using explicit pin and bank numbers (j2,j3,j4). BRANCH=None BUG=chromium:806148 TEST=manual test, works fine. Change-Id: I6fd3bb1a4a5ffffee08b81625ecb190adceeb2e7 Signed-off-by: Ruben Rodriguez Buchillon Reviewed-on: https://chromium-review.googlesource.com/1051212 Reviewed-by: Nick Sanders --- extra/usb_power/powerlog.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'extra/usb_power') diff --git a/extra/usb_power/powerlog.py b/extra/usb_power/powerlog.py index 3f299be790..82950100f2 100755 --- a/extra/usb_power/powerlog.py +++ b/extra/usb_power/powerlog.py @@ -392,12 +392,16 @@ class Spower(object): for datum in self._brdcfg: if datum["name"] == name: - channel = int(datum["channel"]) rs = int(float(datum["rs"]) * 1000.) board = datum["sweetberry"] if board == self._board: - port, addr = self.CHMAP[channel] + if 'port' in datum and 'addr' in datum: + port = datum['port'] + addr = datum['addr'] + else: + channel = int(datum["channel"]) + port, addr = self.CHMAP[channel] self.add_ina(port, ina_type, addr, 0, rs, data=datum) return True else: -- cgit v1.2.1