diff options
author | Marek Vasut <marek.vasut@gmail.com> | 2009-04-23 05:27:11 -0400 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2009-06-04 22:41:54 -0400 |
commit | 37330efd4abb474b3fdfacea68beb37cf67564ed (patch) | |
tree | 520b3c8cc2f11bfb7cdc17b4c7b5d018728dcae3 /arch/arm/mach-pxa | |
parent | 8768dc9b75efa43e612f6f520cf76a89bbab69d3 (diff) |
[ARM] pxa/palm: Add Palm27x aSoC driver to PalmTE2
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r-- | arch/arm/mach-pxa/palmte2.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/palmte2.c b/arch/arm/mach-pxa/palmte2.c index b09a9efeb77c..d823b09801df 100644 --- a/arch/arm/mach-pxa/palmte2.c +++ b/arch/arm/mach-pxa/palmte2.c | |||
@@ -38,6 +38,7 @@ | |||
38 | #include <mach/mfp-pxa25x.h> | 38 | #include <mach/mfp-pxa25x.h> |
39 | #include <mach/irda.h> | 39 | #include <mach/irda.h> |
40 | #include <mach/udc.h> | 40 | #include <mach/udc.h> |
41 | #include <mach/palmasoc.h> | ||
41 | 42 | ||
42 | #include "generic.h" | 43 | #include "generic.h" |
43 | #include "devices.h" | 44 | #include "devices.h" |
@@ -108,6 +109,7 @@ static unsigned long palmte2_pin_config[] __initdata = { | |||
108 | GPIO1_RST, /* reset */ | 109 | GPIO1_RST, /* reset */ |
109 | GPIO4_GPIO, /* Hotsync button */ | 110 | GPIO4_GPIO, /* Hotsync button */ |
110 | GPIO9_GPIO, /* power detect */ | 111 | GPIO9_GPIO, /* power detect */ |
112 | GPIO15_GPIO, /* earphone detect */ | ||
111 | GPIO37_GPIO, /* LCD power */ | 113 | GPIO37_GPIO, /* LCD power */ |
112 | GPIO56_GPIO, /* Backlight power */ | 114 | GPIO56_GPIO, /* Backlight power */ |
113 | }; | 115 | }; |
@@ -403,6 +405,21 @@ static struct wm97xx_batt_info wm97xx_batt_pdata = { | |||
403 | }; | 405 | }; |
404 | 406 | ||
405 | /****************************************************************************** | 407 | /****************************************************************************** |
408 | * aSoC audio | ||
409 | ******************************************************************************/ | ||
410 | static struct palm27x_asoc_info palmte2_asoc_pdata = { | ||
411 | .jack_gpio = GPIO_NR_PALMTE2_EARPHONE_DETECT, | ||
412 | }; | ||
413 | |||
414 | static struct platform_device palmte2_asoc = { | ||
415 | .name = "palm27x-asoc", | ||
416 | .id = -1, | ||
417 | .dev = { | ||
418 | .platform_data = &palmte2_asoc_pdata, | ||
419 | }, | ||
420 | }; | ||
421 | |||
422 | /****************************************************************************** | ||
406 | * Framebuffer | 423 | * Framebuffer |
407 | ******************************************************************************/ | 424 | ******************************************************************************/ |
408 | static struct pxafb_mode_info palmte2_lcd_modes[] = { | 425 | static struct pxafb_mode_info palmte2_lcd_modes[] = { |
@@ -437,6 +454,7 @@ static struct platform_device *devices[] __initdata = { | |||
437 | #endif | 454 | #endif |
438 | &palmte2_backlight, | 455 | &palmte2_backlight, |
439 | &power_supply, | 456 | &power_supply, |
457 | &palmte2_asoc, | ||
440 | &palmte2_gpio_vbus, | 458 | &palmte2_gpio_vbus, |
441 | }; | 459 | }; |
442 | 460 | ||