|
@@ -22,6 +22,7 @@
|
|
|
#include <linux/gpio.h>
|
|
|
#include <linux/gpio_keys.h>
|
|
|
#include <linux/input.h>
|
|
|
+#include <linux/input/navpoint.h>
|
|
|
#include <linux/lcd.h>
|
|
|
#include <linux/mfd/htc-egpio.h>
|
|
|
#include <linux/mfd/asic3.h>
|
|
@@ -113,7 +114,7 @@ static unsigned long hx4700_pin_config[] __initdata = {
|
|
|
GPIO113_I2S_SYSCLK,
|
|
|
|
|
|
/* SSP 1 (NavPoint) */
|
|
|
- GPIO23_SSP1_SCLK,
|
|
|
+ GPIO23_SSP1_SCLK_IN,
|
|
|
GPIO24_SSP1_SFRM,
|
|
|
GPIO25_SSP1_TXD,
|
|
|
GPIO26_SSP1_RXD,
|
|
@@ -129,6 +130,9 @@ static unsigned long hx4700_pin_config[] __initdata = {
|
|
|
GPIO13_GPIO, /* W3220_IRQ */
|
|
|
GPIO14_GPIO, /* nWLAN_IRQ */
|
|
|
|
|
|
+ /* HX4700 specific output GPIOs */
|
|
|
+ GPIO102_GPIO | MFP_LPM_DRIVE_LOW, /* SYNAPTICS_POWER_ON */
|
|
|
+
|
|
|
GPIO10_GPIO, /* GSM_IRQ */
|
|
|
GPIO13_GPIO, /* CPLD_IRQ */
|
|
|
GPIO107_GPIO, /* DS1WM_IRQ */
|
|
@@ -182,6 +186,23 @@ static struct platform_device gpio_keys = {
|
|
|
.id = -1,
|
|
|
};
|
|
|
|
|
|
+/*
|
|
|
+ * Synaptics NavPoint connected to SSP1
|
|
|
+ */
|
|
|
+
|
|
|
+static struct navpoint_platform_data navpoint_platform_data = {
|
|
|
+ .port = 1,
|
|
|
+ .gpio = GPIO102_HX4700_SYNAPTICS_POWER_ON,
|
|
|
+};
|
|
|
+
|
|
|
+static struct platform_device navpoint = {
|
|
|
+ .name = "navpoint",
|
|
|
+ .id = -1,
|
|
|
+ .dev = {
|
|
|
+ .platform_data = &navpoint_platform_data,
|
|
|
+ },
|
|
|
+};
|
|
|
+
|
|
|
/*
|
|
|
* ASIC3
|
|
|
*/
|
|
@@ -823,6 +844,7 @@ static struct platform_device audio = {
|
|
|
static struct platform_device *devices[] __initdata = {
|
|
|
&asic3,
|
|
|
&gpio_keys,
|
|
|
+ &navpoint,
|
|
|
&backlight,
|
|
|
&w3220,
|
|
|
&hx4700_lcd,
|