Resolve the non-trivial conflict due to the hdac regmap API changes.
Signed-off-by: NTakashi Iwai <tiwai@suse.de>