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

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

Merge "ARM: dts: msm: Define bcl peripheral devicetree node for pmi8937"

parents c8131622 709e28c5

arch/arm/boot/dts/qcom/msm-pmi8937.dtsi

+20 −20
Original line number Diff line number Diff line
@@ -350,16 +350,9 @@ 
			};

		};



		qcom,leds@a100 {

			compatible = "qcom,leds-qpnp";

			reg = <0xa100 0x100>;

			label = "mpp";

		};

	};



		bcl@4200 {

			compatible = "qcom,msm-bcl";

		reg = <0x4200 0xFF>;

			reg = <0x4200 0xff>;

			reg-names = "fg_user_adc";

			interrupts = <0x2 0x42 0x0>,

					<0x2 0x42 0x1>;
@@ -377,6 +370,13 @@ 
			qcom,ibat-polling-delay-ms = <100>;

		};



		qcom,leds@a100 {

			compatible = "qcom,leds-qpnp";

			reg = <0xa100 0x100>;

			label = "mpp";

		};

	};



	qcom,pmi8937@3 {

		spmi-slave-container;

		reg = <0x3>;

drivers/power/bcl_peripheral.c

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

 * Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.

 *

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

 * it under the terms of the GNU General Public License version 2 and
@@ -81,6 +81,8 @@ 
			goto bcl_dev_exit; \

		} else if (!_ret) { \

			_dest = _val; \

		} else { \

			_ret = 0; \

		} \

	} while (0)