diff options
| author | Arnab Chaudhuri <coolguyforgenerationx@gmail.com> | 2016-05-04 15:40:00 +0530 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-05-08 13:49:37 -0700 |
| commit | dbabc204f2217b654d806a42163b46a6e77f0e7c (patch) | |
| tree | a1e9cd232fc17928e6007506bafe27f701bce304 /arch | |
| parent | f3bad54455dde6aad5ec62bbb115be8120173f7e (diff) | |
| download | kernel_samsung_smdk4412-dbabc204f2217b654d806a42163b46a6e77f0e7c.zip kernel_samsung_smdk4412-dbabc204f2217b654d806a42163b46a6e77f0e7c.tar.gz kernel_samsung_smdk4412-dbabc204f2217b654d806a42163b46a6e77f0e7c.tar.bz2 | |
cypress: Port BLN for smdk4210
BLN code originally by neldar. Adapted for SGSII by creams. Ported
by gokhanmoral.
Change-Id: I3e51026a9057be47586378994f61719177507b84
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-exynos/mach-u1.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/arch/arm/mach-exynos/mach-u1.c b/arch/arm/mach-exynos/mach-u1.c index ab756ab..5d5183c 100644 --- a/arch/arm/mach-exynos/mach-u1.c +++ b/arch/arm/mach-exynos/mach-u1.c @@ -198,7 +198,7 @@ static struct wacom_g5_callbacks *wacom_callbacks; #endif /* CONFIG_EPEN_WACOM_G5SP */ -#ifdef CONFIG_KEYBOARD_CYPRESS_TOUCH +#if defined(CONFIG_KEYBOARD_CYPRESS_TOUCH) || defined(CONFIG_KEYBOARD_CYPRESS_TOUCH_BLN) #include <linux/i2c/touchkey_i2c.h> #endif @@ -3095,7 +3095,11 @@ REGULATOR_INIT(ldo17, "VTF_2.8V", 2800000, 2800000, 0, REGULATOR_INIT(ldo18, "TOUCH_LED_3.3V", 3300000, 3300000, 0, REGULATOR_CHANGE_STATUS, 1); #else +#if defined(CONFIG_KEYBOARD_CYPRESS_TOUCH_BLN) && defined(CONFIG_TOUCHKEY_BLN) +REGULATOR_INIT(ldo18, "TOUCH_LED_3.3V", 2500000, 3300000, 0, +#else REGULATOR_INIT(ldo18, "TOUCH_LED_3.3V", 3000000, 3300000, 0, +#endif REGULATOR_CHANGE_STATUS | REGULATOR_CHANGE_VOLTAGE, 1); #endif REGULATOR_INIT(ldo21, "VDDQ_M1M2_1.2V", 1200000, 1200000, 1, @@ -6194,7 +6198,7 @@ static void p6_wacom_register_callbacks(struct wacom_g5_callbacks *cb) #ifdef CONFIG_S3C_DEV_I2C8_EMUL static struct i2c_board_info i2c_devs8_emul[]; #endif -#ifdef CONFIG_KEYBOARD_CYPRESS_TOUCH +#if defined(CONFIG_KEYBOARD_CYPRESS_TOUCH) || defined(CONFIG_KEYBOARD_CYPRESS_TOUCH_BLN) static void touchkey_init_hw(void) { gpio_request(GPIO_3_TOUCH_INT, "3_TOUCH_INT"); @@ -6295,7 +6299,7 @@ static struct touchkey_platform_data touchkey_pdata = { .power_on = touchkey_power_on, .led_power_on = touchkey_led_power_on, }; -#endif /*CONFIG_KEYBOARD_CYPRESS_TOUCH*/ +#endif /*(CONFIG_KEYBOARD_CYPRESS_TOUCH) || (CONFIG_KEYBOARD_CYPRESS_TOUCH_BLN)*/ @@ -6448,7 +6452,7 @@ struct platform_device s3c_device_i2c8 = { /* I2C8 */ static struct i2c_board_info i2c_devs8_emul[] = { -#ifdef CONFIG_KEYBOARD_CYPRESS_TOUCH +#if defined(CONFIG_KEYBOARD_CYPRESS_TOUCH) || defined(CONFIG_KEYBOARD_CYPRESS_TOUCH_BLN) { I2C_BOARD_INFO("sec_touchkey", 0x20), .platform_data = &touchkey_pdata, @@ -7983,7 +7987,7 @@ static void __init smdkc210_machine_init(void) ARRAY_SIZE(tuna_i2c15_boardinfo)); #endif #ifdef CONFIG_S3C_DEV_I2C8_EMUL -#ifdef CONFIG_KEYBOARD_CYPRESS_TOUCH +#if defined(CONFIG_KEYBOARD_CYPRESS_TOUCH) || defined(CONFIG_KEYBOARD_CYPRESS_TOUCH_BLN) touchkey_init_hw(); #endif i2c_register_board_info(8, i2c_devs8_emul, ARRAY_SIZE(i2c_devs8_emul)); |