diff options
| author | Cristian Ciocaltea <cristian.ciocaltea@collabora.com> | 2023-09-15 19:15:47 +0300 |
|---|---|---|
| committer | Cristian Ciocaltea <cristian.ciocaltea@collabora.com> | 2023-09-15 19:15:47 +0300 |
| commit | ae4f9e9d596068d3b2137e55aaf17d2efc568c1c (patch) | |
| tree | 5faf433117e56133f7bfd7b5473af2e0943db7bc /include | |
| parent | 96f579f5869bad3edcc6a6c25cd9db5b6b6369de (diff) | |
| parent | e26b5a7f1f87e12746c76b3ee9858488b7884515 (diff) | |
| download | linux-ae4f9e9d596068d3b2137e55aaf17d2efc568c1c.tar.gz | |
Merge branch 6.1/features/cirrus-shared-boost
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/cs35l41.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/sound/cs35l41.h b/include/sound/cs35l41.h index 9ac5918269a5..d1c248cd3315 100644 --- a/include/sound/cs35l41.h +++ b/include/sound/cs35l41.h @@ -678,6 +678,8 @@ #define CS35L36_PUP_DONE_IRQ_UNMASK 0x5F #define CS35L36_PUP_DONE_IRQ_MASK 0xBF +#define CS35L41_SYNC_EN_MASK (1 << 8) + #define CS35L41_AMP_SHORT_ERR 0x80000000 #define CS35L41_BST_SHORT_ERR 0x0100 #define CS35L41_TEMP_WARN 0x8000 @@ -686,6 +688,7 @@ #define CS35L41_BST_DCM_UVP_ERR 0x80 #define CS35L41_OTP_BOOT_DONE 0x02 #define CS35L41_PLL_UNLOCK 0x10 +#define CS35L41_PLL_LOCK 0x02 #define CS35L41_OTP_BOOT_ERR 0x80000000 #define CS35L41_AMP_SHORT_ERR_RLS 0x02 @@ -705,6 +708,8 @@ #define CS35L41_INT1_MASK_DEFAULT 0x7FFCFE3F #define CS35L41_INT1_UNMASK_PUP 0xFEFFFFFF #define CS35L41_INT1_UNMASK_PDN 0xFF7FFFFF +#define CS35L41_INT3_MASK_DEFAULT 0xFFFF87FF +#define CS35L41_INT3_UNMASK_PLL_LOCK 0xFFFF87FD #define CS35L41_GPIO_DIR_MASK 0x80000000 #define CS35L41_GPIO_DIR_SHIFT 31 @@ -745,6 +750,12 @@ enum cs35l41_boost_type { CS35L41_EXT_BOOST_NO_VSPK_SWITCH, }; +enum cs35l41_shared_boost { + SHARED_BOOST_DISABLED, + SHARED_BOOST_ACTIVE, + SHARED_BOOST_PASSIVE, +}; + enum cs35l41_clk_ids { CS35L41_CLKID_SCLK = 0, CS35L41_CLKID_LRCLK = 1, @@ -789,6 +800,7 @@ struct cs35l41_hw_cfg { unsigned int spk_pos; enum cs35l41_boost_type bst_type; + enum cs35l41_shared_boost shared_boost; }; struct cs35l41_otp_packed_element_t { |