};
 
 static struct snd_soc_aux_dev aux_dev = {
-       .name = "Codec Analog Controls",
+       .dlc = COMP_EMPTY(),
 };
 
 static struct snd_soc_card *sun8i_a23_codec_create_card(struct device *dev)
        if (!card)
                return ERR_PTR(-ENOMEM);
 
-       aux_dev.codec_of_node = of_parse_phandle(dev->of_node,
+       aux_dev.dlc.of_node = of_parse_phandle(dev->of_node,
                                                 "allwinner,codec-analog-controls",
                                                 0);
-       if (!aux_dev.codec_of_node) {
+       if (!aux_dev.dlc.of_node) {
                dev_err(dev, "Can't find analog controls for codec.\n");
                return ERR_PTR(-EINVAL);
        };
        if (!card)
                return ERR_PTR(-ENOMEM);
 
-       aux_dev.codec_of_node = of_parse_phandle(dev->of_node,
+       aux_dev.dlc.of_node = of_parse_phandle(dev->of_node,
                                                 "allwinner,codec-analog-controls",
                                                 0);
-       if (!aux_dev.codec_of_node) {
+       if (!aux_dev.dlc.of_node) {
                dev_err(dev, "Can't find analog controls for codec.\n");
                return ERR_PTR(-EINVAL);
        };
        if (!card)
                return ERR_PTR(-ENOMEM);
 
-       aux_dev.codec_of_node = of_parse_phandle(dev->of_node,
+       aux_dev.dlc.of_node = of_parse_phandle(dev->of_node,
                                                 "allwinner,codec-analog-controls",
                                                 0);
-       if (!aux_dev.codec_of_node) {
+       if (!aux_dev.dlc.of_node) {
                dev_err(dev, "Can't find analog controls for codec.\n");
                return ERR_PTR(-EINVAL);
        };