diff options
| author | Steven Koo <steven.koo@ni.com> | 2020-06-09 18:43:13 -0500 |
|---|---|---|
| committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2020-06-11 10:39:05 -0500 |
| commit | e244764ffa5b41a64c704864ea243b3939d71636 (patch) | |
| tree | e21de07531ec18186a0511f985e2c930f3cb4beb /mpm | |
| parent | 953b64ad061b3f677134b987c2bc395c39bd19b9 (diff) | |
| download | uhd-e244764ffa5b41a64c704864ea243b3939d71636.tar.gz uhd-e244764ffa5b41a64c704864ea243b3939d71636.tar.bz2 uhd-e244764ffa5b41a64c704864ea243b3939d71636.zip | |
mpm: Look for pca953x based devices by device/name
The pca953x driver introduced a change for how the "label" property
populates. Instead of using the device model, it gives a device specific
name. As a replacement, use device/name. This affects the tca6424
and tca6408.
For the kernel change that causes this see:
https://github.com/torvalds/linux/commit/5128f8d4450159f59565d247437d3bedda3994cb
Diffstat (limited to 'mpm')
| -rw-r--r-- | mpm/python/usrp_mpm/dboard_manager/mg_periphs.py | 2 | ||||
| -rw-r--r-- | mpm/python/usrp_mpm/dboard_manager/rh_periphs.py | 4 | ||||
| -rw-r--r-- | mpm/python/usrp_mpm/periph_manager/n3xx_periphs.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mpm/python/usrp_mpm/dboard_manager/mg_periphs.py b/mpm/python/usrp_mpm/dboard_manager/mg_periphs.py index 8a237b3d9..fe55cf39f 100644 --- a/mpm/python/usrp_mpm/dboard_manager/mg_periphs.py +++ b/mpm/python/usrp_mpm/dboard_manager/mg_periphs.py @@ -29,7 +29,7 @@ class TCA6408(object): def __init__(self, i2c_dev): if i2c_dev is None: raise RuntimeError("Need to specify i2c device to use the TCA6408") - self._gpios = SysFSGPIO({'label': 'tca6408'}, 0xBF, 0xAA, 0xAA, i2c_dev) + self._gpios = SysFSGPIO({'device/name': 'tca6408'}, 0xBF, 0xAA, 0xAA, i2c_dev) def set(self, name, value=None): """ diff --git a/mpm/python/usrp_mpm/dboard_manager/rh_periphs.py b/mpm/python/usrp_mpm/dboard_manager/rh_periphs.py index 31104153a..bb91aec73 100644 --- a/mpm/python/usrp_mpm/dboard_manager/rh_periphs.py +++ b/mpm/python/usrp_mpm/dboard_manager/rh_periphs.py @@ -27,7 +27,7 @@ class TCA6408(object): def __init__(self, i2c_dev): assert i2c_dev is not None - self._gpios = SysFSGPIO({'label': 'tca6408'}, 0x3F, 0x00, 0x00, i2c_dev) + self._gpios = SysFSGPIO({'device/name': 'tca6408'}, 0x3F, 0x00, 0x00, i2c_dev) def set(self, name, value=None): """ @@ -57,7 +57,7 @@ class FPGAtoLoDist(object): POWER_ON_TIMEOUT = 20 #ms POWER_ON_POLL_INTERVAL = 1 #ms GPIO_DEV_ID = { - 'label': 'tca6424', + 'device/name': 'tca6424', 'device/of_node/name': 'rhodium-lodist-gpio', } diff --git a/mpm/python/usrp_mpm/periph_manager/n3xx_periphs.py b/mpm/python/usrp_mpm/periph_manager/n3xx_periphs.py index bcff03c8e..0e06342e1 100644 --- a/mpm/python/usrp_mpm/periph_manager/n3xx_periphs.py +++ b/mpm/python/usrp_mpm/periph_manager/n3xx_periphs.py @@ -102,7 +102,7 @@ class TCA6424(object): self.pins = self.pins_list[1] default_val = 0x860101 if rev == 2 else 0x860780 - self._gpios = SysFSGPIO({'label': 'tca6424', 'device/of_node/name': 'gpio'}, 0xFFF7FF, 0x86F7FF, default_val) + self._gpios = SysFSGPIO({'device/name': 'tca6424', 'device/of_node/name': 'gpio'}, 0xFFF7FF, 0x86F7FF, default_val) def set(self, name, value=None): """ |