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

Commit 68204f2f authored by Sebastian Reichel's avatar Sebastian Reichel
Browse files

Merge branch 'fixes' into for-next 



Merge fixes for 4.15-rc phase into next branch.

Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.co.uk>
parents 4fbd8d19 aac79904

drivers/power/reset/zx-reboot.c

+4 −0
Original line number Diff line number Diff line
@@ -82,3 +82,7 @@ static struct platform_driver zx_reboot_driver = { 
	},

};

module_platform_driver(zx_reboot_driver);



MODULE_DESCRIPTION("ZTE SoCs reset driver");

MODULE_AUTHOR("Jun Nie <jun.nie@linaro.org>");

MODULE_LICENSE("GPL v2");

drivers/power/supply/ab8500_charger.c

+4 −2
Original line number Diff line number Diff line
@@ -3218,11 +3218,13 @@ static int ab8500_charger_init_hw_registers(struct ab8500_charger *di) 
	}



	/* Enable backup battery charging */

	abx500_mask_and_set_register_interruptible(di->dev,

	ret = abx500_mask_and_set_register_interruptible(di->dev,

		AB8500_RTC, AB8500_RTC_CTRL_REG,

		RTC_BUP_CH_ENA, RTC_BUP_CH_ENA);

	if (ret < 0)

	if (ret < 0) {

		dev_err(di->dev, "%s mask and set failed\n", __func__);

		goto out;

	}



	if (is_ab8540(di->parent)) {

		ret = abx500_mask_and_set_register_interruptible(di->dev,

drivers/power/supply/charger-manager.c

+1 −1
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ static int check_charging_duration(struct charger_manager *cm) 
	} else if (is_ext_pwr_online(cm) && !cm->charger_enabled) {

		duration = curr - cm->charging_end_time;



		if (duration > desc->charging_max_duration_ms &&

		if (duration > desc->discharging_max_duration_ms &&

				is_ext_pwr_online(cm)) {

			dev_info(cm->dev, "Discharging duration exceed %ums\n",

				 desc->discharging_max_duration_ms);

drivers/power/supply/cpcap-battery.c

+2 −2
Original line number Diff line number Diff line
@@ -586,8 +586,8 @@ static int cpcap_battery_init_irq(struct platform_device *pdev, 
	int irq, error;



	irq = platform_get_irq_byname(pdev, name);

	if (!irq)

		return -ENODEV;

	if (irq < 0)

		return irq;



	error = devm_request_threaded_irq(ddata->dev, irq, NULL,

					  cpcap_battery_irq_thread,

drivers/power/supply/sbs-manager.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static int sbsm_select(struct i2c_mux_core *muxc, u32 chan) 
		return ret;



	/* chan goes from 1 ... 4 */

	reg = 1 << BIT(SBSM_SMB_BAT_OFFSET + chan);

	reg = BIT(SBSM_SMB_BAT_OFFSET + chan);

	ret = sbsm_write_word(data->client, SBSM_CMD_BATSYSSTATE, reg);

	if (ret)

		dev_err(dev, "Failed to select channel %i\n", chan);