diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc
index 4e9b096b..45ef4764 100644
--- a/conf/init.zuma.rc
+++ b/conf/init.zuma.rc
@@ -238,11 +238,7 @@ on init
     chown system system /sys/class/power_supply/maxfg_base/m5_model_state
 
     # Dump eeprom
-    chown system system /sys/devices/platform/10970000.hsi2c/i2c-5/5-0050/eeprom
-    chown system system /sys/devices/platform/10970000.hsi2c/i2c-4/4-0050/eeprom
-    chown system system /sys/devices/platform/10da0000.hsi2c/i2c-6/6-0050/eeprom
-    chown system system /sys/devices/platform/10c90000.hsi2c/i2c-6/6-0050/eeprom
-    chown system system /sys/devices/platform/10c90000.hsi2c/i2c-7/7-0050/eeprom
+    chown system system /sys/devices/platform/10c90000.hsi2c/i2c-9/9-0050/eeprom
     chown system system /dev/battery_history
     chmod 0644 /dev/battery_history
 
diff --git a/dumpstate/dump_power.cpp b/dumpstate/dump_power.cpp
index e7ab364c..eb770fc3 100644
--- a/dumpstate/dump_power.cpp
+++ b/dumpstate/dump_power.cpp
@@ -151,7 +151,7 @@ void dumpPowerSupplyStats() {
             {"Power supply property gcpm_pps", "/sys/class/power_supply/gcpm_pps/uevent"},
             {"Power supply property main-charger", "/sys/class/power_supply/main-charger/uevent"},
             {"Power supply property dc-mains", "/sys/class/power_supply/dc-mains/uevent"},
-            {"Power supply property tcpm", "/sys/class/power_supply/tcpm-source-psy-8-0025/uevent"},
+            {"Power supply property tcpm", "/sys/class/power_supply/tcpm-source-psy-11-0025/uevent"},
             {"Power supply property usb", "/sys/class/power_supply/usb/uevent"},
             {"Power supply property wireless", "/sys/class/power_supply/wireless/uevent"},
     };
