Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

vibrant stuff

  • Loading branch information...
commit cd764ab9da90abcf6fe203fd4e7c216776edaeca 1 parent 0fc1023
@xcaliburinhand authored
View
10 arch/arm/mach-s5pv210/Kconfig
@@ -173,12 +173,22 @@ config ARIES_LATONA
help
Select S1 LATONA
+choice
+ prompt "Galaxy Variant"
+
config GALAXY_I897
bool "select Captivate"
depends on ARIES_EUR
help
Captivate specific settings
+config GALAXY_T959
+ bool "select Vibrant"
+ depends on ARIES_EUR
+ help
+ Vibrant specific settings
+endchoice
+
config S5PV210_SETUP_FB
bool
depends on FB_S3C
View
13 arch/arm/mach-s5pv210/mach-aries.c
@@ -1197,7 +1197,7 @@ static void touch_keypad_onoff(int onoff)
}
static const int touch_keypad_code[] = {
-#if defined(CONFIG_GALAXY_I897)
+#if defined(CONFIG_GALAXY_I897) || defined(CONFIG_GALAXY_T959)
KEY_MENU,
KEY_HOME,
KEY_BACK,
@@ -1225,6 +1225,16 @@ static struct gpio_event_direct_entry aries_keypad_key_map[] = {
.gpio = S5PV210_GPH2(6),
.code = KEY_POWER,
},
+#if defined(CONFIG_GALAXY_T959)
+ {
+ .gpio = S5PV210_GPH3(2),
+ .code = KEY_VOLUMEDOWN,
+ },
+ {
+ .gpio = S5PV210_GPH3(1),
+ .code = KEY_VOLUMEUP,
+ },
+#else
{
.gpio = S5PV210_GPH3(1),
.code = KEY_VOLUMEDOWN,
@@ -1233,6 +1243,7 @@ static struct gpio_event_direct_entry aries_keypad_key_map[] = {
.gpio = S5PV210_GPH3(2),
.code = KEY_VOLUMEUP,
},
+#endif
{
.gpio = S5PV210_GPH3(5),
.code = KEY_HOME,
View
3  drivers/misc/fsa9480.c
@@ -345,7 +345,7 @@ static void fsa9480_detect_dev(struct fsa9480_usbsw *usbsw)
if (pdata->deskdock_cb)
pdata->deskdock_cb(FSA9480_ATTACHED);
-#if defined(CONFIG_GALAXY_I897)
+#if defined(CONFIG_GALAXY_I897) || defined(CONFIG_GALAXY_T959)
ret = i2c_smbus_write_byte_data(client,
FSA9480_REG_MANSW1, SW_AUDIO);
if (ret < 0)
@@ -374,7 +374,6 @@ static void fsa9480_detect_dev(struct fsa9480_usbsw *usbsw)
} else if (val2 & DEV_JIG_UART_ON) {
if (pdata->cardock_cb)
pdata->cardock_cb(FSA9480_ATTACHED);
-
ret = i2c_smbus_write_byte_data(client,
FSA9480_REG_MANSW1, SW_AUDIO);
if (ret < 0)
View
2  drivers/misc/sec_jack.c
@@ -490,7 +490,7 @@ static int sec_jack_probe(struct platform_device *pdev)
dev_set_drvdata(&pdev->dev, hi);
-#if defined(CONFIG_GALAXY_I897)
+#if defined(CONFIG_GALAXY_I897) || defined(CONFIG_GALAXY_T959)
pdata->det_active_high = 1;
#endif
Please sign in to comment.
Something went wrong with that request. Please try again.