commit 469c2295651063cb9b8cac8fe255c3fd33e76286
author Treehugger Robot <treehugger-gerrit@google.com> Wed Nov 25 11:08:14 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 25 11:08:14 2020 +0000
tree 1c17a0a61d8bb92749007334c859bba0c77e5d44
parent 339a268ed9ea62d74e2db9979680e203d1bf27f5
parent 9731f9be734c862a3c541e2fa62743cadaecf259

Merge "Fix ifdef, its operand is literal variable name"

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 b722755..301a16b 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