Merge some cs42l42 patches into asoc-5.15