commit e7d71908294fcb05ea0a824c5347d0c0b281b4ff
author Yongqin Liu <yongqin.liu@linaro.org> Tue Nov 24 18:41:09 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Nov 24 18:41:09 2020 +0000
tree b76b1ad9bb1d614a0cf092b7aa8a19e677a5dd27
parent 52f6b5e2ff7709b548d871fb76cb0aefe07b7c2d
parent c33201b904895b975752f956bef2d91032cb8240

hikey/hikey960: init.common.usb.rc: Add setprop sys.usb.controller to avoid picking the dummy hcd am: 339a268ed9 am: c33201b904

Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1425648

Change-Id: I9f1ff25c8e6c0956d7a92484d0df67bbe0012bd0

hikey/device-hikey.mk

diff --git a/hikey/device-hikey.mk b/hikey/device-hikey.mk
index 70680e5..cec2e6f 100644
--- a/hikey/device-hikey.mk
+++ b/hikey/device-hikey.mk
@@ -20,7 +20,7 @@
 			device/linaro/hikey/fstab.ramdisk:$(TARGET_COPY_OUT_RAMDISK)/fstab.hikey \
 			device/linaro/hikey/hikey/init.hikey.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey.rc \
 			device/linaro/hikey/init.hikey.power.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey.power.rc \
-			device/linaro/hikey/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey.usb.rc \
+			device/linaro/hikey/hikey/init.hikey.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey.usb.rc \
 			device/linaro/hikey/ueventd.common.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \
 			device/linaro/hikey/common.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/hikey.kl
 

hikey/init.hikey.usb.rc

diff --git a/init.common.usb.rc b/hikey/init.hikey.usb.rc
similarity index 98%
copy from init.common.usb.rc
copy to hikey/init.hikey.usb.rc
index 16054ba..baffb12 100644
--- a/init.common.usb.rc
+++ b/hikey/init.hikey.usb.rc
@@ -27,6 +27,9 @@
     mkdir /dev/usb-ffs/ptp 0770 mtp mtp
     mount functionfs mtp /dev/usb-ffs/mtp rmode=0770,fmode=0660,uid=1024,gid=1024,no_disconnect=1
     mount functionfs ptp /dev/usb-ffs/ptp rmode=0770,fmode=0660,uid=1024,gid=1024,no_disconnect=1
+
+    setprop sys.usb.controller "f72c0000.usb"
+
     setprop sys.usb.mtp.device_type 3
     setprop sys.usb.configfs 1
     setprop sys.usb.ffs.aio_compat 1

hikey960/device-hikey960.mk

diff --git a/hikey960/device-hikey960.mk b/hikey960/device-hikey960.mk
index e6730a1..6c707bb 100644
--- a/hikey960/device-hikey960.mk
+++ b/hikey960/device-hikey960.mk
@@ -21,7 +21,7 @@
 			device/linaro/hikey/fstab.ramdisk:$(TARGET_COPY_OUT_RAMDISK)/fstab.hikey960 \
 			device/linaro/hikey/hikey960/init.hikey960.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey960.rc \
 			device/linaro/hikey/init.hikey960.power.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey960.power.rc \
-			device/linaro/hikey/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey960.usb.rc \
+			device/linaro/hikey/hikey960/init.hikey960.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey960.usb.rc \
 			device/linaro/hikey/ueventd.common.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \
 			device/linaro/hikey/common.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/hikey960.kl \
 			frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \

hikey960/init.hikey960.usb.rc

diff --git a/init.common.usb.rc b/hikey960/init.hikey960.usb.rc
similarity index 98%
rename from init.common.usb.rc
rename to hikey960/init.hikey960.usb.rc
index 16054ba..bf9e0a4 100644
--- a/init.common.usb.rc
+++ b/hikey960/init.hikey960.usb.rc
@@ -27,6 +27,9 @@
     mkdir /dev/usb-ffs/ptp 0770 mtp mtp
     mount functionfs mtp /dev/usb-ffs/mtp rmode=0770,fmode=0660,uid=1024,gid=1024,no_disconnect=1
     mount functionfs ptp /dev/usb-ffs/ptp rmode=0770,fmode=0660,uid=1024,gid=1024,no_disconnect=1
+
+    setprop sys.usb.controller "ff100000.dwc3"
+
     setprop sys.usb.mtp.device_type 3
     setprop sys.usb.configfs 1
     setprop sys.usb.ffs.aio_compat 1