From c46f907aaaa0a78e15658e59e38363ee6eb35517 Mon Sep 17 00:00:00 2001 From: tunturn Date: Thu, 9 Mar 2017 12:37:53 +1100 Subject: shinano-common: changes to bringup broadcom FM Radio/Bluetooth Change-Id: I633357fa8a04cf178fdee3e4471d20d5432eb230 --- BoardConfigCommon.mk | 1 + bluetooth/bdroid_buildcfg.h | 2 ++ lineage.dependencies | 4 ++++ rootdir/init.qcom.rc | 18 ++++++++++++++---- rootdir/ueventd.qcom.rc | 8 ++++++++ shinano.mk | 6 ++++++ 6 files changed, 35 insertions(+), 4 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 17f3e21..7b9cd28 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -36,6 +36,7 @@ BOARD_ANT_WIRELESS_DEVICE := "vfs-prerelease" # Audio AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS := true AUDIO_FEATURE_LOW_LATENCY_PRIMARY := true +BOARD_HAVE_BCM_FM := true # Bluetooth BOARD_HAVE_BLUETOOTH := true diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h index c02001e..fdb1ed5 100644 --- a/bluetooth/bdroid_buildcfg.h +++ b/bluetooth/bdroid_buildcfg.h @@ -19,6 +19,8 @@ #define _BDROID_BUILDCFG_H #define BTA_DISABLE_DELAY 100 /* in milliseconds */ +#define HCILP_INCLUDED FALSE +#define BT_WAKE_VIA_USERIAL_IOCTL FALSE /* Defined if the kernel does not have support for CLOCK_BOOTTIME_ALARM */ #define KERNEL_MISSING_CLOCK_BOOTTIME_ALARM TRUE diff --git a/lineage.dependencies b/lineage.dependencies index 244364a..ddb05bd 100644 --- a/lineage.dependencies +++ b/lineage.dependencies @@ -7,4 +7,8 @@ "repository": "android_device_sony_msm8974-common", "target_path": "device/sony/msm8974-common" } + { + "repository": "android_hardware_broadcom_fm", + "target_path": "hardware/broadcom/fm" + }, ] diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc index 8f01da0..6a53991 100644 --- a/rootdir/init.qcom.rc +++ b/rootdir/init.qcom.rc @@ -103,12 +103,13 @@ on early-boot on boot write /sys/module/qpnp_power_on/parameters/forcecrash_on 1 - chown bluetooth net_bt_stack /sys/class/rfkill/rfkill0/type - chown bluetooth net_bt_stack /sys/class/rfkill/rfkill0/state + # Bluetooth + chown bluetooth net_bt /sys/class/rfkill/rfkill0/type + chown bluetooth net_bt /sys/class/rfkill/rfkill0/state chmod 0660 /sys/class/rfkill/rfkill0/state - chown bluetooth net_bt_stack /dev/ttyHS0 + chown bluetooth net_bt /dev/ttyHS0 chmod 0660 /dev/ttyHS0 - chown bluetooth net_bt_stack /sys/devices/platform/msm_serial_hs.0/clock + chown bluetooth bluetooth /sys/devices/platform/msm_serial_hs.0/clock chmod 0660 /sys/devices/platform/msm_serial_hs.0/clock # Create PERFD deamon related dirs @@ -309,6 +310,8 @@ on post-fs-data # to observe dnsmasq.leases file for dhcp information of soft ap. chown dhcp dhcp /data/misc/dhcp + mkdir /data/misc/bluetooth 0770 bluetooth bluetooth + mkdir /data/tombstones 0755 system system mkdir /data/tombstones/vendor 0755 system system mkdir /data/pc 0700 radio radio @@ -610,6 +613,13 @@ service mediadrm /system/bin/mediadrmserver group mediadrm drmrpc trimarea ioprio rt 4 +# brcm-uim-sysfs (BT/FM/ANT+) + service uim /system/bin/brcm-uim-sysfs + class late_start + user root + group bluetooth net_bt_admin net_bt + seclabel u:r:uim:s0 + service ptt_socket_app /system/bin/ptt_socket_app class main user system diff --git a/rootdir/ueventd.qcom.rc b/rootdir/ueventd.qcom.rc index 4a48cdf..3624a6d 100644 --- a/rootdir/ueventd.qcom.rc +++ b/rootdir/ueventd.qcom.rc @@ -47,6 +47,14 @@ #permissions for CSVT /dev/smd11 0660 radio radio +# BT/FM/ANT+ V4L2 +/dev/brcm_bt_drv 0660 bluetooth net_bt_stack +/dev/radio1 0660 system net_bt_stack +/dev/rfcomm0 0660 bluetooth bluetooth +/dev/ttyUSB0 0660 bluetooth bluetooth +/dev/smd3 0660 bluetooth net_bt_stack +/dev/smd2 0660 bluetooth net_bt_stack + /dev/radio0 0640 system system /dev/smdcntl0 0640 radio radio /dev/smdcntl1 0640 radio radio diff --git a/shinano.mk b/shinano.mk index bc54481..43ef5ac 100644 --- a/shinano.mk +++ b/shinano.mk @@ -76,6 +76,12 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ e2fsck +# FM +PRODUCT_PACKAGES += \ + FMRadio \ + brcm-uim-sysfs \ + libfmjni + # GPS PRODUCT_COPY_FILES += \ $(COMMON_PATH)/gps/flp.conf:system/etc/flp.conf \ -- cgit v1.2.3