Unverified Commit 696e2d9b authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Intel: avs: Properly identify boards 

Merge series from Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>:

Instead of using MODULE_ALIAS() to load boards, add proper device id
table and use MODULE_DEVICE_TABLE() macro to create board alias.
parents 82e340ca ca5abf5d

sound/soc/intel/avs/boards/da7219.c

+9 −1
Original line number Diff line number Diff line
@@ -277,16 +277,24 @@ static int avs_da7219_probe(struct platform_device *pdev) 
	return devm_snd_soc_register_card(dev, card);

}



static const struct platform_device_id avs_da7219_driver_ids[] = {

	{

		.name = "avs_da7219",

	},

	{},

};

MODULE_DEVICE_TABLE(platform, avs_da7219_driver_ids);



static struct platform_driver avs_da7219_driver = {

	.probe = avs_da7219_probe,

	.driver = {

		.name = "avs_da7219",

		.pm = &snd_soc_pm_ops,

	},

	.id_table = avs_da7219_driver_ids,

};



module_platform_driver(avs_da7219_driver);



MODULE_AUTHOR("Cezary Rojewski <cezary.rojewski@intel.com>");

MODULE_LICENSE("GPL");
 
MODULE_ALIAS("platform:avs_da7219");

sound/soc/intel/avs/boards/dmic.c

+9 −1
Original line number Diff line number Diff line
@@ -77,15 +77,23 @@ static int avs_dmic_probe(struct platform_device *pdev) 
	return devm_snd_soc_register_card(dev, card);

}



static const struct platform_device_id avs_dmic_driver_ids[] = {

	{

		.name = "avs_dmic",

	},

	{},

};

MODULE_DEVICE_TABLE(platform, avs_dmic_driver_ids);



static struct platform_driver avs_dmic_driver = {

	.probe = avs_dmic_probe,

	.driver = {

		.name = "avs_dmic",

		.pm = &snd_soc_pm_ops,

	},

	.id_table = avs_dmic_driver_ids,

};



module_platform_driver(avs_dmic_driver);



MODULE_LICENSE("GPL");
 
MODULE_ALIAS("platform:avs_dmic");

sound/soc/intel/avs/boards/es8336.c

+9 −1
Original line number Diff line number Diff line
@@ -307,15 +307,23 @@ static int avs_es8336_probe(struct platform_device *pdev) 
	return devm_snd_soc_register_card(dev, card);

}



static const struct platform_device_id avs_es8336_driver_ids[] = {

	{

		.name = "avs_es8336",

	},

	{},

};

MODULE_DEVICE_TABLE(platform, avs_es8336_driver_ids);



static struct platform_driver avs_es8336_driver = {

	.probe = avs_es8336_probe,

	.driver = {

		.name = "avs_es8336",

		.pm = &snd_soc_pm_ops,

	},

	.id_table = avs_es8336_driver_ids,

};



module_platform_driver(avs_es8336_driver);



MODULE_LICENSE("GPL");
 
MODULE_ALIAS("platform:avs_es8336");

sound/soc/intel/avs/boards/hdaudio.c

+9 −1
Original line number Diff line number Diff line
@@ -218,12 +218,21 @@ static int avs_hdaudio_probe(struct platform_device *pdev) 
	return devm_snd_soc_register_card(dev, card);

}



static const struct platform_device_id avs_hdaudio_driver_ids[] = {

	{

		.name = "avs_hdaudio",

	},

	{},

};

MODULE_DEVICE_TABLE(platform, avs_hdaudio_driver_ids);



static struct platform_driver avs_hdaudio_driver = {

	.probe = avs_hdaudio_probe,

	.driver = {

		.name = "avs_hdaudio",

		.pm = &snd_soc_pm_ops,

	},

	.id_table = avs_hdaudio_driver_ids,

};



module_platform_driver(avs_hdaudio_driver)
@@ -231,4 +240,3 @@ module_platform_driver(avs_hdaudio_driver) 
MODULE_DESCRIPTION("Intel HD-Audio machine driver");

MODULE_AUTHOR("Cezary Rojewski <cezary.rojewski@intel.com>");

MODULE_LICENSE("GPL");
 
MODULE_ALIAS("platform:avs_hdaudio");

sound/soc/intel/avs/boards/i2s_test.c

+9 −1
Original line number Diff line number Diff line
@@ -185,15 +185,23 @@ static int avs_i2s_test_probe(struct platform_device *pdev) 
	return devm_snd_soc_register_card(dev, card);

}



static const struct platform_device_id avs_i2s_test_driver_ids[] = {

	{

		.name = "avs_i2s_test",

	},

	{},

};

MODULE_DEVICE_TABLE(platform, avs_i2s_test_driver_ids);



static struct platform_driver avs_i2s_test_driver = {

	.probe = avs_i2s_test_probe,

	.driver = {

		.name = "avs_i2s_test",

		.pm = &snd_soc_pm_ops,

	},

	.id_table = avs_i2s_test_driver_ids,

};



module_platform_driver(avs_i2s_test_driver);



MODULE_LICENSE("GPL");
 
MODULE_ALIAS("platform:avs_i2s_test");