From a693a856a539730188ec320f8cc526607ea7fca7 Mon Sep 17 00:00:00 2001
From: Max Weffers <rcstar6696@gmail.com>
Date: Sat, 14 Oct 2017 12:41:37 +0200
Subject: shinano: Import changes for oreo driver and new fm repo

Change-Id: Ib587c34352d86550253e3f9f49c7a3ed7c25ff78
---
 BoardConfigCommon.mk | 1 +
 shinano.mk           | 4 ++++
 system.prop          | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index d301fbf..8ead391 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -54,6 +54,7 @@ BOARD_HAVE_BLUETOOTH := true
 BOARD_HAVE_BLUETOOTH_BCM := true
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/sony/shinano-common/bluetooth
 BOARD_CUSTOM_BT_CONFIG := device/sony/shinano-common/bluetooth/vnd_shinano.txt
+N_BRCM_HCI := 26
 
 # Camera
 TARGET_USES_MEDIA_EXTENSIONS := true
diff --git a/shinano.mk b/shinano.mk
index 1529497..e900fb2 100644
--- a/shinano.mk
+++ b/shinano.mk
@@ -163,5 +163,9 @@ PRODUCT_COPY_FILES += \
 # BCM Wifi
 $(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4339/device-bcm.mk)
 
+# BT/FM (Broadcom): Adjust the sysfs patch for 3.4 kernel
+BOARD_HAVE_BCM_FM_SYSFS := "/sys/bus/platform/drivers/bcm_ldisc/bcm_ldisc/"
+BOARD_BRCM_HCI_NUM := 26
+
 # Include non-opensource parts
 $(call inherit-product, vendor/sony/shinano-common/shinano-common-vendor.mk)
diff --git a/system.prop b/system.prop
index 81ca42b..c0a9e28 100644
--- a/system.prop
+++ b/system.prop
@@ -38,7 +38,7 @@ ro.qti.sensors.dpc=false
 ro.qti.sensors.wu=false
 
 # BT rfkill
-ro.rfkilldisabled=1
+ro.rfkilldisabled.uim=1
 
 # Assertive Display
 ro.qcom.ad=1
-- 
cgit v1.2.3