summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/PULL_REQUEST_TEMPLATE.md2
-rw-r--r--BoardConfigCommon.mk1
-rw-r--r--audio/audio_platform_info.xml21
-rw-r--r--bluetooth/bdroid_buildcfg.h1
-rw-r--r--bluetooth/vnd_generic.txt18
-rw-r--r--rootdir/init.camera.rc8
-rw-r--r--rootdir/init.qcom.rc11
-rw-r--r--shinano.mk3
8 files changed, 33 insertions, 32 deletions
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index f113d7e..1e52cf1 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,4 @@
# WE DO NOT MERGE PULL REQUESTS SUBMITTED HERE
-You will need to submit it through [Sony-Stock-Lineage Gerrit](https://gerrit.nailyk.fr/#/admin/projects/android_kernel_sony_msm8974)
+You will need to submit it through [LineageOS Gerrit](https://review.lineageos.org/#/admin/projects/LineageOS/android_device_sony_shinano-common)
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 17aae23..6a1a32d 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -42,6 +42,7 @@ BOARD_HAVE_BCM_FM := true
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_PATH)/bluetooth/vnd_generic.txt
# CM Hardware
BOARD_HARDWARE_CLASS += device/sony/shinano-common/cmhw
diff --git a/audio/audio_platform_info.xml b/audio/audio_platform_info.xml
index 52e7b2c..83ab430 100644
--- a/audio/audio_platform_info.xml
+++ b/audio/audio_platform_info.xml
@@ -30,9 +30,6 @@
<device name="SND_DEVICE_OUT_SPEAKER" acdb_id="15" />
<device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" acdb_id="15" />
<device name="SND_DEVICE_OUT_VOICE_SPEAKER" acdb_id="15" />
- <device name="SND_DEVICE_OUT_VOIP_HANDSET" acdb_id="7" />
- <device name="SND_DEVICE_OUT_VOIP_SPEAKER" acdb_id="15" />
- <device name="SND_DEVICE_OUT_VOIP_HEADPHONES" acdb_id="10" />
<!-- Input devices -->
<device name="SND_DEVICE_IN_CAMCORDER_MIC" acdb_id="544" />
@@ -44,28 +41,20 @@
<device name="SND_DEVICE_OUT_HANDSET" backend="handset" />
<device name="SND_DEVICE_OUT_SPEAKER" backend="speaker" />
<device name="SND_DEVICE_OUT_SPEAKER_REVERSE" backend="speaker" />
+ <device name="SND_DEVICE_OUT_SPEAKER_SAFE" backend="speaker" />
<device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" />
<device name="SND_DEVICE_OUT_VOICE_HANDSET" backend="handset" />
<device name="SND_DEVICE_OUT_VOICE_SPEAKER" backend="speaker" />
<device name="SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET" backend="handset" />
<device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET" backend="speaker-anc-nc-headphone" />
- <device name="SND_DEVICE_OUT_VOIP_HANDSET" backend="handset" />
- <device name="SND_DEVICE_OUT_VOIP_SPEAKER" backend="speaker" />
-
- <!-- Input devices -->
</backend_names>
- <pcm_ids>
- <!-- empty -->
- </pcm_ids>
-
<device_names>
<!-- Output devices -->
- <device name="SND_DEVICE_OUT_VOIP_HANDSET" alias="voice-handset" />
- <device name="SND_DEVICE_OUT_VOIP_SPEAKER" alias="voice-speaker" />
- <device name="SND_DEVICE_OUT_VOIP_HEADPHONES" alias="voice-headphones" />
+ <device name="SND_DEVICE_OUT_SPEAKER_SAFE" alias="speaker-protected" />
+ <device name="SND_DEVICE_OUT_VOICE_HAC_HANDSET" alias="voice-handset-hac" />
- <!-- Input devices -->
- <device name="SND_DEVICE_IN_VOICE_REC_MIC" alias="handset-mic-asr" />
+ <!-- Input devices -->
+ <device name="SND_DEVICE_IN_HDMI_MIC" alias="hdmi-mic" />
</device_names>
</audio_platform_info>
diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
index fdb1ed5..297c49a 100644
--- a/bluetooth/bdroid_buildcfg.h
+++ b/bluetooth/bdroid_buildcfg.h
@@ -21,6 +21,7 @@
#define BTA_DISABLE_DELAY 100 /* in milliseconds */
#define HCILP_INCLUDED FALSE
#define BT_WAKE_VIA_USERIAL_IOCTL FALSE
+#define BTM_WBS_INCLUDED TRUE
/* Defined if the kernel does not have support for CLOCK_BOOTTIME_ALARM */
#define KERNEL_MISSING_CLOCK_BOOTTIME_ALARM TRUE
diff --git a/bluetooth/vnd_generic.txt b/bluetooth/vnd_generic.txt
new file mode 100644
index 0000000..31b1ff8
--- /dev/null
+++ b/bluetooth/vnd_generic.txt
@@ -0,0 +1,18 @@
+BLUETOOTH_UART_DEVICE_PORT = "/dev/ttyHS0"
+FW_PATCHFILE_LOCATION = "/system/etc/firmware/"
+FW_PATCHFILE_NAME = "BCM43xx.hcd"
+BT_WAKE_VIA_USERIAL_IOCTL = TRUE
+USERIAL_IOCTL_BT_WAKE_ASSERT = 0x5441
+USERIAL_IOCTL_BT_WAKE_DEASSERT = 0x5442
+USERIAL_IOCTL_BT_WAKE_GET_ST = 0x5443
+FW_PATCH_SETTLEMENT_DELAY_MS = 100
+UART_TARGET_BAUD_RATE = 3000000
+LPM_IDLE_TIMEOUT_MULTIPLE = 5
+LPM_BT_WAKE_POLARITY = 1
+LPM_HOST_WAKE_POLARITY = 1
+SCO_USE_I2S_INTERFACE = FALSE
+SCO_I2SPCM_IF_ROLE = 0
+BTVND_DBG = FALSE
+BTHW_DBG = TRUE
+VNDUSERIAL_DBG = FALSE
+UPIO_DBG = FALSE
diff --git a/rootdir/init.camera.rc b/rootdir/init.camera.rc
index 1d1acb3..b97bd37 100644
--- a/rootdir/init.camera.rc
+++ b/rootdir/init.camera.rc
@@ -38,7 +38,6 @@ on early-boot
#SONY early boot
start ta_qmi_service
start sct_service
- start mlog_qmi_service
on boot
# PM8941 flash
@@ -96,9 +95,6 @@ on post-fs-data
# SONY: Import MiscTA to System properties
exec -- /system/bin/taimport property
-
- #Wait /data to init credmgrd
- start initcredmgr
service taimport /system/bin/taimport
class late_start
@@ -113,7 +109,7 @@ service iddd /system/bin/iddd
# This script init /cache/CredentialManagerData if /data/credmgr doesn't meet our requirements
service initcredmgr /system/bin/credmgrfirstboot.sh
- class main
+ class late_start
user system
group credmgr_client
oneshot
@@ -128,7 +124,6 @@ service credmgrd /system/bin/credmgrd
user system
group credmgr_client
socket credmgr stream 0660 system credmgr_client
- class main
disabled
# Secure Config Transfer service
@@ -178,7 +173,6 @@ service tad_static /sbin/tad_static /dev/block/bootdevice/by-name/TA 0,16
socket tad stream 0770 system trimarea
# tad_static is in rootfs, normal file_context does not work
seclabel u:r:tad:s0
-
service updatemiscta /system/bin/updatemiscta
class main
user updatemiscta
diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc
index fbcd022..5204ae8 100644
--- a/rootdir/init.qcom.rc
+++ b/rootdir/init.qcom.rc
@@ -408,8 +408,9 @@ service macaddrsetup /system/bin/macaddrsetup /sys/devices/platform/bcmdhd_wlan/
class late_start
user root
oneshot
+
service netmgrd /system/bin/netmgrd
- class main
+ class late_start
on property:ro.radio.noril=true
stop ril-daemon
@@ -481,9 +482,8 @@ service suntrold /system/bin/suntrold
# Modem Log QMI service
service mlog_qmi_service /system/bin/mlog_qmi_service
+ class late_start
user root
- class main
- disabled
# Thermal Manager service
service thermanager /system/bin/thermanager /system/etc/thermanager.xml
@@ -567,13 +567,12 @@ service mediadrm /system/bin/mediadrmserver
seclabel u:r:uim:s0
service imsqmidaemon /system/bin/imsqmidaemon
- class main
+ class late_start
user system
socket ims_qmid stream 0660 system radio
group radio net_raw log qcom_diag
service imsdatadaemon /system/bin/imsdatadaemon
- class main
user system
socket ims_datad stream 0660 system radio
group system wifi radio inet net_raw log qcom_diag net_admin
@@ -585,14 +584,12 @@ on property:sys.ims.DATA_DAEMON_STATUS=1
service ims_rtp_daemon /system/bin/ims_rtp_daemon
- class main
user system
socket ims_rtpd stream 0660 system radio
group radio net_raw diag qcom_diag log inet
disabled
service imscmservice /system/bin/imscmservice
- class main
user system
group radio net_raw diag qcom_diag log
disabled
diff --git a/shinano.mk b/shinano.mk
index 8514509..4750dbe 100644
--- a/shinano.mk
+++ b/shinano.mk
@@ -192,7 +192,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
# HDMI
PRODUCT_PROPERTY_OVERRIDES += \
- persist.demo.hdmirotationlock=false
+ persist.demo.hdmirotationlock=false \
+ ro.hdmi.enable=true
# Time
PRODUCT_PROPERTY_OVERRIDES += \
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-13 16:54:53 +0000