Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a3c724a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'extcon-next-for-3.19' of... 

Merge tag 'extcon-next-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-testing

Update extcon for v3.19

This patchset fix minor issue of extcon driver.

Detailed description for patchset:
- Fix typo and change jig cable name of extcon-max77693.c
- Update the extcon_get_edev_by_phandle() because previous extcon_get_edev_by_phandle()
  considered the platform device driver. So, this modification supports
  OF-based extcon lookup method by using the list of extcon devices.
parents e88b1fc6 6ab0b117

drivers/extcon/extcon-class.c

+9 −5
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/fs.h>

#include <linux/err.h>

#include <linux/extcon.h>

#include <linux/of.h>

#include <linux/slab.h>

#include <linux/sysfs.h>

#include <linux/of.h>
@@ -997,13 +998,16 @@ struct extcon_dev *extcon_get_edev_by_phandle(struct device *dev, int index) 
		return ERR_PTR(-ENODEV);

	}



	edev = extcon_get_extcon_dev(node->name);

	if (!edev) {

		dev_err(dev, "unable to get extcon device : %s\n", node->name);

		return ERR_PTR(-ENODEV);

	mutex_lock(&extcon_dev_list_lock);

	list_for_each_entry(edev, &extcon_dev_list, entry) {

		if (edev->dev.parent && edev->dev.parent->of_node == node) {

			mutex_unlock(&extcon_dev_list_lock);

			return edev;

		}

	}

	mutex_unlock(&extcon_dev_list_lock);



	return edev;

	return ERR_PTR(-EPROBE_DEFER);

}

#else

struct extcon_dev *extcon_get_edev_by_phandle(struct device *dev, int index)

drivers/extcon/extcon-max14577.c

+1 −1
Original line number Diff line number Diff line 
/*

 * extcon-max14577.c - MAX14577/77836 extcon driver to support MUIC

 *

 * Copyright (C) 2013,2014 Samsung Electrnoics

 * Copyright (C) 2013,2014 Samsung Electronics

 * Chanwoo Choi <cw00.choi@samsung.com>

 * Krzysztof Kozlowski <k.kozlowski@samsung.com>

 *

drivers/extcon/extcon-max77693.c

+7 −5
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ static const char *max77693_extcon_cable[] = { 
	[EXTCON_CABLE_JIG_USB_ON]		= "JIG-USB-ON",

	[EXTCON_CABLE_JIG_USB_OFF]		= "JIG-USB-OFF",

	[EXTCON_CABLE_JIG_UART_OFF]		= "JIG-UART-OFF",

	[EXTCON_CABLE_JIG_UART_ON]		= "Dock-Car",

	[EXTCON_CABLE_JIG_UART_ON]		= "JIG-UART-ON",

	[EXTCON_CABLE_DOCK_SMART]		= "Dock-Smart",

	[EXTCON_CABLE_DOCK_DESK]		= "Dock-Desk",

	[EXTCON_CABLE_DOCK_AUDIO]		= "Dock-Audio",
@@ -532,9 +532,6 @@ static int max77693_muic_dock_handler(struct max77693_muic_info *info, 
		extcon_set_cable_state(info->edev, "Dock-Smart", attached);

		extcon_set_cable_state(info->edev, "MHL", attached);

		goto out;

	case MAX77693_MUIC_ADC_FACTORY_MODE_UART_ON:	/* Dock-Car */

		strcpy(dock_name, "Dock-Car");

		break;

	case MAX77693_MUIC_ADC_AUDIO_MODE_REMOTE:	/* Dock-Desk */

		strcpy(dock_name, "Dock-Desk");

		break;
@@ -669,6 +666,11 @@ static int max77693_muic_jig_handler(struct max77693_muic_info *info, 
		strcpy(cable_name, "JIG-UART-OFF");

		path = CONTROL1_SW_UART;

		break;

	case MAX77693_MUIC_ADC_FACTORY_MODE_UART_ON:	/* ADC_JIG_UART_ON */

		/* PATH:AP_UART */

		strcpy(cable_name, "JIG-UART-ON");

		path = CONTROL1_SW_UART;

		break;

	default:

		dev_err(info->dev, "failed to detect %s jig cable\n",

			attached ? "attached" : "detached");
@@ -708,13 +710,13 @@ static int max77693_muic_adc_handler(struct max77693_muic_info *info) 
	case MAX77693_MUIC_ADC_FACTORY_MODE_USB_OFF:

	case MAX77693_MUIC_ADC_FACTORY_MODE_USB_ON:

	case MAX77693_MUIC_ADC_FACTORY_MODE_UART_OFF:

	case MAX77693_MUIC_ADC_FACTORY_MODE_UART_ON:

		/* JIG */

		ret = max77693_muic_jig_handler(info, cable_type, attached);

		if (ret < 0)

			return ret;

		break;

	case MAX77693_MUIC_ADC_RESERVED_ACC_3:		/* Dock-Smart */

	case MAX77693_MUIC_ADC_FACTORY_MODE_UART_ON:	/* Dock-Car */

	case MAX77693_MUIC_ADC_AUDIO_MODE_REMOTE:	/* Dock-Desk */

	case MAX77693_MUIC_ADC_AV_CABLE_NOLOAD:		/* Dock-Audio */

		/*