From afc8700181df4392dfde0c217a30382662a19974 Mon Sep 17 00:00:00 2001 From: Chris Paulo Date: Mon, 10 Jul 2023 20:57:36 -0700 Subject: [PATCH] shusky/vibrator: Enable DBC Enable DBC through ro vendor property. This will allow the vibrator HAL to configure dbc parameters through a series of sysfs writes, which the cs40l26 driver will handle. Bug: 266505414 Test: atest VibratorHalCs40l26TestSuite Change-Id: I2471454f6d079720bd7157980214ae17dc3ba335 Signed-off-by: Chris Paulo --- conf/init.husky.rc | 21 +++++++++++++++++++++ conf/init.shiba.rc | 21 +++++++++++++++++++++ device-husky.mk | 9 ++++++++- device-shiba.mk | 9 ++++++++- 4 files changed, 58 insertions(+), 2 deletions(-) diff --git a/conf/init.husky.rc b/conf/init.husky.rc index c21c473..1b81446 100644 --- a/conf/init.husky.rc +++ b/conf/init.husky.rc @@ -94,6 +94,27 @@ on property:vendor.all.modules.ready=1 chown system system /sys/bus/i2c/devices/6-0043/default/delay_before_stop_playback_us chown system system /sys/bus/i2c/devices/5-0043/default/delay_before_stop_playback_us chown system system /sys/bus/i2c/devices/4-0043/default/delay_before_stop_playback_us + chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_env_rel_coef + chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_env_rel_coef + chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_env_rel_coef + chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_rise_headroom + chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_rise_headroom + chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_rise_headroom + chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_fall_headroom + chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_fall_headroom + chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_fall_headroom + chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_enable + chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_enable + chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_enable + chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_tx_lvl_thresh_fs + chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_tx_lvl_thresh_fs + chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_tx_lvl_thresh_fs + chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_tx_lvl_hold_off_ms + chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_tx_lvl_hold_off_ms + chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_tx_lvl_hold_off_ms + chown system system /sys/bus/i2c/devices/6-0043/default/pm_active_timeout_ms + chown system system /sys/bus/i2c/devices/5-0043/default/pm_active_timeout_ms + chown system system /sys/bus/i2c/devices/4-0043/default/pm_active_timeout_ms enable vendor.vibrator.cs40l26 diff --git a/conf/init.shiba.rc b/conf/init.shiba.rc index fe53956..e4c97a2 100644 --- a/conf/init.shiba.rc +++ b/conf/init.shiba.rc @@ -90,6 +90,27 @@ on property:vendor.all.modules.ready=1 chown system system /sys/bus/i2c/devices/6-0043/default/delay_before_stop_playback_us chown system system /sys/bus/i2c/devices/5-0043/default/delay_before_stop_playback_us chown system system /sys/bus/i2c/devices/4-0043/default/delay_before_stop_playback_us + chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_env_rel_coef + chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_env_rel_coef + chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_env_rel_coef + chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_rise_headroom + chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_rise_headroom + chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_rise_headroom + chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_fall_headroom + chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_fall_headroom + chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_fall_headroom + chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_enable + chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_enable + chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_enable + chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_tx_lvl_thresh_fs + chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_tx_lvl_thresh_fs + chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_tx_lvl_thresh_fs + chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_tx_lvl_hold_off_ms + chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_tx_lvl_hold_off_ms + chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_tx_lvl_hold_off_ms + chown system system /sys/bus/i2c/devices/6-0043/default/pm_active_timeout_ms + chown system system /sys/bus/i2c/devices/5-0043/default/pm_active_timeout_ms + chown system system /sys/bus/i2c/devices/4-0043/default/pm_active_timeout_ms enable vendor.vibrator.cs40l26 diff --git a/device-husky.mk b/device-husky.mk index 8252d38..7823f63 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -339,7 +339,14 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.vibrator.hal.context.scale=60 \ persist.vendor.vibrator.hal.context.fade=true \ persist.vendor.vibrator.hal.context.cooldowntime=1600 \ - persist.vendor.vibrator.hal.context.settlingtime=5000 + persist.vendor.vibrator.hal.context.settlingtime=5000 \ + ro.vendor.vibrator.hal.dbc.enable=true \ + ro.vendor.vibrator.hal.dbc.envrelcoef=8353728 \ + ro.vendor.vibrator.hal.dbc.riseheadroom=1909602 \ + ro.vendor.vibrator.hal.dbc.fallheadroom=1909602 \ + ro.vendor.vibrator.hal.dbc.txlvlthreshfs=2516583 \ + ro.vendor.vibrator.hal.dbc.txlvlholdoffms=0 \ + ro.vendor.vibrator.hal.pm.activetimeout=5 # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ diff --git a/device-shiba.mk b/device-shiba.mk index 543ce77..ec81cf1 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -320,7 +320,14 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.vibrator.hal.context.scale=60 \ persist.vendor.vibrator.hal.context.fade=true \ persist.vendor.vibrator.hal.context.cooldowntime=1600 \ - persist.vendor.vibrator.hal.context.settlingtime=5000 + persist.vendor.vibrator.hal.context.settlingtime=5000 \ + ro.vendor.vibrator.hal.dbc.enable=true \ + ro.vendor.vibrator.hal.dbc.envrelcoef=8353728 \ + ro.vendor.vibrator.hal.dbc.riseheadroom=1909602 \ + ro.vendor.vibrator.hal.dbc.fallheadroom=1909602 \ + ro.vendor.vibrator.hal.dbc.txlvlthreshfs=2516583 \ + ro.vendor.vibrator.hal.dbc.txlvlholdoffms=0 \ + ro.vendor.vibrator.hal.pm.activetimeout=5 # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \