diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-06 17:07:15 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-06 17:07:15 +0100 |
| commit | 68ee93f3d058ff58f994d08be00d3aad9ec20970 (patch) | |
| tree | 5fb2d14340332062e416246c5759adcaa64a2340 /drivers/misc/max77693-muic.c | |
| parent | 17021fd920fb5bc97a8c81a20b208c5b38f1b0e8 (diff) | |
| parent | b99374450c03bf5081b88995d91d34fb9b2fd040 (diff) | |
| download | kernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.zip kernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.tar.gz kernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.tar.bz2 | |
Merge branch 'master' of fossencdi.org:kernel_samsung_smdk4412
Diffstat (limited to 'drivers/misc/max77693-muic.c')
| -rw-r--r-- | drivers/misc/max77693-muic.c | 8 |
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) { |