From 3f59f6f6ed8f43fcbadee22f14fcd31ad8d2b0dd Mon Sep 17 00:00:00 2001
From: Jacky Liu <qsliu@google.com>
Date: Thu, 19 Oct 2023 17:56:58 +0800
Subject: [PATCH] Update i2c pathes with new static i2c bus numbers

Bug: 305242309
Test: Boot to home
Change-Id: I8caecc32b7e0cce34be9e6200bac20b2d6fdd35b
---
 conf/init.husky.rc      | 68 +++++++++--------------------------
 conf/init.ripcurrent.rc | 80 +++++++++++------------------------------
 conf/init.shiba.rc      | 68 +++++++++--------------------------
 3 files changed, 54 insertions(+), 162 deletions(-)

diff --git a/conf/init.husky.rc b/conf/init.husky.rc
index 1b81446..22e109f 100644
--- a/conf/init.husky.rc
+++ b/conf/init.husky.rc
@@ -64,57 +64,23 @@ 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/6-0043/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/5-0043/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/4-0043/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/6-0043/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/5-0043/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/4-0043/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/6-0043/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/5-0043/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/4-0043/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/6-0043/default/vibe_state
-    chown system system /sys/bus/i2c/devices/5-0043/default/vibe_state
-    chown system system /sys/bus/i2c/devices/4-0043/default/vibe_state
-    chown system system /sys/bus/i2c/devices/6-0043/default/num_waves
-    chown system system /sys/bus/i2c/devices/5-0043/default/num_waves
-    chown system system /sys/bus/i2c/devices/4-0043/default/num_waves
-    chown system system /sys/bus/i2c/devices/6-0043/default/f0_offset
-    chown system system /sys/bus/i2c/devices/5-0043/default/f0_offset
-    chown system system /sys/bus/i2c/devices/4-0043/default/f0_offset
-    chown system system /sys/bus/i2c/devices/6-0043/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/5-0043/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/4-0043/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/6-0043/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/5-0043/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/4-0043/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/6-0043/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/5-0043/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/4-0043/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/6-0043/default/delay_before_stop_playback_us
-    chown system system /sys/bus/i2c/devices/5-0043/default/delay_before_stop_playback_us
-    chown system system /sys/bus/i2c/devices/4-0043/default/delay_before_stop_playback_us
-    chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_env_rel_coef
-    chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_env_rel_coef
-    chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_env_rel_coef
-    chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_rise_headroom
-    chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_rise_headroom
-    chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_rise_headroom
-    chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_fall_headroom
-    chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_fall_headroom
-    chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_fall_headroom
-    chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_enable
-    chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_enable
-    chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_enable
-    chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_tx_lvl_thresh_fs
-    chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_tx_lvl_thresh_fs
-    chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_tx_lvl_thresh_fs
-    chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_tx_lvl_hold_off_ms
-    chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_tx_lvl_hold_off_ms
-    chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_tx_lvl_hold_off_ms
-    chown system system /sys/bus/i2c/devices/6-0043/default/pm_active_timeout_ms
-    chown system system /sys/bus/i2c/devices/5-0043/default/pm_active_timeout_ms
-    chown system system /sys/bus/i2c/devices/4-0043/default/pm_active_timeout_ms
+    chown system system /sys/bus/i2c/devices/0-0043/calibration/f0_stored
+    chown system system /sys/bus/i2c/devices/0-0043/calibration/q_stored
+    chown system system /sys/bus/i2c/devices/0-0043/calibration/redc_stored
+    chown system system /sys/bus/i2c/devices/0-0043/default/vibe_state
+    chown system system /sys/bus/i2c/devices/0-0043/default/num_waves
+    chown system system /sys/bus/i2c/devices/0-0043/default/f0_offset
+    chown system system /sys/bus/i2c/devices/0-0043/default/owt_free_space
+    chown system system /sys/bus/i2c/devices/0-0043/default/f0_comp_enable
+    chown system system /sys/bus/i2c/devices/0-0043/default/redc_comp_enable
+    chown system system /sys/bus/i2c/devices/0-0043/default/delay_before_stop_playback_us
+    chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_env_rel_coef
+    chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_rise_headroom
+    chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_fall_headroom
+    chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_enable
+    chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_tx_lvl_thresh_fs
+    chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_tx_lvl_hold_off_ms
+    chown system system /sys/bus/i2c/devices/0-0043/default/pm_active_timeout_ms
 
     enable vendor.vibrator.cs40l26
 
