aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorsbrissen <sbrissen@hotmail.com>2013-10-23 13:19:08 -0400
committersbrissen <sbrissen@hotmail.com>2013-11-11 10:57:32 -0500
commitd6f2f4ae4e593067dc59e2ac63f022434199f673 (patch)
treeefa7d60c4435cffe05ae479aa98cc815f52c4b59 /drivers/misc
parent25db0ffc956371b6613f90e68be96b652c4ab275 (diff)
downloadkernel_samsung_smdk4412-cm-10.2.0.zip
kernel_samsung_smdk4412-cm-10.2.0.tar.gz
kernel_samsung_smdk4412-cm-10.2.0.tar.bz2
Add support for Note 8 (N5100 and N5110)cm-10.2.0
Change-Id: I6c9798682f9f6349b37cb452353bd0c0e6958401
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/max77693-muic.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/misc/max77693-muic.c b/drivers/misc/max77693-muic.c
index 9a78d76..082777d 100644
--- a/drivers/misc/max77693-muic.c
+++ b/drivers/misc/max77693-muic.c
@@ -473,7 +473,7 @@ static ssize_t max77693_muic_show_manualsw(struct device *dev,
struct max77693_muic_info *info = dev_get_drvdata(dev);
#if !defined(CONFIG_MACH_T0) && !defined(CONFIG_MACH_M3) \
- && !defined(CONFIG_MACH_SLP_T0_LTE)
+ && !defined(CONFIG_MACH_SLP_T0_LTE) && !defined(CONFIG_MACH_KONA)
dev_info(info->dev, "func:%s ap(0),cp(1),vps(2)sw_path:%d(%d)\n",
__func__, info->muic_data->sw_path,
gpio_get_value(GPIO_USB_SEL));/*For debuging*/
@@ -716,7 +716,7 @@ static ssize_t max77693_muic_set_uart_sel(struct device *dev,
if (info->max77693->pmic_rev < MAX77693_REV_PASS2) {
#if !defined(CONFIG_MACH_T0) && !defined(CONFIG_MACH_M3) \
- && !defined(CONFIG_MACH_SLP_T0_LTE)
+ && !defined(CONFIG_MACH_SLP_T0_LTE) && !defined(CONFIG_MACH_KONA)
if (!strncasecmp(buf, "AP", 2)) {
info->muic_data->uart_path = UART_PATH_AP;
if (gpio_is_valid(GPIO_UART_SEL)) {
@@ -845,7 +845,7 @@ static ssize_t max77693_muic_show_uart_sel(struct device *dev,
struct max77693_muic_info *info = dev_get_drvdata(dev);
if (info->max77693->pmic_rev < MAX77693_REV_PASS2) {
#if !defined(CONFIG_MACH_T0) && !defined(CONFIG_MACH_M3) \
- && !defined(CONFIG_MACH_SLP_T0_LTE)
+ && !defined(CONFIG_MACH_SLP_T0_LTE) && !defined(CONFIG_MACH_KONA)
switch (info->muic_data->uart_path) {
case UART_PATH_AP:
if (gpio_get_value(GPIO_UART_SEL) == GPIO_LEVEL_HIGH)
@@ -3112,7 +3112,7 @@ static int uart_switch_init(struct max77693_muic_info *info)
int ret, val;
#if !defined(CONFIG_MACH_T0) && !defined(CONFIG_MACH_M3) \
- && !defined(CONFIG_MACH_SLP_T0_LTE)
+ && !defined(CONFIG_MACH_SLP_T0_LTE) && !defined(CONFIG_MACH_KONA)
if (info->max77693->pmic_rev < MAX77693_REV_PASS2) {
ret = gpio_request(GPIO_UART_SEL, "UART_SEL");
if (ret < 0) {