From d4bca7bd9c5ace712f033c625031072a0b37f3a2 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Mon, 6 Mar 2017 14:42:10 +1030 Subject: configs: don't use old sysfs path for i2c devices The Machine.py files in skeleton hard code the sysfs path to the devices. The hardcoded paths use the old i2c-adapter directory which is only around for old userspace. From the Kconfig help text: Say Y here if you intend to run lm-sensors 3.1.1 or older, or any other user-space package which expects i2c adapters to be class devices. If you don't know, say Y. Symbol: I2C_COMPAT [=y] Type : boolean Prompt: Enable compatibility bits for old user-space Instead use /sys/bus/i2c/devices. Fixes openbmc/openbmc#1252 Change-Id: Iaa9ef96e150084d9a605d5cab8053ddc910cfeaf Signed-off-by: Joel Stanley --- configs/Barreleye.py | 4 ++-- configs/Firestone.py | 4 ++-- configs/Garrison.py | 4 ++-- configs/Palmetto.py | 2 +- configs/Romulus.py | 4 ++-- configs/Witherspoon.py | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'configs') diff --git a/configs/Barreleye.py b/configs/Barreleye.py index ac1902f..32483fa 100644 --- a/configs/Barreleye.py +++ b/configs/Barreleye.py @@ -589,9 +589,9 @@ MISC_SENSORS = { 0x09 : { 'class' : 'BootCountSensor' }, 0x05 : { 'class' : 'BootProgressSensor' }, 0x08 : { 'class' : 'OccStatusSensor', - 'os_path' : '/sys/class/i2c-adapter/i2c-3/3-0050/online' }, + 'os_path' : '/sys/bus/i2c/devices/3-0050/online' }, 0x0A : { 'class' : 'OccStatusSensor', - 'os_path' : '/sys/class/i2c-adapter/i2c-3/3-0051/online' }, + 'os_path' : '/sys/bus/i2c/devices/3-0051/online' }, 0x32 : { 'class' : 'OperatingSystemStatusSensor' }, 0x33 : { 'class' : 'PowerCap', 'os_path' : '/sys/class/hwmon/hwmon3/user_powercap' }, diff --git a/configs/Firestone.py b/configs/Firestone.py index 6c7c908..2f5a2c4 100644 --- a/configs/Firestone.py +++ b/configs/Firestone.py @@ -489,9 +489,9 @@ MISC_SENSORS = { 0x5f : { 'class' : 'BootCountSensor' }, 0x05 : { 'class' : 'BootProgressSensor' }, 0x08 : { 'class' : 'OccStatusSensor', - 'os_path' : '/sys/class/i2c-adapter/i2c-4/4-0050/online' }, + 'os_path' : '/sys/bus/i2c/devices/4-0050/online' }, 0x09 : { 'class' : 'OccStatusSensor', - 'os_path' : '/sys/class/i2c-adapter/i2c-5/5-0050/online' }, + 'os_path' : '/sys/bus/i2c/devices/5-0050/online' }, 0xb5 : { 'class' : 'OperatingSystemStatusSensor' }, 0xb3 : { 'class' : 'PowerCap', 'os_path' : '/sys/class/hwmon/hwmon3/user_powercap' }, diff --git a/configs/Garrison.py b/configs/Garrison.py index d108fc0..e09c24a 100644 --- a/configs/Garrison.py +++ b/configs/Garrison.py @@ -490,9 +490,9 @@ MISC_SENSORS = { 0x5f : { 'class' : 'BootCountSensor' }, 0x05 : { 'class' : 'BootProgressSensor' }, 0x08 : { 'class' : 'OccStatusSensor', - 'os_path' : '/sys/class/i2c-adapter/i2c-4/4-0050/online' }, + 'os_path' : '/sys/bus/i2c/devices/4-0050/online' }, 0x09 : { 'class' : 'OccStatusSensor', - 'os_path' : '/sys/class/i2c-adapter/i2c-5/5-0050/online' }, + 'os_path' : '/sys/bus/i2c/devices/5-0050/online' }, 0xb5 : { 'class' : 'OperatingSystemStatusSensor' }, 0xb3 : { 'class' : 'PowerCap', 'os_path' : '/sys/class/hwmon/hwmon3/user_powercap' }, diff --git a/configs/Palmetto.py b/configs/Palmetto.py index 5ce94ae..5378bbd 100644 --- a/configs/Palmetto.py +++ b/configs/Palmetto.py @@ -162,7 +162,7 @@ MISC_SENSORS = { 0x09 : { 'class' : 'BootCountSensor' }, 0x05 : { 'class' : 'BootProgressSensor' }, 0x08 : { 'class' : 'OccStatusSensor', - 'os_path' : '/sys/class/i2c-adapter/i2c-3/3-0050/online' }, + 'os_path' : '/sys/bus/i2c/devices/3-0050/online' }, 0x32 : { 'class' : 'OperatingSystemStatusSensor' }, 0x33 : { 'class' : 'PowerCap', 'os_path' : '/sys/class/hwmon/hwmon1/user_powercap' }, diff --git a/configs/Romulus.py b/configs/Romulus.py index 178fb8e..6307226 100644 --- a/configs/Romulus.py +++ b/configs/Romulus.py @@ -349,9 +349,9 @@ MISC_SENSORS = { 0x5f : { 'class' : 'BootCountSensor' }, 0x05 : { 'class' : 'BootProgressSensor' }, 0x08 : { 'class' : 'OccStatusSensor', - 'os_path' : '/sys/class/i2c-adapter/i2c-3/3-0050/online' }, + 'os_path' : '/sys/bus/i2c/devices/3-0050/online' }, 0x09 : { 'class' : 'OccStatusSensor', - 'os_path' : '/sys/class/i2c-adapter/i2c-3/3-0051/online' }, + 'os_path' : '/sys/bus/i2c/devices/3-0051/online' }, 0xb5 : { 'class' : 'OperatingSystemStatusSensor' }, 0xb3 : { 'class' : 'PowerCap', 'os_path' : '/sys/class/hwmon/hwmon3/user_powercap' }, diff --git a/configs/Witherspoon.py b/configs/Witherspoon.py index 98b9ecf..cb68e06 100644 --- a/configs/Witherspoon.py +++ b/configs/Witherspoon.py @@ -485,9 +485,9 @@ MISC_SENSORS = { 0x03 : { 'class' : 'BootProgressSensor' }, #OCC active sensors aren't in the P9 XML yet. These are wrong. 0xfc : { 'class' : 'OccStatusSensor', - 'os_path' : '/sys/class/i2c-adapter/i2c-3/3-0050/online' }, + 'os_path' : '/sys/bus/i2c/devices/3-0050/online' }, 0xfd : { 'class' : 'OccStatusSensor', - 'os_path' : '/sys/class/i2c-adapter/i2c-3/3-0051/online' }, + 'os_path' : '/sys/bus/i2c/devices/3-0051/online' }, 0x02 : { 'class' : 'OperatingSystemStatusSensor' }, 0x06 : { 'class' : 'PowerCap', 'os_path' : '/sys/class/hwmon/hwmon3/user_powercap' }, -- cgit v1.2.1