diff --git a/conf/init.ripcurrent.rc b/conf/init.ripcurrent.rc
index b4a3caf..bcb8c07 100644
--- a/conf/init.ripcurrent.rc
+++ b/conf/init.ripcurrent.rc
@@ -48,66 +48,26 @@ on property:vendor.all.modules.ready=1
     chown system system /mnt/vendor/persist/haptics/cs40l26.cal
     chown system system /mnt/vendor/persist/haptics/cs40l26_dual.cal
 
-    chown system system /sys/bus/i2c/devices/6-0043/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/5-0043/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/4-0043/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/6-0042/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/5-0042/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/4-0042/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/6-0043/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/5-0043/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/4-0043/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/6-0042/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/5-0042/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/4-0042/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/6-0043/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/5-0043/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/4-0043/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/6-0042/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/5-0042/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/4-0042/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/6-0043/default/vibe_state
-    chown system system /sys/bus/i2c/devices/5-0043/default/vibe_state
-    chown system system /sys/bus/i2c/devices/4-0043/default/vibe_state
-    chown system system /sys/bus/i2c/devices/6-0042/default/vibe_state
-    chown system system /sys/bus/i2c/devices/5-0042/default/vibe_state
-    chown system system /sys/bus/i2c/devices/4-0042/default/vibe_state
-    chown system system /sys/bus/i2c/devices/6-0043/default/num_waves
-    chown system system /sys/bus/i2c/devices/5-0043/default/num_waves
-    chown system system /sys/bus/i2c/devices/4-0043/default/num_waves
-    chown system system /sys/bus/i2c/devices/6-0042/default/num_waves
-    chown system system /sys/bus/i2c/devices/5-0042/default/num_waves
-    chown system system /sys/bus/i2c/devices/4-0042/default/num_waves
-    chown system system /sys/bus/i2c/devices/6-0043/default/f0_offset
-    chown system system /sys/bus/i2c/devices/5-0043/default/f0_offset
-    chown system system /sys/bus/i2c/devices/4-0043/default/f0_offset
-    chown system system /sys/bus/i2c/devices/6-0042/default/f0_offset
-    chown system system /sys/bus/i2c/devices/5-0042/default/f0_offset
-    chown system system /sys/bus/i2c/devices/4-0042/default/f0_offset
-    chown system system /sys/bus/i2c/devices/6-0043/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/5-0043/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/4-0043/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/6-0042/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/5-0042/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/4-0042/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/6-0043/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/5-0043/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/4-0043/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/6-0042/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/5-0042/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/4-0042/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/6-0043/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/5-0043/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/4-0043/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/6-0042/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/5-0042/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/4-0042/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/6-0043/default/delay_before_stop_playback_us
-    chown system system /sys/bus/i2c/devices/5-0043/default/delay_before_stop_playback_us
-    chown system system /sys/bus/i2c/devices/4-0043/default/delay_before_stop_playback_us
-    chown system system /sys/bus/i2c/devices/6-0042/default/delay_before_stop_playback_us
-    chown system system /sys/bus/i2c/devices/5-0042/default/delay_before_stop_playback_us
-    chown system system /sys/bus/i2c/devices/4-0042/default/delay_before_stop_playback_us
+    chown system system /sys/bus/i2c/devices/0-0043/calibration/f0_stored
+    chown system system /sys/bus/i2c/devices/0-0042/calibration/f0_stored
+    chown system system /sys/bus/i2c/devices/0-0043/calibration/q_stored
+    chown system system /sys/bus/i2c/devices/0-0042/calibration/q_stored
+    chown system system /sys/bus/i2c/devices/0-0043/calibration/redc_stored
+    chown system system /sys/bus/i2c/devices/0-0042/calibration/redc_stored
+    chown system system /sys/bus/i2c/devices/0-0043/default/vibe_state
+    chown system system /sys/bus/i2c/devices/0-0042/default/vibe_state
+    chown system system /sys/bus/i2c/devices/0-0043/default/num_waves
+    chown system system /sys/bus/i2c/devices/0-0042/default/num_waves
+    chown system system /sys/bus/i2c/devices/0-0043/default/f0_offset
+    chown system system /sys/bus/i2c/devices/0-0042/default/f0_offset
+    chown system system /sys/bus/i2c/devices/0-0043/default/owt_free_space
+    chown system system /sys/bus/i2c/devices/0-0042/default/owt_free_space
+    chown system system /sys/bus/i2c/devices/0-0043/default/f0_comp_enable
+    chown system system /sys/bus/i2c/devices/0-0042/default/f0_comp_enable
+    chown system system /sys/bus/i2c/devices/0-0043/default/redc_comp_enable
+    chown system system /sys/bus/i2c/devices/0-0042/default/redc_comp_enable
+    chown system system /sys/bus/i2c/devices/0-0043/default/delay_before_stop_playback_us
+    chown system system /sys/bus/i2c/devices/0-0042/default/delay_before_stop_playback_us
 
     enable vendor.vibrator.cs40l26
     enable vendor.vibrator.cs40l26-dual
