diff --git a/[refs] b/[refs] index ba0e35e8909a..195bec9cd3c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9292f05556becd639a91ae62f2041bf570a8bc2d +refs/heads/master: 4d7e47bc83438e366195512fde34015b30ec5921 diff --git a/trunk/Documentation/hwmon/da9052 b/trunk/Documentation/hwmon/da9052 index ef898553638e..5bc51346b689 100644 --- a/trunk/Documentation/hwmon/da9052 +++ b/trunk/Documentation/hwmon/da9052 @@ -56,6 +56,6 @@ The junction temperature is calculated: The junction temperature attribute is supported by the driver. The battery temperature is calculated: - Degree Celcius = 1 / (t1 + 1/298)- 273 + Degree Celsius = 1 / (t1 + 1/298)- 273 where t1 = (1/B)* ln(( ADCval * 2.5)/(R25*ITBAT*255)) Default values of R25, B, ITBAT are 10e3, 3380 and 50e-6 respectively. diff --git a/trunk/Documentation/hwmon/twl4030-madc-hwmon b/trunk/Documentation/hwmon/twl4030-madc-hwmon index ef7984317cec..c3a3a5be10ad 100644 --- a/trunk/Documentation/hwmon/twl4030-madc-hwmon +++ b/trunk/Documentation/hwmon/twl4030-madc-hwmon @@ -41,5 +41,5 @@ Channel Signal The Sysfs nodes will represent the voltage in the units of mV, the temperature channel shows the converted temperature in -degree celcius. The Battery charging current channel represents +degree Celsius. The Battery charging current channel represents battery charging current in mA.