Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756191AbaLHRHW (ORCPT ); Mon, 8 Dec 2014 12:07:22 -0500 Received: from mailout2.samsung.com ([203.254.224.25]:60023 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750908AbaLHRHS (ORCPT ); Mon, 8 Dec 2014 12:07:18 -0500 X-AuditID: cbfee61a-f79c06d000004e71-b5-5485dac4f010 From: Lukasz Majewski To: Eduardo Valentin , Zhang Rui Cc: Linux PM list , Thierry Reding , Bartlomiej Zolnierkiewicz , Lukasz Majewski , Mikko Perttunen , Stephen Warren , Abhilash Kesavan , Abhilash Kesavan , Guenter Roeck , linux-kernel@vger.kernel.org, Caesar Wang , navneet kumar , Lukasz Majewski Subject: [PATCH v3 5/5] thermal: of: Extend current of-thermal.c code to allow setting emulated temp Date: Mon, 08 Dec 2014 18:04:21 +0100 Message-id: <1418058261-25251-6-git-send-email-l.majewski@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-reply-to: <1418058261-25251-1-git-send-email-l.majewski@samsung.com> References: <1416500488-7232-1-git-send-email-l.majewski@samsung.com> <1418058261-25251-1-git-send-email-l.majewski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrPLMWRmVeSWpSXmKPExsVy+t9jAd0jt1pDDH7NU7B4vGYxk8XGGetZ Lb587mOzmH/lGqvFmr9KFm8ecVu8ebiZ0eLyrjlsFp97jzBaPFl4hsniwdVpbBb71ixlsnjy EKj+1cE2Foufu+axOPB77Jx1l91j8Z6XTB7rpr1l9uhtfsfm8XfWfhaPnd8b2D36tqxi9Pi8 Sc5j49zQAM4oLpuU1JzMstQifbsErozN36eyFdwVqzj+r425gfG+UBcjJ4eEgIlE86/jbBC2 mMSFe+uBbC4OIYFFjBL3d0yDcrqYJOZ+OMQEUsUmoCfx+e5TMFtEwFvi9b7pjCBFzAJrWCQ+ XL0LNkpYIE1ie8MOVhCbRUBV4tL5PrAGXgE3iZMrv7NCrFOU6H42AayeU8Bd4vy966wQ25oY JS7v2MkygZF3ASPDKkbR1ILkguKk9FxDveLE3OLSvHS95PzcTYzgYH4mtYNxZYPFIUYBDkYl Ht4FD1pChFgTy4orcw8xSnAwK4nwLt/ZGiLEm5JYWZValB9fVJqTWnyIUZqDRUmc98bN3BAh gfTEktTs1NSC1CKYLBMHp1QD42nvz8YFvI7lrU8vtK6ufyiUdkw+WOCm03odv4Y1+37/KXXb u0bn6gy596rqPxTLc59ub/z5kM/VTzA4ft0OtXqdZo3u9kDDB2HWtbdCHvsrm/PZpgrMN/3s 4GDWJnc/iCdx4y0tzemLu/bZFFpu2qi84efxfct3veD8usu35crBEn09ftd/SizFGYmGWsxF xYkAv4JZF2ICAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Before this change it was only possible to set get_temp() and get_trend() methods to be used in the common code handling passing parameters via device tree to "cpu-thermal" CPU thermal zone device. Now it is possible to also set emulated value of temperature for debug purposes. Signed-off-by: Lukasz Majewski Acked-by: Eduardo Valentin --- Changes for v3: - Update comment for .set_emul_temp method to indicate that it is optional Changes for v2: - Rework the emulated temperature setting code to use of_thermal_sensor_ops structure --- drivers/thermal/of-thermal.c | 24 ++++++++++++++++++++++++ include/linux/thermal.h | 3 +++ 2 files changed, 27 insertions(+) diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c index e062bf5..e145b66 100644 --- a/drivers/thermal/of-thermal.c +++ b/drivers/thermal/of-thermal.c @@ -161,6 +161,28 @@ of_thermal_get_trip_points(struct thermal_zone_device *tz) } EXPORT_SYMBOL_GPL(of_thermal_get_trip_points); +/** + * of_thermal_set_emul_temp - function to set emulated temperature + * + * @tz: pointer to a thermal zone + * @temp: temperature to set + * + * This function gives the ability to set emulated value of temperature, + * which is handy for debugging + * + * Return: zero on success, error code otherwise + */ +static int of_thermal_set_emul_temp(struct thermal_zone_device *tz, + unsigned long temp) +{ + struct __thermal_zone *data = tz->devdata; + + if (!data->ops || !data->ops->set_emul_temp) + return -EINVAL; + + return data->ops->set_emul_temp(data->sensor_data, temp); +} + static int of_thermal_get_trend(struct thermal_zone_device *tz, int trip, enum thermal_trend *trend) { @@ -392,6 +414,7 @@ thermal_zone_of_add_sensor(struct device_node *zone, tzd->ops->get_temp = of_thermal_get_temp; tzd->ops->get_trend = of_thermal_get_trend; + tzd->ops->set_emul_temp = of_thermal_set_emul_temp; mutex_unlock(&tzd->lock); return tzd; @@ -520,6 +543,7 @@ void thermal_zone_of_sensor_unregister(struct device *dev, mutex_lock(&tzd->lock); tzd->ops->get_temp = NULL; tzd->ops->get_trend = NULL; + tzd->ops->set_emul_temp = NULL; tz->ops = NULL; tz->sensor_data = NULL; diff --git a/include/linux/thermal.h b/include/linux/thermal.h index b8d91ef..99be7fc 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -297,10 +297,13 @@ struct thermal_genl_event { * * Optional: * @get_trend: a pointer to a function that reads the sensor temperature trend. + * @set_emul_temp: a pointer to a function that sets sensor emulated + * temperature. */ struct thermal_zone_of_device_ops { int (*get_temp)(void *, long *); int (*get_trend)(void *, long *); + int (*set_emul_temp)(void *, unsigned long); }; /** -- 2.0.0.rc2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/