From 555896aae785e5033c292df4b781254b5455c280 Mon Sep 17 00:00:00 2001 From: Marc Bourgoin Date: Sun, 5 Mar 2023 20:41:20 -0700 Subject: [PATCH] Revert "sm7325-common: Use bluetooth firmware from A52s" This reverts commit bdbd9a4df48998b12acc836a802e5b744f00ec29. Reason: Xiaomi Mi 11 Lite 5G NE (lisa) got A13 stock ROM so we can just flash their bluetooth firmware partition onto ours and fix the issue right at the source and drop the fix we have in our device tree. Change-Id: I21f4918f8d0fc794db29b4aa2235c238c36a800e --- proprietary-files.txt | 5 ----- rootdir/etc/fstab.qcom | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/proprietary-files.txt b/proprietary-files.txt index 89642cc..38ae491 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -122,11 +122,6 @@ vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so system/lib64/libaptXHD_encoder.so system/lib64/libaptX_encoder.so -# Bluetooth firmware - from Samsung a52s A528BXXS1DVL2 -vendor/firmware/msbtfw11.mbn|0f335b6aac6fc172189bc54bfc634eec9f3cc83d -vendor/firmware/msbtfw11.tlv|d3370e79900765c193f8f689eaa96a9315f1bc53 -vendor/firmware/msnv11.bin|4992291555d24a347f3cb3e41098e0501b7b0b30 - # CDSP vendor/bin/cdsprpcd vendor/etc/init/vendor.qti.cdsprpc-service.rc diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom index 4908974..1aabe07 100644 --- a/rootdir/etc/fstab.qcom +++ b/rootdir/etc/fstab.qcom @@ -17,6 +17,7 @@ vendor /vendor /dev/block/bootdevice/by-name/dsp /vendor/dsp ext4 ro,nosuid,nodev,barrier=1 wait,slotselect /dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 noatime,nosuid,nodev,data=ordered,barrier=1 wait /dev/block/bootdevice/by-name/prodpersist /mnt/product/persist ext4 noatime,nosuid,nodev,data=ordered,barrier=1 wait,formattable,nofail +/dev/block/bootdevice/by-name/bluetooth /vendor/bt_firmware ext4 ro,nosuid,nodev,context=u:object_r:bt_firmware_file:s0 wait,slotselect /devices/platform/soc/*.ssusb/*.dwc3/xhci-hcd.*.auto* /storage/usbotg vfat nosuid,nodev wait,voldmanaged=usbotg:auto /dev/block/bootdevice/by-name/fsg /vendor/fsg ext4 ro,nosuid,nodev,context=u:object_r:fsg_file:s0 wait,slotselect # Need to have this entry in here even though the mount point itself is no longer needed.