projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
arch
/
arm
/
mach-mmp
/
aspenite.c
diff --git
a/arch/arm/mach-mmp/aspenite.c
b/arch/arm/mach-mmp/aspenite.c
index 76901f4ce611aba80c2e102700e69407dcd88772..5b660ec09ef52da82afe5b51176cfec4a4f8d4af 100644
(file)
--- a/
arch/arm/mach-mmp/aspenite.c
+++ b/
arch/arm/mach-mmp/aspenite.c
@@
-9,6
+9,7
@@
* publishhed by the Free Software Foundation.
*/
#include <linux/gpio.h>
* publishhed by the Free Software Foundation.
*/
#include <linux/gpio.h>
+#include <linux/gpio-pxa.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/platform_device.h>
@@
-110,6
+111,10
@@
static unsigned long common_pin_config[] __initdata = {
GPIO121_KP_MKIN4,
};
GPIO121_KP_MKIN4,
};
+static struct pxa_gpio_platform_data pxa168_gpio_pdata = {
+ .irq_base = MMP_GPIO_TO_IRQ(0),
+};
+
static struct smc91x_platdata smc91x_info = {
.flags = SMC91X_USE_16BIT | SMC91X_NOWAIT,
};
static struct smc91x_platdata smc91x_info = {
.flags = SMC91X_USE_16BIT | SMC91X_NOWAIT,
};
@@
-242,6
+247,8
@@
static void __init common_init(void)
pxa168_add_nand(&aspenite_nand_info);
pxa168_add_fb(&aspenite_lcd_info);
pxa168_add_keypad(&aspenite_keypad_info);
pxa168_add_nand(&aspenite_nand_info);
pxa168_add_fb(&aspenite_lcd_info);
pxa168_add_keypad(&aspenite_keypad_info);
+ platform_device_add_data(&pxa168_device_gpio, &pxa168_gpio_pdata,
+ sizeof(struct pxa_gpio_platform_data));
platform_device_register(&pxa168_device_gpio);
/* off-chip devices */
platform_device_register(&pxa168_device_gpio);
/* off-chip devices */