ASoC: Merge fixes for consistent cs42l43 schema
authorMark Brown <broonie@kernel.org>
Tue, 10 Oct 2023 16:07:17 +0000 (17:07 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 10 Oct 2023 16:07:17 +0000 (17:07 +0100)
We have adjacent changes for the cs42l43 DT schema, merge the fixes
branch up so that there's a single thing for people to base future
changes on.

1  2 
Documentation/devicetree/bindings/sound/cirrus,cs42l43.yaml
include/sound/soc-dapm.h
include/sound/soc.h
sound/soc/codecs/cs35l56.c
sound/soc/codecs/cs42l43-jack.c
sound/soc/codecs/lpass-wsa-macro.c
sound/soc/soc-component.c
sound/soc/soc-core.c
sound/soc/soc-dapm.c
sound/soc/sof/amd/pci-rmb.c

index 4fa22fa70ace55d357d0faa9d9b12e5bd4a578a1,4118aa54bbd55384da10e9e6debef8ae5c86bd67..7f9d8c7a635a6ffc1cb4ad3a7987929d28391488
@@@ -82,8 -82,8 +82,8 @@@ properties
      description:
        Current at which the headset micbias sense clamp will engage, 0 to
        disable.
-     enum: [ 0, 14, 23, 41, 50, 60, 68, 86, 95 ]
+     enum: [ 0, 14, 24, 43, 52, 61, 71, 90, 99 ]
 -    default: 0
 +    default: 14
  
    cirrus,bias-ramp-ms:
      description:
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge