linux-next: manual merge of the extcon tree with the battery tree

linux-next: manual merge of the extcon tree with the battery tree

[broonie]

Hi all,

Today's linux-next merge of the extcon tree got a conflict in:

  drivers/power/supply/max8997_charger.c

between commit:

  fdc9ce72cffea ("power: supply: max8997_charger: Use devm_work_autocancel()")

from the battery tree and commit:

  e77e52e00b184 ("extcon: Fix extcon_get_extcon_dev() error handling")

from the extcon tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/power/supply/max8997_charger.c
index 127c73b0b3bd7,634658adf313f..0000000000000
--- a/drivers/power/supply/max8997_charger.c
+++ b/drivers/power/supply/max8997_charger.c
@@@ -242,15 -248,15 +242,15 @@@ static int max8997_battery_probe(struc
  		dev_info(&pdev->dev, "couldn't get charger regulator\n");
  	}
  	charger->edev = extcon_get_extcon_dev("max8997-muic");
- 	if (IS_ERR_OR_NULL(charger->edev)) {
- 		if (!charger->edev)
- 			return -EPROBE_DEFER;
- 		dev_info(charger->dev, "couldn't get extcon device\n");
+ 	if (IS_ERR(charger->edev)) {
+ 		dev_err_probe(charger->dev, PTR_ERR(charger->edev),
+ 			      "couldn't get extcon device: max8997-muic\n");
+ 		return PTR_ERR(charger->edev);
  	}
  
- 	if (!IS_ERR(charger->reg) && !IS_ERR_OR_NULL(charger->edev)) {
+ 	if (!IS_ERR(charger->reg)) {
 -		INIT_WORK(&charger->extcon_work, max8997_battery_extcon_evt_worker);
 -		ret = devm_add_action(&pdev->dev, max8997_battery_extcon_evt_stop_work, charger);
 +		ret = devm_work_autocancel(&pdev->dev, &charger->extcon_work,
 +					   max8997_battery_extcon_evt_worker);
  		if (ret) {
  			dev_err(&pdev->dev, "failed to add extcon evt stop action: %d\n", ret);
  			return ret;

linux-next: manual merge of the extcon tree with the battery tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1029 bytes --]

Hi Chanwoo,

Today's linux-next merge of the extcon tree got a conflict in
include/linux/mfd/axp20x.h between commit 843735b788a4 ("power:
axp288_charger: axp288 charger driver") from the battery tree and
commit f03123783d4e ("extcon: axp288: Add axp288 extcon driver
support") from the extcon tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/linux/mfd/axp20x.h
index 02f97dc568ac,4ed8071d062e..000000000000
--- a/include/linux/mfd/axp20x.h
+++ b/include/linux/mfd/axp20x.h
@@@ -361,11 -275,9 +361,16 @@@ struct axp20x_fg_pdata 
  	int thermistor_curve[MAX_THERM_CURVE_SIZE][2];
  };
  
 +struct axp20x_chrg_pdata {
 +	int max_cc;
 +	int max_cv;
 +	int def_cc;
 +	int def_cv;
 +};
 +
+ struct axp288_extcon_pdata {
+ 	/* GPIO pin control to switch D+/D- lines b/w PMIC and SOC */
+ 	struct gpio_desc *gpio_mux_cntl;
+ };
+ 
  #endif /* __LINUX_MFD_AXP20X_H */

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]