so, retracing my steps here.
I compiled your 6.9 kernel branch (johan_defconfig with minor changes to enable compressed firmware loading and HID_NINTENDO). 
Audio did not work on that kernel, battery stats worked though so I don't think it was pd mapper failing. So I install the downstream [alsa-ucm-conf](https://github.com/Srinivas-Kandagatla/alsa-ucm-conf/tree/topic/x13s-dp) and [audioreach-topology firmware](https://git.codelinaro.org/linaro/qcomlt/audioreach-topology/-/tree/topic/x13s-dp/prebuilt/qcom/sc8280xp/LENOVO/21BX?ref_type=heads) meant for the DP audio fixes, and I made my problem worse