From 26f4504f167659630b358c8e93a116761ac4e3a6 Mon Sep 17 00:00:00 2001
From: Badhri Jagan Sridharan <badhri@google.com>
Date: Sat, 27 Aug 2022 02:42:21 +0000
Subject: [PATCH] Enable USB HAL

Fix up i2c address for typec and enable USB HAL.

Bug: 241871290
Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
Change-Id: I87ce763e350bfaec05dbe83ee040eda7d252e7a2
---
 device.mk       | 2 +-
 usb/usb/Usb.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/device.mk b/device.mk
index 74ffb194..75581dc0 100644
--- a/device.mk
+++ b/device.mk
@@ -393,7 +393,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += android.hardware.sensors@2.1-service.multihal
 
 # USB HAL
-#PRODUCT_PACKAGES += \
+PRODUCT_PACKAGES += \
 	android.hardware.usb-service
 PRODUCT_PACKAGES += \
 	android.hardware.usb.gadget-service
diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp
index 31dd1b71..f9cd5fa0 100644
--- a/usb/usb/Usb.cpp
+++ b/usb/usb/Usb.cpp
@@ -57,8 +57,8 @@ namespace usb {
 volatile bool destroyThread;
 
 string enabledPath;
-constexpr char kHsi2cPath[] = "/sys/devices/platform/10d60000.hsi2c";
-constexpr char kI2CPath[] = "/sys/devices/platform/10d60000.hsi2c/i2c-";
+constexpr char kHsi2cPath[] = "/sys/devices/platform/10CB0000.hsi2c";
+constexpr char kI2CPath[] = "/sys/devices/platform/10CB0000.hsi2c/i2c-";
 constexpr char kContaminantDetectionPath[] = "i2c-max77759tcpc/contaminant_detection";
 constexpr char kStatusPath[] = "i2c-max77759tcpc/contaminant_detection_status";
 constexpr char kSinkLimitEnable[] = "i2c-max77759tcpc/usb_limit_sink_enable";