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

Commit 37330efd authored by Marek Vasut's avatar Marek Vasut Committed by Eric Miao
Browse files

[ARM] pxa/palm: Add Palm27x aSoC driver to PalmTE2 



Signed-off-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
parent 8768dc9b

arch/arm/mach-pxa/palmte2.c

+18 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <mach/mfp-pxa25x.h>

#include <mach/irda.h>

#include <mach/udc.h>

#include <mach/palmasoc.h>



#include "generic.h"

#include "devices.h"
@@ -108,6 +109,7 @@ static unsigned long palmte2_pin_config[] __initdata = { 
	GPIO1_RST,	/* reset */

	GPIO4_GPIO,	/* Hotsync button */

	GPIO9_GPIO,	/* power detect */

	GPIO15_GPIO,	/* earphone detect */

	GPIO37_GPIO,	/* LCD power */

	GPIO56_GPIO,	/* Backlight power */

};
@@ -402,6 +404,21 @@ static struct wm97xx_batt_info wm97xx_batt_pdata = { 
	.batt_name	= "main-batt",

};



/******************************************************************************

 * aSoC audio

 ******************************************************************************/

static struct palm27x_asoc_info palmte2_asoc_pdata = {

	.jack_gpio	= GPIO_NR_PALMTE2_EARPHONE_DETECT,

};



static struct platform_device palmte2_asoc = {

	.name = "palm27x-asoc",

	.id   = -1,

	.dev  = {

		.platform_data = &palmte2_asoc_pdata,

	},

};



/******************************************************************************

 * Framebuffer

 ******************************************************************************/
@@ -437,6 +454,7 @@ static struct platform_device *devices[] __initdata = { 
#endif

	&palmte2_backlight,

	&power_supply,

	&palmte2_asoc,

	&palmte2_gpio_vbus,

};

sound/soc/pxa/Kconfig

+4 −3
Original line number Diff line number Diff line
@@ -98,13 +98,14 @@ config SND_PXA2XX_SOC_EM_X270 
	  CompuLab EM-x270.



config SND_PXA2XX_SOC_PALM27X

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

	depends on SND_PXA2XX_SOC && (MACH_PALMLD || MACH_PALMTX || MACH_PALMT5)

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

	depends on SND_PXA2XX_SOC && (MACH_PALMLD || MACH_PALMTX || \

			MACH_PALMT5 || MACH_PALMTE2)

	select SND_PXA2XX_SOC_AC97

	select SND_SOC_WM9712

	help

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

	  Palm T|X, T5 or LifeDrive handheld computer.

	  Palm T|X, T5, E2 or LifeDrive handheld computer.



config SND_SOC_ZYLONITE

	tristate "SoC Audio support for Marvell Zylonite"

sound/soc/pxa/palm27x.c

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static int palm27x_asoc_probe(struct platform_device *pdev) 
	int ret;



	if (!(machine_is_palmtx() || machine_is_palmt5() ||

		machine_is_palmld()))

		machine_is_palmld() || machine_is_palmte2()))

		return -ENODEV;



	if (pdev->dev.platform_data)