4b24ff7110
all pretty straightforward, except one thing. One of our patches added thermal support for power supply class, but thermal/ subsystem changed under our feet. We (well, Stephen, that is) caught the issue and it was decided[1] that I'd just delay the battery pull request, and then will fix it up by merging upstream back into battery tree at the specific commit. That's not all though: another[2] small fixup for thermal subsystem was needed to get rid of a warning in power supply subsystem (the warning was not drivers/power's "fault", the thermal registration function just needed a proper const annotation, which is also done by a small commit on top of the merge. So, to sum this up: - The 'master' branch of the battery tree was in the -next tree for weeks, was never rebased, altered etc. It should be all OK; - Although, for-v3.6 tag contains the 'master' branch + merge + the warning fix. [1] http://lkml.org/lkml/2012/6/19/23 [2] http://lkml.org/lkml/2012/6/18/28 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQIcBAABAgAGBQJQF9V8AAoJEGgI9fZJve1bLvkP/j/Nt1fBud2w5Q/NJr310hYJ NWIMSJwFbMhPoNd7sESznogXH8eHQ6YJP+CmkA5Gxr0t8pjEEJHEEyEcf1eNv6/c YDZfDB3TIaeYzulvRUkXMQ1f7hiA5Bq2t13yXeMM19+r9DzNZ51jZ3TXETLkpWZG BfZPg5wmP0xssXB3fjJMWuW5hVEc503WLpLFXkWfWKMU3PGdy/8DckV/YLvf2l7K 1fkBLZry0gtruKqFbwcXhanP1JQ8FFFO8n1tSVLJhXXoym5twn/5GAgcpcKSFfJg mkGXAQLLuXKfERBIda7qbQl74HmTzYadCcueeXy1hTpom+VwfOpG+by2t/FrXT/M aJW6hfSLMgicG8FIuSYqbkutvijU9srU/YI00zrSGDBgi4sGKChRMf4sKQXnHO7X Lb7csQ7hEWsfG5gkgjRkmgZdhqWYoIxxe5Gv2Z9MKF27mHoSM03KHiZGlDJMrmNs w4KcU5H9tA62dT/UFszuu7NZenmsVS/ktiHWe5k+EXElZMZRrxKDJk2cvLPkRz/E VkXGvAmTDYPasZm29yzTnPKcuo6pfeOVJnUWybHOYxhkqAhJu1QzHCatqapgfy8E F2ODI5FoWtQES96B9t3tY4lTzq/0yUHcbiJt4BsyRcCGP+ggEQjCq0HGqOca12XX gxE20O3l+YQTCQIYKH+S =1NaS -----END PGP SIGNATURE----- Merge tag 'for-v3.6' of git://git.infradead.org/battery-2.6 Pull battery updates from Anton Vorontsov: "The tag contains just a few battery-related changes for v3.6. It's is all pretty straightforward, except one thing. One of our patches added thermal support for power supply class, but thermal/ subsystem changed under our feet. We (well, Stephen, that is) caught the issue and it was decided[1] that I'd just delay the battery pull request, and then will fix it up by merging upstream back into battery tree at the specific commit. That's not all though: another[2] small fixup for thermal subsystem was needed to get rid of a warning in power supply subsystem (the warning was not drivers/power's "fault", the thermal registration function just needed a proper const annotation, which is also done by a small commit on top of the merge. So, to sum this up: - The 'master' branch of the battery tree was in the -next tree for weeks, was never rebased, altered etc. It should be all OK; - Although, for-v3.6 tag contains the 'master' branch + merge + the warning fix. [1] http://lkml.org/lkml/2012/6/19/23 [2] http://lkml.org/lkml/2012/6/18/28" * tag 'for-v3.6' of git://git.infradead.org/battery-2.6: (23 commits) thermal: Constify 'type' argument for the registration routine olpc-battery: update CHARGE_FULL_DESIGN property for BYD LiFe batteries olpc-battery: Add VOLTAGE_MAX_DESIGN property charger-manager: Fix build break related to EXTCON lp8727_charger: Move header file into platform_data directory power_supply: Add min/max alert properties for CAPACITY, TEMP, TEMP_AMBIENT bq27x00_battery: Add support for BQ27425 chip charger-manager: Set current limit of regulator for over current protection charger-manager: Use EXTCON Subsystem to detect charger cables for charging test_power: Add VOLTAGE_NOW and BATTERY_TEMP properties test_power: Add support for USB AC source gpio-charger: Use cansleep version of gpio_set_value bq27x00_battery: Add support for power average and health properties sbs-battery: Don't trigger false supply_changed event twl4030_charger: Allow charger to control the regulator that feeds it twl4030_charger: Add backup-battery charging twl4030_charger: Fix some typos max17042_battery: Support CHARGE_COUNTER power supply attribute smb347-charger: Add constant charge and current properties power_supply: Add constant charge_current and charge_voltage properties ...
177 lines
5.4 KiB
C
177 lines
5.4 KiB
C
/*
|
|
* thermal.h ($Revision: 0 $)
|
|
*
|
|
* Copyright (C) 2008 Intel Corp
|
|
* Copyright (C) 2008 Zhang Rui <rui.zhang@intel.com>
|
|
* Copyright (C) 2008 Sujith Thomas <sujith.thomas@intel.com>
|
|
*
|
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; version 2 of the License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
|
|
*
|
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
*/
|
|
|
|
#ifndef __THERMAL_H__
|
|
#define __THERMAL_H__
|
|
|
|
#include <linux/idr.h>
|
|
#include <linux/device.h>
|
|
#include <linux/workqueue.h>
|
|
|
|
struct thermal_zone_device;
|
|
struct thermal_cooling_device;
|
|
|
|
enum thermal_device_mode {
|
|
THERMAL_DEVICE_DISABLED = 0,
|
|
THERMAL_DEVICE_ENABLED,
|
|
};
|
|
|
|
enum thermal_trip_type {
|
|
THERMAL_TRIP_ACTIVE = 0,
|
|
THERMAL_TRIP_PASSIVE,
|
|
THERMAL_TRIP_HOT,
|
|
THERMAL_TRIP_CRITICAL,
|
|
};
|
|
|
|
struct thermal_zone_device_ops {
|
|
int (*bind) (struct thermal_zone_device *,
|
|
struct thermal_cooling_device *);
|
|
int (*unbind) (struct thermal_zone_device *,
|
|
struct thermal_cooling_device *);
|
|
int (*get_temp) (struct thermal_zone_device *, unsigned long *);
|
|
int (*get_mode) (struct thermal_zone_device *,
|
|
enum thermal_device_mode *);
|
|
int (*set_mode) (struct thermal_zone_device *,
|
|
enum thermal_device_mode);
|
|
int (*get_trip_type) (struct thermal_zone_device *, int,
|
|
enum thermal_trip_type *);
|
|
int (*get_trip_temp) (struct thermal_zone_device *, int,
|
|
unsigned long *);
|
|
int (*set_trip_temp) (struct thermal_zone_device *, int,
|
|
unsigned long);
|
|
int (*get_trip_hyst) (struct thermal_zone_device *, int,
|
|
unsigned long *);
|
|
int (*set_trip_hyst) (struct thermal_zone_device *, int,
|
|
unsigned long);
|
|
int (*get_crit_temp) (struct thermal_zone_device *, unsigned long *);
|
|
int (*notify) (struct thermal_zone_device *, int,
|
|
enum thermal_trip_type);
|
|
};
|
|
|
|
struct thermal_cooling_device_ops {
|
|
int (*get_max_state) (struct thermal_cooling_device *, unsigned long *);
|
|
int (*get_cur_state) (struct thermal_cooling_device *, unsigned long *);
|
|
int (*set_cur_state) (struct thermal_cooling_device *, unsigned long);
|
|
};
|
|
|
|
#define THERMAL_TRIPS_NONE -1
|
|
#define THERMAL_MAX_TRIPS 12
|
|
#define THERMAL_NAME_LENGTH 20
|
|
struct thermal_cooling_device {
|
|
int id;
|
|
char type[THERMAL_NAME_LENGTH];
|
|
struct device device;
|
|
void *devdata;
|
|
const struct thermal_cooling_device_ops *ops;
|
|
struct list_head node;
|
|
};
|
|
|
|
#define KELVIN_TO_CELSIUS(t) (long)(((long)t-2732 >= 0) ? \
|
|
((long)t-2732+5)/10 : ((long)t-2732-5)/10)
|
|
#define CELSIUS_TO_KELVIN(t) ((t)*10+2732)
|
|
|
|
struct thermal_attr {
|
|
struct device_attribute attr;
|
|
char name[THERMAL_NAME_LENGTH];
|
|
};
|
|
|
|
struct thermal_zone_device {
|
|
int id;
|
|
char type[THERMAL_NAME_LENGTH];
|
|
struct device device;
|
|
struct thermal_attr *trip_temp_attrs;
|
|
struct thermal_attr *trip_type_attrs;
|
|
struct thermal_attr *trip_hyst_attrs;
|
|
void *devdata;
|
|
int trips;
|
|
int tc1;
|
|
int tc2;
|
|
int passive_delay;
|
|
int polling_delay;
|
|
int last_temperature;
|
|
bool passive;
|
|
unsigned int forced_passive;
|
|
const struct thermal_zone_device_ops *ops;
|
|
struct list_head cooling_devices;
|
|
struct idr idr;
|
|
struct mutex lock; /* protect cooling devices list */
|
|
struct list_head node;
|
|
struct delayed_work poll_queue;
|
|
};
|
|
/* Adding event notification support elements */
|
|
#define THERMAL_GENL_FAMILY_NAME "thermal_event"
|
|
#define THERMAL_GENL_VERSION 0x01
|
|
#define THERMAL_GENL_MCAST_GROUP_NAME "thermal_mc_group"
|
|
|
|
enum events {
|
|
THERMAL_AUX0,
|
|
THERMAL_AUX1,
|
|
THERMAL_CRITICAL,
|
|
THERMAL_DEV_FAULT,
|
|
};
|
|
|
|
struct thermal_genl_event {
|
|
u32 orig;
|
|
enum events event;
|
|
};
|
|
/* attributes of thermal_genl_family */
|
|
enum {
|
|
THERMAL_GENL_ATTR_UNSPEC,
|
|
THERMAL_GENL_ATTR_EVENT,
|
|
__THERMAL_GENL_ATTR_MAX,
|
|
};
|
|
#define THERMAL_GENL_ATTR_MAX (__THERMAL_GENL_ATTR_MAX - 1)
|
|
|
|
/* commands supported by the thermal_genl_family */
|
|
enum {
|
|
THERMAL_GENL_CMD_UNSPEC,
|
|
THERMAL_GENL_CMD_EVENT,
|
|
__THERMAL_GENL_CMD_MAX,
|
|
};
|
|
#define THERMAL_GENL_CMD_MAX (__THERMAL_GENL_CMD_MAX - 1)
|
|
|
|
struct thermal_zone_device *thermal_zone_device_register(const char *, int, int,
|
|
void *, const struct thermal_zone_device_ops *, int tc1,
|
|
int tc2, int passive_freq, int polling_freq);
|
|
void thermal_zone_device_unregister(struct thermal_zone_device *);
|
|
|
|
int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int,
|
|
struct thermal_cooling_device *);
|
|
int thermal_zone_unbind_cooling_device(struct thermal_zone_device *, int,
|
|
struct thermal_cooling_device *);
|
|
void thermal_zone_device_update(struct thermal_zone_device *);
|
|
struct thermal_cooling_device *thermal_cooling_device_register(char *, void *,
|
|
const struct thermal_cooling_device_ops *);
|
|
void thermal_cooling_device_unregister(struct thermal_cooling_device *);
|
|
|
|
#ifdef CONFIG_NET
|
|
extern int thermal_generate_netlink_event(u32 orig, enum events event);
|
|
#else
|
|
static inline int thermal_generate_netlink_event(u32 orig, enum events event)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#endif /* __THERMAL_H__ */
|