.idle_bias_on           = 1,
        .use_pmdown_time        = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 /* Current and threshold powerup sequence Pg37 in datasheet */
 
        .num_dapm_routes        = ARRAY_SIZE(cs35l33_audio_map),
        .use_pmdown_time        = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static const struct regmap_config cs35l33_regmap = {
 
        .idle_bias_on           = 1,
        .use_pmdown_time        = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static struct regmap_config cs35l34_regmap = {
 
        .idle_bias_on           = 1,
        .use_pmdown_time        = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static struct regmap_config cs35l35_regmap = {
 
        .idle_bias_on           = 1,
        .use_pmdown_time        = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static struct regmap_config cs35l36_regmap = {
 
        .controls               = cs4234_snd_controls,
        .num_controls           = ARRAY_SIZE(cs4234_snd_controls),
        .set_bias_level         = cs4234_set_bias_level,
-       .non_legacy_dai_naming  = 1,
        .idle_bias_on           = 1,
        .suspend_bias_off       = 1,
        .endianness             = 1,
 
        .idle_bias_on           = 1,
        .use_pmdown_time        = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static const struct regmap_config cs4265_regmap = {
 
        .idle_bias_on           = 1,
        .use_pmdown_time        = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 /*
 
        .idle_bias_on           = 1,
        .use_pmdown_time        = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static int cs4271_common_probe(struct device *dev,
 
        .num_controls           = ARRAY_SIZE(cs42l42_snd_controls),
        .idle_bias_on           = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 /* Switch to SCLK. Atomic delay after the write to allow the switch to complete. */
 
        .idle_bias_on           = 1,
        .use_pmdown_time        = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static bool cs42l51_writeable_reg(struct device *dev, unsigned int reg)
 
        .idle_bias_on           = 1,
        .use_pmdown_time        = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 /* Current and threshold powerup sequence Pg37 */
 
        .idle_bias_on           = 1,
        .use_pmdown_time        = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static const struct regmap_config cs42l56_regmap = {
 
        .idle_bias_on           = 1,
        .use_pmdown_time        = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static const struct regmap_config cs42l73_regmap = {
 
        .num_dapm_routes        = ARRAY_SIZE(cs42xx8_dapm_routes),
        .use_pmdown_time        = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 const struct cs42xx8_driver_data cs42448_data = {
 
        .idle_bias_on           = 1,
        .use_pmdown_time        = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static const struct regmap_config cs43130_regmap = {
 
        .idle_bias_on           = 1,
        .use_pmdown_time        = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static const struct of_device_id __maybe_unused cs4341_dt_ids[] = {
 
        .idle_bias_on           = 1,
        .use_pmdown_time        = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static const struct regmap_config cs4349_regmap = {
 
        .num_dapm_routes        = ARRAY_SIZE(cs47l15_dapm_routes),
        .use_pmdown_time        = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static int cs47l15_probe(struct platform_device *pdev)
 
        .num_dapm_routes        = ARRAY_SIZE(cs47l24_dapm_routes),
        .use_pmdown_time        = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static int cs47l24_probe(struct platform_device *pdev)
 
        .num_dapm_routes        = ARRAY_SIZE(cs47l35_dapm_routes),
        .use_pmdown_time        = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static int cs47l35_probe(struct platform_device *pdev)
 
        .num_dapm_routes        = ARRAY_SIZE(cs47l85_dapm_routes),
        .use_pmdown_time        = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static int cs47l85_probe(struct platform_device *pdev)
 
        .num_dapm_routes        = ARRAY_SIZE(cs47l90_dapm_routes),
        .use_pmdown_time        = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static int cs47l90_probe(struct platform_device *pdev)
 
        .num_dapm_routes        = ARRAY_SIZE(cs47l92_dapm_routes),
        .use_pmdown_time        = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static int cs47l92_probe(struct platform_device *pdev)
 
        .num_dapm_routes        = ARRAY_SIZE(cs53l30_dapm_routes),
        .use_pmdown_time        = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static struct regmap_config cs53l30_regmap = {