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

Commit 704807bf authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: smb1360: use the interrupt flags specified in device tree"

parents f02e61b1 3cfa8d8b

arch/arm/boot/dts/qcom/msm8939-qrd-skuk.dts

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
		compatible = "qcom,smb1360-chg-fg";

		reg = <0x14>;

		interrupt-parent = <&msm_gpio>;

		interrupts = <62 8>;

		interrupts = <62 2>;

		pinctrl-names = "default";

		pinctrl-0 = <&smb_int_default>;

		qcom,chg-inhibit-disabled;

drivers/power/smb1360-charger-fg.c

+1 −2
Original line number Diff line number Diff line
@@ -2484,8 +2484,7 @@ static int smb1360_probe(struct i2c_client *client, 
	/* STAT irq configuration */

	if (client->irq) {

		rc = devm_request_threaded_irq(&client->dev, client->irq, NULL,

				smb1360_stat_handler,

				IRQF_TRIGGER_LOW | IRQF_ONESHOT,

				smb1360_stat_handler, IRQF_ONESHOT,

				"smb1360_stat_irq", chip);

		if (rc < 0) {

			dev_err(&client->dev,