Skip to content

Commit d01c6a3

Browse files
brooniebroonie
committed
ASoC: mt8365: Open code BIT() to avoid spurious warnings
The mt8365 driver uses bits.h to define bitfields but BIT() uses unsigned long constants so does not play well with being bitwise negated and converted to an unsigned int, the compiler complains about width reduction on a number of architectures. Just open code the shifting to avoid the issue. Generated with s/BIT(/(1U << / Reported-by: Nathan Chancellor <nathan@kernel.org> Reviewed-by: Alexandre Mergnat <amergnat@baylibre.com> Tested-by: Nathan Chancellor <nathan@kernel.org> # build Signed-off-by: Mark Brown <broonie@kernel.org> Link: https://patch.msgid.link/20240907-asoc-fix-mt8365-build-v1-1-7ad0bac20161@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 241c044 commit d01c6a3

1 file changed

Lines changed: 107 additions & 107 deletions

File tree

‎sound/soc/mediatek/mt8365/mt8365-reg.h‎

Lines changed: 107 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -734,57 +734,57 @@
734734
#define AFE_IRQ_STATUS_BITS 0x3ff
735735

736736
/* AUDIO_TOP_CON0 (0x0000) */
737-
#define AUD_TCON0_PDN_TML BIT(27)
738-
#define AUD_TCON0_PDN_DAC_PREDIS BIT(26)
739-
#define AUD_TCON0_PDN_DAC BIT(25)
740-
#define AUD_TCON0_PDN_ADC BIT(24)
741-
#define AUD_TCON0_PDN_TDM_IN BIT(23)
742-
#define AUD_TCON0_PDN_TDM_OUT BIT(22)
743-
#define AUD_TCON0_PDN_SPDIF BIT(21)
744-
#define AUD_TCON0_PDN_APLL_TUNER BIT(19)
745-
#define AUD_TCON0_PDN_APLL2_TUNER BIT(18)
746-
#define AUD_TCON0_PDN_INTDIR BIT(15)
747-
#define AUD_TCON0_PDN_24M BIT(9)
748-
#define AUD_TCON0_PDN_22M BIT(8)
749-
#define AUD_TCON0_PDN_I2S_IN BIT(6)
750-
#define AUD_TCON0_PDN_AFE BIT(2)
737+
#define AUD_TCON0_PDN_TML (1U << 27)
738+
#define AUD_TCON0_PDN_DAC_PREDIS (1U << 26)
739+
#define AUD_TCON0_PDN_DAC (1U << 25)
740+
#define AUD_TCON0_PDN_ADC (1U << 24)
741+
#define AUD_TCON0_PDN_TDM_IN (1U << 23)
742+
#define AUD_TCON0_PDN_TDM_OUT (1U << 22)
743+
#define AUD_TCON0_PDN_SPDIF (1U << 21)
744+
#define AUD_TCON0_PDN_APLL_TUNER (1U << 19)
745+
#define AUD_TCON0_PDN_APLL2_TUNER (1U << 18)
746+
#define AUD_TCON0_PDN_INTDIR (1U << 15)
747+
#define AUD_TCON0_PDN_24M (1U << 9)
748+
#define AUD_TCON0_PDN_22M (1U << 8)
749+
#define AUD_TCON0_PDN_I2S_IN (1U << 6)
750+
#define AUD_TCON0_PDN_AFE (1U << 2)
751751

752752
/* AUDIO_TOP_CON1 (0x0004) */
753-
#define AUD_TCON1_PDN_TDM_ASRC BIT(15)
754-
#define AUD_TCON1_PDN_GENERAL2_ASRC BIT(14)
755-
#define AUD_TCON1_PDN_GENERAL1_ASRC BIT(13)
756-
#define AUD_TCON1_PDN_CONNSYS_I2S_ASRC BIT(12)
757-
#define AUD_TCON1_PDN_DMIC3_ADC BIT(11)
758-
#define AUD_TCON1_PDN_DMIC2_ADC BIT(10)
759-
#define AUD_TCON1_PDN_DMIC1_ADC BIT(9)
760-
#define AUD_TCON1_PDN_DMIC0_ADC BIT(8)
761-
#define AUD_TCON1_PDN_I2S4_BCLK BIT(7)
762-
#define AUD_TCON1_PDN_I2S3_BCLK BIT(6)
763-
#define AUD_TCON1_PDN_I2S2_BCLK BIT(5)
764-
#define AUD_TCON1_PDN_I2S1_BCLK BIT(4)
753+
#define AUD_TCON1_PDN_TDM_ASRC (1U << 15)
754+
#define AUD_TCON1_PDN_GENERAL2_ASRC (1U << 14)
755+
#define AUD_TCON1_PDN_GENERAL1_ASRC (1U << 13)
756+
#define AUD_TCON1_PDN_CONNSYS_I2S_ASRC (1U << 12)
757+
#define AUD_TCON1_PDN_DMIC3_ADC (1U << 11)
758+
#define AUD_TCON1_PDN_DMIC2_ADC (1U << 10)
759+
#define AUD_TCON1_PDN_DMIC1_ADC (1U << 9)
760+
#define AUD_TCON1_PDN_DMIC0_ADC (1U << 8)
761+
#define AUD_TCON1_PDN_I2S4_BCLK (1U << 7)
762+
#define AUD_TCON1_PDN_I2S3_BCLK (1U << 6)
763+
#define AUD_TCON1_PDN_I2S2_BCLK (1U << 5)
764+
#define AUD_TCON1_PDN_I2S1_BCLK (1U << 4)
765765

766766
/* AUDIO_TOP_CON3 (0x000C) */
767-
#define AUD_TCON3_HDMI_BCK_INV BIT(3)
767+
#define AUD_TCON3_HDMI_BCK_INV (1U << 3)
768768

769769
/* AFE_I2S_CON (0x0018) */
770-
#define AFE_I2S_CON_PHASE_SHIFT_FIX BIT(31)
771-
#define AFE_I2S_CON_FROM_IO_MUX BIT(28)
772-
#define AFE_I2S_CON_LOW_JITTER_CLK BIT(12)
770+
#define AFE_I2S_CON_PHASE_SHIFT_FIX (1U << 31)
771+
#define AFE_I2S_CON_FROM_IO_MUX (1U << 28)
772+
#define AFE_I2S_CON_LOW_JITTER_CLK (1U << 12)
773773
#define AFE_I2S_CON_RATE_MASK GENMASK(11, 8)
774-
#define AFE_I2S_CON_FORMAT_I2S BIT(3)
775-
#define AFE_I2S_CON_SRC_SLAVE BIT(2)
774+
#define AFE_I2S_CON_FORMAT_I2S (1U << 3)
775+
#define AFE_I2S_CON_SRC_SLAVE (1U << 2)
776776

777777
/* AFE_ASRC_2CH_CON0 */
778-
#define ONE_HEART BIT(31)
779-
#define CHSET_STR_CLR BIT(4)
780-
#define COEFF_SRAM_CTRL BIT(1)
781-
#define ASM_ON BIT(0)
778+
#define ONE_HEART (1U << 31)
779+
#define CHSET_STR_CLR (1U << 4)
780+
#define COEFF_SRAM_CTRL (1U << 1)
781+
#define ASM_ON (1U << 0)
782782

783783
/* CON2 */
784-
#define O16BIT BIT(19)
785-
#define CLR_IIR_HISTORY BIT(17)
786-
#define IS_MONO BIT(16)
787-
#define IIR_EN BIT(11)
784+
#define O16BIT (1U << 19)
785+
#define CLR_IIR_HISTORY (1U << 17)
786+
#define IS_MONO (1U << 16)
787+
#define IIR_EN (1U << 11)
788788
#define IIR_STAGE_MASK GENMASK(10, 8)
789789

790790
/* CON5 */
@@ -793,80 +793,80 @@
793793
#define CALI_96_CYCLE FIELD_PREP(CALI_CYCLE_MASK, 0x5F)
794794
#define CALI_441_CYCLE FIELD_PREP(CALI_CYCLE_MASK, 0x1B8)
795795

796-
#define CALI_AUTORST BIT(15)
797-
#define AUTO_TUNE_FREQ5 BIT(12)
798-
#define COMP_FREQ_RES BIT(11)
796+
#define CALI_AUTORST (1U << 15)
797+
#define AUTO_TUNE_FREQ5 (1U << 12)
798+
#define COMP_FREQ_RES (1U << 11)
799799

800800
#define CALI_SEL_MASK GENMASK(9, 8)
801801
#define CALI_SEL_00 FIELD_PREP(CALI_SEL_MASK, 0)
802802
#define CALI_SEL_01 FIELD_PREP(CALI_SEL_MASK, 1)
803803

804-
#define CALI_BP_DGL BIT(7) /* Bypass the deglitch circuit */
805-
#define AUTO_TUNE_FREQ4 BIT(3)
806-
#define CALI_AUTO_RESTART BIT(2)
807-
#define CALI_USE_FREQ_OUT BIT(1)
808-
#define CALI_ON BIT(0)
804+
#define CALI_BP_DGL (1U << 7) /* Bypass the deglitch circuit */
805+
#define AUTO_TUNE_FREQ4 (1U << 3)
806+
#define CALI_AUTO_RESTART (1U << 2)
807+
#define CALI_USE_FREQ_OUT (1U << 1)
808+
#define CALI_ON (1U << 0)
809809

810-
#define AFE_I2S_CON_WLEN_32BIT BIT(1)
811-
#define AFE_I2S_CON_EN BIT(0)
810+
#define AFE_I2S_CON_WLEN_32BIT (1U << 1)
811+
#define AFE_I2S_CON_EN (1U << 0)
812812

813-
#define AFE_CONN3_I03_O03_S BIT(3)
814-
#define AFE_CONN4_I04_O04_S BIT(4)
815-
#define AFE_CONN4_I03_O04_S BIT(3)
813+
#define AFE_CONN3_I03_O03_S (1U << 3)
814+
#define AFE_CONN4_I04_O04_S (1U << 4)
815+
#define AFE_CONN4_I03_O04_S (1U << 3)
816816

817817
/* AFE_I2S_CON1 (0x0034) */
818-
#define AFE_I2S_CON1_I2S2_TO_PAD BIT(18)
818+
#define AFE_I2S_CON1_I2S2_TO_PAD (1U << 18)
819819
#define AFE_I2S_CON1_TDMOUT_TO_PAD (0 << 18)
820820
#define AFE_I2S_CON1_RATE GENMASK(11, 8)
821-
#define AFE_I2S_CON1_FORMAT_I2S BIT(3)
822-
#define AFE_I2S_CON1_WLEN_32BIT BIT(1)
823-
#define AFE_I2S_CON1_EN BIT(0)
821+
#define AFE_I2S_CON1_FORMAT_I2S (1U << 3)
822+
#define AFE_I2S_CON1_WLEN_32BIT (1U << 1)
823+
#define AFE_I2S_CON1_EN (1U << 0)
824824

825825
/* AFE_I2S_CON2 (0x0038) */
826-
#define AFE_I2S_CON2_LOW_JITTER_CLK BIT(12)
826+
#define AFE_I2S_CON2_LOW_JITTER_CLK (1U << 12)
827827
#define AFE_I2S_CON2_RATE GENMASK(11, 8)
828-
#define AFE_I2S_CON2_FORMAT_I2S BIT(3)
829-
#define AFE_I2S_CON2_WLEN_32BIT BIT(1)
830-
#define AFE_I2S_CON2_EN BIT(0)
828+
#define AFE_I2S_CON2_FORMAT_I2S (1U << 3)
829+
#define AFE_I2S_CON2_WLEN_32BIT (1U << 1)
830+
#define AFE_I2S_CON2_EN (1U << 0)
831831

832832
/* AFE_I2S_CON3 (0x004C) */
833-
#define AFE_I2S_CON3_LOW_JITTER_CLK BIT(12)
833+
#define AFE_I2S_CON3_LOW_JITTER_CLK (1U << 12)
834834
#define AFE_I2S_CON3_RATE GENMASK(11, 8)
835-
#define AFE_I2S_CON3_FORMAT_I2S BIT(3)
836-
#define AFE_I2S_CON3_WLEN_32BIT BIT(1)
837-
#define AFE_I2S_CON3_EN BIT(0)
835+
#define AFE_I2S_CON3_FORMAT_I2S (1U << 3)
836+
#define AFE_I2S_CON3_WLEN_32BIT (1U << 1)
837+
#define AFE_I2S_CON3_EN (1U << 0)
838838

839839
/* AFE_ADDA_DL_SRC2_CON0 (0x0108) */
840840
#define AFE_ADDA_DL_SAMPLING_RATE GENMASK(31, 28)
841841
#define AFE_ADDA_DL_8X_UPSAMPLE GENMASK(25, 24)
842-
#define AFE_ADDA_DL_MUTE_OFF_CH1 BIT(12)
843-
#define AFE_ADDA_DL_MUTE_OFF_CH2 BIT(11)
844-
#define AFE_ADDA_DL_VOICE_DATA BIT(5)
845-
#define AFE_ADDA_DL_DEGRADE_GAIN BIT(1)
842+
#define AFE_ADDA_DL_MUTE_OFF_CH1 (1U << 12)
843+
#define AFE_ADDA_DL_MUTE_OFF_CH2 (1U << 11)
844+
#define AFE_ADDA_DL_VOICE_DATA (1U << 5)
845+
#define AFE_ADDA_DL_DEGRADE_GAIN (1U << 1)
846846

847847
/* AFE_ADDA_UL_SRC_CON0 (0x0114) */
848848
#define AFE_ADDA_UL_SAMPLING_RATE GENMASK(19, 17)
849849

850850
/* AFE_ADDA_UL_DL_CON0 */
851-
#define AFE_ADDA_UL_DL_ADDA_AFE_ON BIT(0)
852-
#define AFE_ADDA_UL_DL_DMIC_CLKDIV_ON BIT(1)
851+
#define AFE_ADDA_UL_DL_ADDA_AFE_ON (1U << 0)
852+
#define AFE_ADDA_UL_DL_DMIC_CLKDIV_ON (1U << 1)
853853

854854
/* AFE_APLL_TUNER_CFG (0x03f0) */
855855
#define AFE_APLL_TUNER_CFG_MASK GENMASK(15, 1)
856-
#define AFE_APLL_TUNER_CFG_EN_MASK BIT(0)
856+
#define AFE_APLL_TUNER_CFG_EN_MASK (1U << 0)
857857

858858
/* AFE_APLL_TUNER_CFG1 (0x03f4) */
859859
#define AFE_APLL_TUNER_CFG1_MASK GENMASK(15, 1)
860-
#define AFE_APLL_TUNER_CFG1_EN_MASK BIT(0)
860+
#define AFE_APLL_TUNER_CFG1_EN_MASK (1U << 0)
861861

862862
/* PCM_INTF_CON1 (0x0550) */
863-
#define PCM_INTF_CON1_EXT_MODEM BIT(17)
863+
#define PCM_INTF_CON1_EXT_MODEM (1U << 17)
864864
#define PCM_INTF_CON1_16BIT (0 << 16)
865-
#define PCM_INTF_CON1_24BIT BIT(16)
865+
#define PCM_INTF_CON1_24BIT (1U << 16)
866866
#define PCM_INTF_CON1_32BCK (0 << 14)
867-
#define PCM_INTF_CON1_64BCK BIT(14)
867+
#define PCM_INTF_CON1_64BCK (1U << 14)
868868
#define PCM_INTF_CON1_MASTER_MODE (0 << 5)
869-
#define PCM_INTF_CON1_SLAVE_MODE BIT(5)
869+
#define PCM_INTF_CON1_SLAVE_MODE (1U << 5)
870870
#define PCM_INTF_CON1_FS_MASK GENMASK(4, 3)
871871
#define PCM_INTF_CON1_FS_8K FIELD_PREP(PCM_INTF_CON1_FS_MASK, 0)
872872
#define PCM_INTF_CON1_FS_16K FIELD_PREP(PCM_INTF_CON1_FS_MASK, 1)
@@ -875,12 +875,12 @@
875875
#define PCM_INTF_CON1_SYNC_LEN_MASK GENMASK(13, 9)
876876
#define PCM_INTF_CON1_SYNC_LEN(x) FIELD_PREP(PCM_INTF_CON1_SYNC_LEN_MASK, ((x) - 1))
877877
#define PCM_INTF_CON1_FORMAT_MASK GENMASK(2, 1)
878-
#define PCM_INTF_CON1_SYNC_OUT_INV BIT(23)
879-
#define PCM_INTF_CON1_BCLK_OUT_INV BIT(22)
880-
#define PCM_INTF_CON1_SYNC_IN_INV BIT(21)
881-
#define PCM_INTF_CON1_BCLK_IN_INV BIT(20)
882-
#define PCM_INTF_CON1_BYPASS_ASRC BIT(6)
883-
#define PCM_INTF_CON1_EN BIT(0)
878+
#define PCM_INTF_CON1_SYNC_OUT_INV (1U << 23)
879+
#define PCM_INTF_CON1_BCLK_OUT_INV (1U << 22)
880+
#define PCM_INTF_CON1_SYNC_IN_INV (1U << 21)
881+
#define PCM_INTF_CON1_BCLK_IN_INV (1U << 20)
882+
#define PCM_INTF_CON1_BYPASS_ASRC (1U << 6)
883+
#define PCM_INTF_CON1_EN (1U << 0)
884884
#define PCM_INTF_CON1_CONFIG_MASK (0xf3fffe)
885885

886886
/* AFE_DMIC0_UL_SRC_CON0 (0x05b4)
@@ -890,38 +890,38 @@
890890
*/
891891
#define DMIC_TOP_CON_CK_PHASE_SEL_CH1 GENMASK(29, 27)
892892
#define DMIC_TOP_CON_CK_PHASE_SEL_CH2 GENMASK(26, 24)
893-
#define DMIC_TOP_CON_TWO_WIRE_MODE BIT(23)
894-
#define DMIC_TOP_CON_CH2_ON BIT(22)
895-
#define DMIC_TOP_CON_CH1_ON BIT(21)
893+
#define DMIC_TOP_CON_TWO_WIRE_MODE (1U << 23)
894+
#define DMIC_TOP_CON_CH2_ON (1U << 22)
895+
#define DMIC_TOP_CON_CH1_ON (1U << 21)
896896
#define DMIC_TOP_CON_VOICE_MODE_MASK GENMASK(19, 17)
897897
#define DMIC_TOP_CON_VOICE_MODE_8K FIELD_PREP(DMIC_TOP_CON_VOICE_MODE_MASK, 0)
898898
#define DMIC_TOP_CON_VOICE_MODE_16K FIELD_PREP(DMIC_TOP_CON_VOICE_MODE_MASK, 1)
899899
#define DMIC_TOP_CON_VOICE_MODE_32K FIELD_PREP(DMIC_TOP_CON_VOICE_MODE_MASK, 2)
900900
#define DMIC_TOP_CON_VOICE_MODE_48K FIELD_PREP(DMIC_TOP_CON_VOICE_MODE_MASK, 3)
901901
#define DMIC_TOP_CON_LOW_POWER_MODE_MASK GENMASK(15, 14)
902902
#define DMIC_TOP_CON_LOW_POWER_MODE(x) FIELD_PREP(DMIC_TOP_CON_LOW_POWER_MODE_MASK, (x))
903-
#define DMIC_TOP_CON_IIR_ON BIT(10)
903+
#define DMIC_TOP_CON_IIR_ON (1U << 10)
904904
#define DMIC_TOP_CON_IIR_MODE GENMASK(9, 7)
905-
#define DMIC_TOP_CON_INPUT_MODE BIT(5)
906-
#define DMIC_TOP_CON_SDM3_LEVEL_MODE BIT(1)
907-
#define DMIC_TOP_CON_SRC_ON BIT(0)
905+
#define DMIC_TOP_CON_INPUT_MODE (1U << 5)
906+
#define DMIC_TOP_CON_SDM3_LEVEL_MODE (1U << 1)
907+
#define DMIC_TOP_CON_SRC_ON (1U << 0)
908908
#define DMIC_TOP_CON_SDM3_DE_SELECT (0 << 1)
909909
#define DMIC_TOP_CON_CONFIG_MASK (0x3f8ed7a6)
910910

911911
/* AFE_CONN_24BIT (0x0AA4) */
912-
#define AFE_CONN_24BIT_O10 BIT(10)
913-
#define AFE_CONN_24BIT_O09 BIT(9)
914-
#define AFE_CONN_24BIT_O06 BIT(6)
915-
#define AFE_CONN_24BIT_O05 BIT(5)
916-
#define AFE_CONN_24BIT_O04 BIT(4)
917-
#define AFE_CONN_24BIT_O03 BIT(3)
918-
#define AFE_CONN_24BIT_O02 BIT(2)
919-
#define AFE_CONN_24BIT_O01 BIT(1)
920-
#define AFE_CONN_24BIT_O00 BIT(0)
912+
#define AFE_CONN_24BIT_O10 (1U << 10)
913+
#define AFE_CONN_24BIT_O09 (1U << 9)
914+
#define AFE_CONN_24BIT_O06 (1U << 6)
915+
#define AFE_CONN_24BIT_O05 (1U << 5)
916+
#define AFE_CONN_24BIT_O04 (1U << 4)
917+
#define AFE_CONN_24BIT_O03 (1U << 3)
918+
#define AFE_CONN_24BIT_O02 (1U << 2)
919+
#define AFE_CONN_24BIT_O01 (1U << 1)
920+
#define AFE_CONN_24BIT_O00 (1U << 0)
921921

922922
/* AFE_HD_ENGEN_ENABLE */
923-
#define AFE_22M_PLL_EN BIT(0)
924-
#define AFE_24M_PLL_EN BIT(1)
923+
#define AFE_22M_PLL_EN (1U << 0)
924+
#define AFE_24M_PLL_EN (1U << 1)
925925

926926
/* AFE_GAIN1_CON0 (0x0410) */
927927
#define AFE_GAIN1_CON0_EN_MASK GENMASK(0, 0)
@@ -938,15 +938,15 @@
938938
/* AFE_CM2_CON0 (0x0e60) */
939939
#define CM_AFE_CM_CH_NUM_MASK GENMASK(3, 0)
940940
#define CM_AFE_CM_CH_NUM(x) FIELD_PREP(CM_AFE_CM_CH_NUM_MASK, ((x) - 1))
941-
#define CM_AFE_CM_ON BIT(4)
941+
#define CM_AFE_CM_ON (1U << 4)
942942
#define CM_AFE_CM_START_DATA_MASK GENMASK(11, 8)
943943

944-
#define CM_AFE_CM1_VUL_SEL BIT(12)
944+
#define CM_AFE_CM1_VUL_SEL (1U << 12)
945945
#define CM_AFE_CM1_IN_MODE_MASK GENMASK(19, 16)
946-
#define CM_AFE_CM2_TDM_SEL BIT(12)
947-
#define CM_AFE_CM2_CLK_SEL BIT(13)
948-
#define CM_AFE_CM2_GASRC1_OUT_SEL BIT(17)
949-
#define CM_AFE_CM2_GASRC2_OUT_SEL BIT(16)
946+
#define CM_AFE_CM2_TDM_SEL (1U << 12)
947+
#define CM_AFE_CM2_CLK_SEL (1U << 13)
948+
#define CM_AFE_CM2_GASRC1_OUT_SEL (1U << 17)
949+
#define CM_AFE_CM2_GASRC2_OUT_SEL (1U << 16)
950950

951951
/* AFE_CM2_CONN* */
952952
#define CM2_AFE_CM2_CONN_CFG1(x) FIELD_PREP(CM2_AFE_CM2_CONN_CFG1_MASK, (x))

0 commit comments

Comments
 (0)