diff --git a/conf/init.shiba.rc b/conf/init.shiba.rc
index e4c97a2..635f915 100644
--- a/conf/init.shiba.rc
+++ b/conf/init.shiba.rc
@@ -60,57 +60,23 @@ 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/6-0043/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/5-0043/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/4-0043/calibration/f0_stored
-    chown system system /sys/bus/i2c/devices/6-0043/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/5-0043/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/4-0043/calibration/q_stored
-    chown system system /sys/bus/i2c/devices/6-0043/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/5-0043/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/4-0043/calibration/redc_stored
-    chown system system /sys/bus/i2c/devices/6-0043/default/vibe_state
-    chown system system /sys/bus/i2c/devices/5-0043/default/vibe_state
-    chown system system /sys/bus/i2c/devices/4-0043/default/vibe_state
-    chown system system /sys/bus/i2c/devices/6-0043/default/num_waves
-    chown system system /sys/bus/i2c/devices/5-0043/default/num_waves
-    chown system system /sys/bus/i2c/devices/4-0043/default/num_waves
-    chown system system /sys/bus/i2c/devices/6-0043/default/f0_offset
-    chown system system /sys/bus/i2c/devices/5-0043/default/f0_offset
-    chown system system /sys/bus/i2c/devices/4-0043/default/f0_offset
-    chown system system /sys/bus/i2c/devices/6-0043/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/5-0043/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/4-0043/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/6-0043/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/5-0043/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/4-0043/default/f0_comp_enable
-    chown system system /sys/bus/i2c/devices/6-0043/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/5-0043/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/4-0043/default/redc_comp_enable
-    chown system system /sys/bus/i2c/devices/6-0043/default/delay_before_stop_playback_us
-    chown system system /sys/bus/i2c/devices/5-0043/default/delay_before_stop_playback_us
-    chown system system /sys/bus/i2c/devices/4-0043/default/delay_before_stop_playback_us
-    chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_env_rel_coef
-    chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_env_rel_coef
-    chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_env_rel_coef
-    chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_rise_headroom
-    chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_rise_headroom
-    chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_rise_headroom
-    chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_fall_headroom
-    chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_fall_headroom
-    chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_fall_headroom
-    chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_enable
-    chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_enable
-    chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_enable
-    chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_tx_lvl_thresh_fs
-    chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_tx_lvl_thresh_fs
-    chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_tx_lvl_thresh_fs
-    chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_tx_lvl_hold_off_ms
-    chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_tx_lvl_hold_off_ms
-    chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_tx_lvl_hold_off_ms
-    chown system system /sys/bus/i2c/devices/6-0043/default/pm_active_timeout_ms
-    chown system system /sys/bus/i2c/devices/5-0043/default/pm_active_timeout_ms
-    chown system system /sys/bus/i2c/devices/4-0043/default/pm_active_timeout_ms
+    chown system system /sys/bus/i2c/devices/0-0043/calibration/f0_stored
+    chown system system /sys/bus/i2c/devices/0-0043/calibration/q_stored
+    chown system system /sys/bus/i2c/devices/0-0043/calibration/redc_stored
+    chown system system /sys/bus/i2c/devices/0-0043/default/vibe_state
+    chown system system /sys/bus/i2c/devices/0-0043/default/num_waves
+    chown system system /sys/bus/i2c/devices/0-0043/default/f0_offset
+    chown system system /sys/bus/i2c/devices/0-0043/default/owt_free_space
+    chown system system /sys/bus/i2c/devices/0-0043/default/f0_comp_enable
+    chown system system /sys/bus/i2c/devices/0-0043/default/redc_comp_enable
+    chown system system /sys/bus/i2c/devices/0-0043/default/delay_before_stop_playback_us
+    chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_env_rel_coef
+    chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_rise_headroom
+    chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_fall_headroom
+    chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_enable
+    chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_tx_lvl_thresh_fs
+    chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_tx_lvl_hold_off_ms
+    chown system system /sys/bus/i2c/devices/0-0043/default/pm_active_timeout_ms
 
     enable vendor.vibrator.cs40l26