]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
Revert "extcon: palmas: remove mutually exclusive property"
authorTodd Poynter <tpoynter@nvidia.com>
Sat, 6 Sep 2014 18:25:10 +0000 (11:25 -0700)
committerTodd Poynter <tpoynter@nvidia.com>
Sat, 6 Sep 2014 18:25:23 +0000 (11:25 -0700)
This reverts commit a717679c20944e4109d9823c45cd8769c8871447.

Bug 200004368

Change-Id: Ib88c7b7ba2edde8d7b11c933d5080823d17a329f
Signed-off-by: Todd Poynter <tpoynter@nvidia.com>
Reviewed-on: http://git-master/r/496363

drivers/extcon/extcon-palmas.c

index c12fd027c7ae7f8d16bc04c41e1fd4f3bc6734c4..ee6f716e3a2067f02112e97ad31f7727bcb0623d 100644 (file)
@@ -7,7 +7,7 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Copyright (c) 2013-2014, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2013, NVIDIA CORPORATION.  All rights reserved.
  *
  * Author: Graeme Gregory <gg@slimlogic.co.uk>
  * Author: Kishon Vijay Abraham I <kishon@ti.com>
@@ -53,6 +53,8 @@ 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)
@@ -338,6 +340,7 @@ 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);