From: Rakesh Babu Bodla Date: Fri, 22 Aug 2014 10:10:52 +0000 (+0530) Subject: extcon: palmas: remove mutually exclusive property X-Git-Tag: daily-2014.10.01.0_rel-st8-r2.5-partner~9 X-Git-Url: http://rtime.felk.cvut.cz/gitweb/sojka/nv-tegra/linux-3.10.git/commitdiff_plain/a717679c20944e4109d9823c45cd8769c8871447 extcon: palmas: remove mutually exclusive property When Y-cable is connected both vbus and id status should be notified. So, removing mutually exclusive property for vbus and id cables. Bug 200004368 Change-Id: I61143b05036ce63a28663df4a1487ae29ee28427 Signed-off-by: Rakesh Babu Bodla Reviewed-on: http://git-master/r/487660 (cherry picked from commit a705c790d3a5fa87d14e29b2c2e908ab23e52852) Reviewed-on: http://git-master/r/494684 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Dhiren Parmar --- diff --git a/drivers/extcon/extcon-palmas.c b/drivers/extcon/extcon-palmas.c index ee6f716e3a2..c12fd027c7a 100644 --- a/drivers/extcon/extcon-palmas.c +++ b/drivers/extcon/extcon-palmas.c @@ -7,7 +7,7 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2013-2014, NVIDIA CORPORATION. All rights reserved. * * Author: Graeme Gregory * Author: Kishon Vijay Abraham I @@ -53,8 +53,6 @@ static char const *palmas_extcon_cable[] = { NULL, }; -static const int mutually_exclusive[] = {0x3, 0x0}; - static void palmas_usb_wakeup(struct palmas *palmas, int enable) { if (enable) @@ -340,7 +338,6 @@ static int palmas_usb_probe(struct platform_device *pdev) platform_set_drvdata(pdev, palmas_usb); palmas_usb->edev.supported_cable = palmas_extcon_cable; - palmas_usb->edev.mutually_exclusive = mutually_exclusive; palmas_usb->edev.name = (ext_name) ? ext_name : dev_name(&pdev->dev); status = extcon_dev_register(&palmas_usb->edev, palmas_usb->dev);