F:     include/dt-bindings/sound/cs*
 F:     include/linux/mfd/cs42l43*
 F:     include/sound/cs*
-F:     sound/pci/hda/cirrus*
-F:     sound/pci/hda/cs*
-F:     sound/pci/hda/hda_component*
+F:     sound/hda/codecs/cirrus*
+F:     sound/hda/codecs/side-codecs/cs*
+F:     sound/hda/codecs/side-codecs/hda_component*
 F:     sound/soc/codecs/cs*
 
 CIRRUS LOGIC HAPTIC DRIVERS
 F:     Documentation/devicetree/bindings/sound/ti,tlv320adcx140.yaml
 F:     include/sound/tas2*.h
 F:     include/sound/tlv320*.h
-F:     sound/pci/hda/tas2781_hda_i2c.c
+F:     sound/hda/codecs/side-codecs/tas2781_hda_i2c.c
 F:     sound/soc/codecs/pcm1681.c
 F:     sound/soc/codecs/pcm1789*.*
 F:     sound/soc/codecs/pcm179x*.*
 M:     bo liu <bo.liu@senarytech.com>
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
-F:     sound/pci/hda/patch_senarytech.c
+F:     sound/hda/codecs/senarytech.c
 
 THE REST
 M:     Linus Torvalds <torvalds@linux-foundation.org>