Merge "power: bq28400: update name of device tree properties on temperature" (dc37c677) · Commits · e / devices / android_kernel_sony_msm8994

Documentation/devicetree/bindings/power/bq28400-battery.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -8,16 +8,16 @@ Required properties:

		- compatible : Must be "ti,bq28400-battery" or "ti,bq30z55-battery"
		- reg : I2C Address must be 0xb.
		- ti,temp-cold : Cold temperature limit in celsius degree
		- ti,temp-hot : Hot temperature limit in celsius degree
		- ti,temp-cold-degc : Cold temperature limit in celsius degree
		- ti,temp-hot-degc : Hot temperature limit in celsius degree

		Example:
		i2c@f9967000 {
		battery@b {
		compatible = "ti,bq28400-battery", "ti,bq30z55-battery";
		reg = <0xb>;
		ti,temp-cold = <2>;
		ti,temp-hot = <43>;
		ti,temp-cold-degc = <2>;
		ti,temp-hot-degc = <43>;
		};
		};

+2 −2

Original line number	Diff line number	Diff line
		@@ -39,8 +39,8 @@
		battery@b {
		compatible = "ti,bq28400-battery";
		reg = <0xb>;
		ti,temp-cold = <2>; /* degree celsius */
		ti,temp-hot = <43>; /* degree celsius */
		ti,temp-cold-degc = <2>; /* degree celsius */
		ti,temp-hot-degc = <43>; /* degree celsius */
		};

		charger@2b {

+2 −2

Original line number	Diff line number	Diff line
		@@ -867,7 +867,7 @@ static int bq28400_probe(struct i2c_client *client,
		}

		/* Note: Lithium-ion battery normal temperature range 0..40 C */
		ret = of_property_read_u32(dev_node, "ti,temp-cold",
		ret = of_property_read_u32(dev_node, "ti,temp-cold-degc",
		&(bq28400_dev->temp_cold));
		if (ret) {
		pr_err("Unable to read cold temperature. ret=%d.\n", ret);
		@@ -875,7 +875,7 @@ static int bq28400_probe(struct i2c_client *client,
		}
		pr_debug("cold temperature limit = %d C.\n", bq28400_dev->temp_cold);

		ret = of_property_read_u32(dev_node, "ti,temp-hot",
		ret = of_property_read_u32(dev_node, "ti,temp-hot-degc",
		&(bq28400_dev->temp_hot));
		if (ret) {
		pr_err("Unable to read hot temperature. ret=%d.\n", ret);