Commit 91c45a7a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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

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

Chanwoo writes:

Update extcon for 4.20

Detailed description for this pull request:
1. Add SPDX license identifiers for Maxim and Intel extcon drivers
2. Clean-up extcon-intel-cht-wc.c driver without operation changes
3. Fix build warning of extcon core and use kasprintf instead of snprintf

* tag 'extcon-next-for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon:
  extcon: int3496: Convert to use SPDX identifier
  extcon: cht-wc: Convert to use SPDX identifier
  extcon: cht-wc: Correct USBID bit field handling
  extcon: cht-wc: Fix definition names according to spec
  extcon: cht-wc: Return from default case to avoid warnings
  extcon: Switch to use kasprintf() instead of open coded
  extcon: Make static analyzer happy about union assignment
  extcon: maxim: Add SPDX license identifiers
parents 29c222d1 2e464ff0

drivers/extcon/extcon-intel-cht-wc.c

+29 −31
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Extcon charger detection driver for Intel Cherrytrail Whiskey Cove PMIC

 * Copyright (C) 2017 Hans de Goede <hdegoede@redhat.com>

 *

 * Based on various non upstream patches to support the CHT Whiskey Cove PMIC:

 * Copyright (C) 2013-2015 Intel Corporation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 */



#include <linux/extcon-provider.h>
@@ -32,10 +24,10 @@ 
#define CHT_WC_CHGRCTRL0_EMRGCHREN	BIT(1)

#define CHT_WC_CHGRCTRL0_EXTCHRDIS	BIT(2)

#define CHT_WC_CHGRCTRL0_SWCONTROL	BIT(3)

#define CHT_WC_CHGRCTRL0_TTLCK_MASK	BIT(4)

#define CHT_WC_CHGRCTRL0_CCSM_OFF_MASK	BIT(5)

#define CHT_WC_CHGRCTRL0_DBPOFF_MASK	BIT(6)

#define CHT_WC_CHGRCTRL0_WDT_NOKICK	BIT(7)

#define CHT_WC_CHGRCTRL0_TTLCK		BIT(4)

#define CHT_WC_CHGRCTRL0_CCSM_OFF	BIT(5)

#define CHT_WC_CHGRCTRL0_DBPOFF		BIT(6)

#define CHT_WC_CHGRCTRL0_CHR_WDT_NOKICK	BIT(7)



#define CHT_WC_CHGRCTRL1		0x5e17
@@ -52,7 +44,7 @@ 
#define CHT_WC_USBSRC_TYPE_ACA		4

#define CHT_WC_USBSRC_TYPE_SE1		5

#define CHT_WC_USBSRC_TYPE_MHL		6

#define CHT_WC_USBSRC_TYPE_FLOAT_DP_DN	7

#define CHT_WC_USBSRC_TYPE_FLOATING	7

#define CHT_WC_USBSRC_TYPE_OTHER	8

#define CHT_WC_USBSRC_TYPE_DCP_EXTPHY	9
@@ -61,9 +53,12 @@ 
#define CHT_WC_PWRSRC_STS		0x6e1e

#define CHT_WC_PWRSRC_VBUS		BIT(0)

#define CHT_WC_PWRSRC_DC		BIT(1)

#define CHT_WC_PWRSRC_BAT		BIT(2)

#define CHT_WC_PWRSRC_ID_GND		BIT(3)

#define CHT_WC_PWRSRC_ID_FLOAT		BIT(4)

#define CHT_WC_PWRSRC_BATT		BIT(2)

#define CHT_WC_PWRSRC_USBID_MASK	GENMASK(4, 3)

#define CHT_WC_PWRSRC_USBID_SHIFT	3

#define CHT_WC_PWRSRC_RID_ACA		0

#define CHT_WC_PWRSRC_RID_GND		1

#define CHT_WC_PWRSRC_RID_FLOAT		2



#define CHT_WC_VBUS_GPIO_CTLO		0x6e2d

