#include <linux/device.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
-#include <sound/ac97_codec.h>
 #include <sound/initval.h>
 #include <sound/soc.h>
 
        },
 };
 
-static const struct snd_soc_codec_driver soc_codec_dev_gtm601 = {
-       .component_driver = {
-               .dapm_widgets           = gtm601_dapm_widgets,
-               .num_dapm_widgets       = ARRAY_SIZE(gtm601_dapm_widgets),
-               .dapm_routes            = gtm601_dapm_routes,
-               .num_dapm_routes        = ARRAY_SIZE(gtm601_dapm_routes),
-       },
+static const struct snd_soc_component_driver soc_component_dev_gtm601 = {
+       .dapm_widgets           = gtm601_dapm_widgets,
+       .num_dapm_widgets       = ARRAY_SIZE(gtm601_dapm_widgets),
+       .dapm_routes            = gtm601_dapm_routes,
+       .num_dapm_routes        = ARRAY_SIZE(gtm601_dapm_routes),
+       .idle_bias_on           = 1,
+       .use_pmdown_time        = 1,
+       .endianness             = 1,
+       .non_legacy_dai_naming  = 1,
 };
 
 static int gtm601_platform_probe(struct platform_device *pdev)
 {
-       return snd_soc_register_codec(&pdev->dev,
-                       &soc_codec_dev_gtm601, >m601_dai, 1);
-}
-
-static int gtm601_platform_remove(struct platform_device *pdev)
-{
-       snd_soc_unregister_codec(&pdev->dev);
-       return 0;
+       return devm_snd_soc_register_component(&pdev->dev,
+                       &soc_component_dev_gtm601, >m601_dai, 1);
 }
 
 #if defined(CONFIG_OF)
                .of_match_table = of_match_ptr(gtm601_codec_of_match),
        },
        .probe = gtm601_platform_probe,
-       .remove = gtm601_platform_remove,
 };
 
 module_platform_driver(gtm601_codec_driver);