@@ -420,12 +420,7 @@ void dumpChgUserDebug() {
 void dumpBatteryEeprom() {
     const char *title = "Battery EEPROM";
     const char *files[] {
-            "/sys/devices/platform/10970000.hsi2c/i2c-4/4-0050/eeprom",
-            "/sys/devices/platform/10970000.hsi2c/i2c-5/5-0050/eeprom",
-            "/sys/devices/platform/10da0000.hsi2c/i2c-6/6-0050/eeprom",
-            "/sys/devices/platform/10da0000.hsi2c/i2c-7/7-0050/eeprom",
-            "/sys/devices/platform/10c90000.hsi2c/i2c-7/7-0050/eeprom",
-            "/sys/devices/platform/10c90000.hsi2c/i2c-6/6-0050/eeprom",
+            "/sys/devices/platform/10c90000.hsi2c/i2c-9/9-0050/eeprom",
     };
     std::string result;
     std::string xxdCmd;
@@ -714,9 +709,9 @@ void dumpIrqDurationCounts() {
     };
 
     const char *lpfCurrentDirs[] = {
-            "/sys/devices/platform/acpm_mfd_bus@15500000/i2c-1/1-001f/s2mpg14-meter/"
+            "/sys/devices/platform/acpm_mfd_bus@15500000/i2c-7/7-001f/s2mpg14-meter/"
                     "s2mpg14-odpm/iio:device1/lpf_current",
-            "/sys/devices/platform/acpm_mfd_bus@15510000/i2c-0/0-002f/s2mpg15-meter/"
+            "/sys/devices/platform/acpm_mfd_bus@15510000/i2c-8/8-002f/s2mpg15-meter/"
                     "s2mpg15-odpm/iio:device0/lpf_current",
     };
 
diff --git a/usb/usb/android.hardware.usb-service.rc b/usb/usb/android.hardware.usb-service.rc
index 4fe8d1b6..7619869a 100644
--- a/usb/usb/android.hardware.usb-service.rc
+++ b/usb/usb/android.hardware.usb-service.rc
@@ -9,76 +9,13 @@ on post-fs
     chown root system /sys/class/typec/port0/data_role
     chown root system /sys/class/typec/port0/port_type
     chown root system /sys/class/typec/port0/port0.0/mode1/active
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-0/0-0025/contaminant_detection
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-1/1-0025/contaminant_detection
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-2/2-0025/contaminant_detection
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-3/3-0025/contaminant_detection
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-4/4-0025/contaminant_detection
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-5/5-0025/contaminant_detection
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-6/6-0025/contaminant_detection
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-7/7-0025/contaminant_detection
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-8/8-0025/contaminant_detection
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-9/9-0025/contaminant_detection
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-0/0-0025/usb_limit_accessory_current
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-1/1-0025/usb_limit_accessory_current
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-2/2-0025/usb_limit_accessory_current
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-3/3-0025/usb_limit_accessory_current
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-4/4-0025/usb_limit_accessory_current
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-5/5-0025/usb_limit_accessory_current
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-6/6-0025/usb_limit_accessory_current
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-7/7-0025/usb_limit_accessory_current
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-8/8-0025/usb_limit_accessory_current
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-9/9-0025/usb_limit_accessory_current
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-0/0-0025/usb_limit_accessory_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-1/1-0025/usb_limit_accessory_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-2/2-0025/usb_limit_accessory_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-3/3-0025/usb_limit_accessory_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-4/4-0025/usb_limit_accessory_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-5/5-0025/usb_limit_accessory_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-6/6-0025/usb_limit_accessory_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-7/7-0025/usb_limit_accessory_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-8/8-0025/usb_limit_accessory_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-9/9-0025/usb_limit_accessory_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-0/0-0025/usb_limit_sink_current
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-1/1-0025/usb_limit_sink_current
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-2/2-0025/usb_limit_sink_current
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-3/3-0025/usb_limit_sink_current
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-4/4-0025/usb_limit_sink_current
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-5/5-0025/usb_limit_sink_current
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-6/6-0025/usb_limit_sink_current
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-7/7-0025/usb_limit_sink_current
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-8/8-0025/usb_limit_sink_current
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-9/9-0025/usb_limit_sink_current
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-0/0-0025/usb_limit_sink_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-1/1-0025/usb_limit_sink_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-2/2-0025/usb_limit_sink_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-3/3-0025/usb_limit_sink_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-4/4-0025/usb_limit_sink_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-5/5-0025/usb_limit_sink_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-6/6-0025/usb_limit_sink_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-7/7-0025/usb_limit_sink_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-8/8-0025/usb_limit_sink_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-9/9-0025/usb_limit_sink_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-0/0-0025/usb_limit_source_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-1/1-0025/usb_limit_source_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-2/2-0025/usb_limit_source_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-3/3-0025/usb_limit_source_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-4/4-0025/usb_limit_source_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-5/5-0025/usb_limit_source_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-6/6-0025/usb_limit_source_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-7/7-0025/usb_limit_source_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-8/8-0025/usb_limit_source_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-9/9-0025/usb_limit_source_enable
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-0/0-0025/update_sdp_enum_timeout
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-1/1-0025/update_sdp_enum_timeout
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-2/2-0025/update_sdp_enum_timeout
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-3/3-0025/update_sdp_enum_timeout
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-4/4-0025/update_sdp_enum_timeout
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-5/5-0025/update_sdp_enum_timeout
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-6/6-0025/update_sdp_enum_timeout
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-7/7-0025/update_sdp_enum_timeout
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-8/8-0025/update_sdp_enum_timeout
-    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-9/9-0025/update_sdp_enum_timeout
+    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-11/11-0025/contaminant_detection
+    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-11/11-0025/usb_limit_accessory_current
+    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-11/11-0025/usb_limit_accessory_enable
+    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-11/11-0025/usb_limit_sink_current
+    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-11/11-0025/usb_limit_sink_enable
+    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-11/11-0025/usb_limit_source_enable
+    chown root system /sys/devices/platform/10cb0000.hsi2c/i2c-11/11-0025/update_sdp_enum_timeout
     chown root system /sys/devices/platform/110f0000.drmdp/drm-displayport/hpd
     chown root system /sys/devices/platform/110f0000.drmdp/drm-displayport/irq_hpd
     chown root system /sys/devices/platform/110f0000.drmdp/drm-displayport/orientation
@@ -95,76 +32,13 @@ on post-fs
     chmod 664 /sys/devices/platform/11110000.usb/dwc3_exynos_otg_b_sess
     chmod 664 /sys/devices/platform/11110000.usb/dwc3_exynos_otg_id
     chmod 664 /sys/devices/platform/11110000.usb/usb_data_enabled
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-0/0-0025/contaminant_detection
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-1/1-0025/contaminant_detection
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-2/2-0025/contaminant_detection
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-3/3-0025/contaminant_detection
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-4/4-0025/contaminant_detection
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-5/5-0025/contaminant_detection
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-6/6-0025/contaminant_detection
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-7/7-0025/contaminant_detection
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-8/8-0025/contaminant_detection
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-9/9-0025/contaminant_detection
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-0/0-0025/usb_limit_accessory_current
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-1/1-0025/usb_limit_accessory_current
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-2/2-0025/usb_limit_accessory_current
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-3/3-0025/usb_limit_accessory_current
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-4/4-0025/usb_limit_accessory_current
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-5/5-0025/usb_limit_accessory_current
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-6/6-0025/usb_limit_accessory_current
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-7/7-0025/usb_limit_accessory_current
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-8/8-0025/usb_limit_accessory_current
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-9/9-0025/usb_limit_accessory_current
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-0/0-0025/usb_limit_accessory_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-1/1-0025/usb_limit_accessory_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-2/2-0025/usb_limit_accessory_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-3/3-0025/usb_limit_accessory_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-4/4-0025/usb_limit_accessory_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-5/5-0025/usb_limit_accessory_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-6/6-0025/usb_limit_accessory_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-7/7-0025/usb_limit_accessory_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-8/8-0025/usb_limit_accessory_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-9/9-0025/usb_limit_accessory_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-0/0-0025/usb_limit_sink_current
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-1/1-0025/usb_limit_sink_current
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-2/2-0025/usb_limit_sink_current
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-3/3-0025/usb_limit_sink_current
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-4/4-0025/usb_limit_sink_current
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-5/5-0025/usb_limit_sink_current
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-6/6-0025/usb_limit_sink_current
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-7/7-0025/usb_limit_sink_current
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-8/8-0025/usb_limit_sink_current
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-9/9-0025/usb_limit_sink_current
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-0/0-0025/usb_limit_sink_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-1/1-0025/usb_limit_sink_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-2/2-0025/usb_limit_sink_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-3/3-0025/usb_limit_sink_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-4/4-0025/usb_limit_sink_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-5/5-0025/usb_limit_sink_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-6/6-0025/usb_limit_sink_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-7/7-0025/usb_limit_sink_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-8/8-0025/usb_limit_sink_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-9/9-0025/usb_limit_sink_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-0/0-0025/usb_limit_source_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-1/1-0025/usb_limit_source_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-2/2-0025/usb_limit_source_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-3/3-0025/usb_limit_source_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-4/4-0025/usb_limit_source_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-5/5-0025/usb_limit_source_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-6/6-0025/usb_limit_source_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-7/7-0025/usb_limit_source_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-8/8-0025/usb_limit_source_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-9/9-0025/usb_limit_source_enable
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-0/0-0025/update_sdp_enum_timeout
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-1/1-0025/update_sdp_enum_timeout
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-2/2-0025/update_sdp_enum_timeout
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-3/3-0025/update_sdp_enum_timeout
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-4/4-0025/update_sdp_enum_timeout
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-5/5-0025/update_sdp_enum_timeout
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-6/6-0025/update_sdp_enum_timeout
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-7/7-0025/update_sdp_enum_timeout
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-8/8-0025/update_sdp_enum_timeout
-    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-9/9-0025/update_sdp_enum_timeout
+    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-11/11-0025/contaminant_detection
+    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-11/11-0025/usb_limit_accessory_current
+    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-11/11-0025/usb_limit_accessory_enable
+    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-11/11-0025/usb_limit_sink_current
+    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-11/11-0025/usb_limit_sink_enable
+    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-11/11-0025/usb_limit_source_enable
+    chmod 664 /sys/devices/platform/10cb0000.hsi2c/i2c-11/11-0025/update_sdp_enum_timeout
     chmod 664 /sys/devices/platform/110f0000.drmdp/drm-displayport/hpd
     chmod 664 /sys/devices/platform/110f0000.drmdp/drm-displayport/irq_hpd
     chmod 664 /sys/devices/platform/110f0000.drmdp/drm-displayport/orientation