Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eaaa5328 authored by Mike Rapoport's avatar Mike Rapoport Committed by Mark Brown
Browse files

ASoC: em-x270: make the driver support also eXeda and CM-X300 machines 



Signed-off-by: default avatarMike Rapoport <mike@compulab.co.il>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 31cb31f7

sound/soc/pxa/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -89,13 +89,13 @@ config SND_PXA2XX_SOC_E800 
	  Toshiba e800 PDA

	  Toshiba e800 PDA





config SND_PXA2XX_SOC_EM_X270

config SND_PXA2XX_SOC_EM_X270

	tristate "SoC Audio support for CompuLab EM-x270"

	tristate "SoC Audio support for CompuLab EM-x270, eXeda and CM-X300"

	depends on SND_PXA2XX_SOC && MACH_EM_X270

	depends on SND_PXA2XX_SOC && MACH_EM_X270

	select SND_PXA2XX_SOC_AC97

	select SND_PXA2XX_SOC_AC97

	select SND_SOC_WM9712

	select SND_SOC_WM9712

	help

	help

	  Say Y if you want to add support for SoC audio on

	  Say Y if you want to add support for SoC audio on

	  CompuLab EM-x270.

	  CompuLab EM-x270, eXeda and CM-X300 machines.





config SND_PXA2XX_SOC_PALM27X

config SND_PXA2XX_SOC_PALM27X

	bool "SoC Audio support for Palm T|X, T5 and LifeDrive"

	bool "SoC Audio support for Palm T|X, T5 and LifeDrive"

sound/soc/pxa/em-x270.c

+5 −4
Original line number Original line Diff line number Diff line 
/*

/*

 * em-x270.c  --  SoC audio for EM-X270

 * SoC audio driver for EM-X270, eXeda and CM-X300

 *

 *

 * Copyright 2007 CompuLab, Ltd.

 * Copyright 2007, 2009 CompuLab, Ltd.

 *

 *

 * Author: Mike Rapoport <mike@compulab.co.il>

 * Author: Mike Rapoport <mike@compulab.co.il>

 *

 *
@@ -68,7 +68,8 @@ static int __init em_x270_init(void) 
{

{

	int ret;

	int ret;





	if (!machine_is_em_x270())

	if (!(machine_is_em_x270() || machine_is_exeda()

	      || machine_is_cm_x300()))

		return -ENODEV;

		return -ENODEV;





	em_x270_snd_device = platform_device_alloc("soc-audio", -1);

	em_x270_snd_device = platform_device_alloc("soc-audio", -1);
@@ -95,5 +96,5 @@ module_exit(em_x270_exit); 




/* Module information */

/* Module information */

MODULE_AUTHOR("Mike Rapoport");

MODULE_AUTHOR("Mike Rapoport");

MODULE_DESCRIPTION("ALSA SoC EM-X270");

MODULE_DESCRIPTION("ALSA SoC EM-X270, eXeda and CM-X300");

MODULE_LICENSE("GPL");
 
MODULE_LICENSE("GPL");