From 128ba0f8178089edc69ee5c5401fb8a47c8e7a75 Mon Sep 17 00:00:00 2001 From: Jacky Liu Date: Fri, 2 Feb 2024 16:07:13 +0800 Subject: [PATCH] Update i2c device paths Update i2c device paths with static bus numbers. Also remove some redundant paths. Bug: 323447554 Test: Boot to home Change-Id: I43e374230258ae172677c993405d15763895a991 Signed-off-by: Jacky Liu --- conf/init.bluejay.rc | 20 ++++++++++---------- conf/init.blueport.rc | 5 +---- powerstats/bluejay/service.cpp | 14 ++------------ 3 files changed, 13 insertions(+), 26 deletions(-) diff --git a/conf/init.bluejay.rc b/conf/init.bluejay.rc index 7378c6e..3c256bc 100644 --- a/conf/init.bluejay.rc +++ b/conf/init.bluejay.rc @@ -35,15 +35,15 @@ on property:vendor.all.modules.ready=1 chown system system /mnt/vendor/persist/haptics chown system system /mnt/vendor/persist/haptics/cs40l26.cal - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/f0_stored - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/q_stored - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/redc_stored - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/vibe_state - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/num_waves - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/f0_offset - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/owt_free_space - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/f0_comp_enable - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/redc_comp_enable - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/delay_before_stop_playback_us + chown system system /sys/bus/i2c/devices/8-0043/calibration/f0_stored + chown system system /sys/bus/i2c/devices/8-0043/calibration/q_stored + chown system system /sys/bus/i2c/devices/8-0043/calibration/redc_stored + chown system system /sys/bus/i2c/devices/8-0043/default/vibe_state + chown system system /sys/bus/i2c/devices/8-0043/default/num_waves + chown system system /sys/bus/i2c/devices/8-0043/default/f0_offset + chown system system /sys/bus/i2c/devices/8-0043/default/owt_free_space + chown system system /sys/bus/i2c/devices/8-0043/default/f0_comp_enable + chown system system /sys/bus/i2c/devices/8-0043/default/redc_comp_enable + chown system system /sys/bus/i2c/devices/8-0043/default/delay_before_stop_playback_us enable vendor.vibrator.cs40l26 diff --git a/conf/init.blueport.rc b/conf/init.blueport.rc index bd69d18..5f411f8 100644 --- a/conf/init.blueport.rc +++ b/conf/init.blueport.rc @@ -6,11 +6,8 @@ on init && property:ro.vendor.factory=1 import /vendor/etc/init/hw/init.factory.rc on init - # logbuffer - chown system system /dev/logbuffer_2-0057 - chown system system /dev/logbuffer_6-0057 # register/nvmem dump - chown system system /sys/bus/nvmem/devices/5-00500/nvmem + chown system system /sys/bus/nvmem/devices/8-00500/nvmem # NFC streset tool name setprop persist.vendor.nfc.streset libstreset21 setprop persist.vendor.se.streset libstreset21 diff --git a/powerstats/bluejay/service.cpp b/powerstats/bluejay/service.cpp index 8d639a5..7649d8e 100644 --- a/powerstats/bluejay/service.cpp +++ b/powerstats/bluejay/service.cpp @@ -73,18 +73,8 @@ int main() { addGs101CommonDataProviders(p); addDisplay(p); - if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-3/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-3/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-4/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-4/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-5/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-5/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-6/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-6/i2c-st21nfc/power_stats"); - } else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-7/i2c-st21nfc/power_stats", &buffer)) { - addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-7/i2c-st21nfc/power_stats"); - } else { - addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-8/i2c-st21nfc/power_stats"); + if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-7/7-0008/power_stats", &buffer)) { + addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-7/7-0008/power_stats"); } const std::string instance = std::string() + PowerStats::descriptor + "/default"; binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str());