#define CHT_WC_VBUS_GPIO_CTLO_OUTPUT	BIT(0)
@@ -104,17 +99,21 @@ struct cht_wc_extcon_data { 


static int cht_wc_extcon_get_id(struct cht_wc_extcon_data *ext, int pwrsrc_sts)

{

	if (pwrsrc_sts & CHT_WC_PWRSRC_ID_GND)

	switch ((pwrsrc_sts & CHT_WC_PWRSRC_USBID_MASK) >> CHT_WC_PWRSRC_USBID_SHIFT) {

	case CHT_WC_PWRSRC_RID_GND:

		return USB_ID_GND;

	if (pwrsrc_sts & CHT_WC_PWRSRC_ID_FLOAT)

	case CHT_WC_PWRSRC_RID_FLOAT:

		return USB_ID_FLOAT;



	case CHT_WC_PWRSRC_RID_ACA:

	default:

		/*

	 * Once we have iio support for the gpadc we should read the USBID

	 * gpadc channel here and determine ACA role based on that.

		 * Once we have IIO support for the GPADC we should read

		 * the USBID GPADC channel here and determine ACA role

		 * based on that.

		 */

		return USB_ID_FLOAT;

	}

}



static int cht_wc_extcon_get_charger(struct cht_wc_extcon_data *ext,

				     bool ignore_errors)
@@ -156,9 +155,9 @@ static int cht_wc_extcon_get_charger(struct cht_wc_extcon_data *ext, 
		dev_warn(ext->dev,

			"Unhandled charger type %d, defaulting to SDP\n",

			 ret);

		/* Fall through, treat as SDP */

		return EXTCON_CHG_USB_SDP;

	case CHT_WC_USBSRC_TYPE_SDP:

	case CHT_WC_USBSRC_TYPE_FLOAT_DP_DN:

	case CHT_WC_USBSRC_TYPE_FLOATING:

	case CHT_WC_USBSRC_TYPE_OTHER:

		return EXTCON_CHG_USB_SDP;

	case CHT_WC_USBSRC_TYPE_CDP:
@@ -279,7 +278,7 @@ static int cht_wc_extcon_sw_control(struct cht_wc_extcon_data *ext, bool enable) 
{

	int ret, mask, val;



	mask = CHT_WC_CHGRCTRL0_SWCONTROL | CHT_WC_CHGRCTRL0_CCSM_OFF_MASK;

	mask = CHT_WC_CHGRCTRL0_SWCONTROL | CHT_WC_CHGRCTRL0_CCSM_OFF;

	val = enable ? mask : 0;

	ret = regmap_update_bits(ext->regmap, CHT_WC_CHGRCTRL0, mask, val);

	if (ret)
@@ -292,6 +291,7 @@ static int cht_wc_extcon_probe(struct platform_device *pdev) 
{

	struct intel_soc_pmic *pmic = dev_get_drvdata(pdev->dev.parent);

	struct cht_wc_extcon_data *ext;

	unsigned long mask = ~(CHT_WC_PWRSRC_VBUS | CHT_WC_PWRSRC_USBID_MASK);

	int irq, ret;



	irq = platform_get_irq(pdev, 0);
@@ -352,9 +352,7 @@ static int cht_wc_extcon_probe(struct platform_device *pdev) 
	}



	/* Unmask irqs */

	ret = regmap_write(ext->regmap, CHT_WC_PWRSRC_IRQ_MASK,

			   (int)~(CHT_WC_PWRSRC_VBUS | CHT_WC_PWRSRC_ID_GND |

				  CHT_WC_PWRSRC_ID_FLOAT));

	ret = regmap_write(ext->regmap, CHT_WC_PWRSRC_IRQ_MASK, mask);

	if (ret) {

		dev_err(ext->dev, "Error writing irq-mask: %d\n", ret);

		goto disable_sw_control;

drivers/extcon/extcon-intel-int3496.c

+2 −10
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Intel INT3496 ACPI device extcon driver

 *
@@ -7,15 +8,6 @@ 
 *

 * Copyright (c) 2014, Intel Corporation.

 * Author: David Cohen <david.a.cohen@linux.intel.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/acpi.h>
@@ -192,4 +184,4 @@ module_platform_driver(int3496_driver); 


MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");

MODULE_DESCRIPTION("Intel INT3496 ACPI device extcon driver");

MODULE_LICENSE("GPL");
 
MODULE_LICENSE("GPL v2");

drivers/extcon/extcon-max14577.c

+7 −17
Original line number Diff line number Diff line 
/*

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

 *

 * Copyright (C) 2013,2014 Samsung Electronics

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

 * Krzysztof Kozlowski <krzk@kernel.org>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */

// SPDX-License-Identifier: GPL-2.0+

//

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

//

// Copyright (C) 2013,2014 Samsung Electronics

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

// Krzysztof Kozlowski <krzk@kernel.org>



#include <linux/kernel.h>

#include <linux/module.h>

drivers/extcon/extcon-max77693.c

+6 −16
Original line number Diff line number Diff line 
/*

 * extcon-max77693.c - MAX77693 extcon driver to support MAX77693 MUIC

 *

 * Copyright (C) 2012 Samsung Electrnoics

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */

// SPDX-License-Identifier: GPL-2.0+

//

// extcon-max77693.c - MAX77693 extcon driver to support MAX77693 MUIC

//

// Copyright (C) 2012 Samsung Electrnoics

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



#include <linux/kernel.h>

#include <linux/module.h>

drivers/extcon/extcon-max77843.c

+7 −12
Original line number Diff line number Diff line 
/*

 * extcon-max77843.c - Maxim MAX77843 extcon driver to support

 *			MUIC(Micro USB Interface Controller)

 *

 * Copyright (C) 2015 Samsung Electronics

 * Author: Jaewon Kim <jaewon02.kim@samsung.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */

// SPDX-License-Identifier: GPL-2.0+

//

// extcon-max77843.c - Maxim MAX77843 extcon driver to support

//			MUIC(Micro USB Interface Controller)

//

// Copyright (C) 2015 Samsung Electronics

// Author: Jaewon Kim <jaewon02.kim@samsung.com>



#include <linux/extcon-provider.h>

#include <linux/i2c.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE