From: eduardo.valentin@ti•com (Eduardo Valentin)
To: linux-arm-kernel@lists•infradead.org
Subject: [v2,07/14] thermal: mvebu: Rename kirkwood definitions to mvebu
Date: Thu, 11 Apr 2013 12:43:43 -0400 [thread overview]
Message-ID: <5166E83F.4050800@ti.com> (raw)
In-Reply-To: <1363991114-4225-8-git-send-email-ezequiel.garcia@free-electrons.com>
On 22-03-2013 18:25, Ezequiel Garcia wrote:
> This definitions will be also valid for other SoC,
> such as Armada 370 and Armada XP. Therefore we rename them as 'mvebu'.
>
I believe it is appropriated to squash this one to your patch v2 02/14.
> Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons•com>
>
> ---
> drivers/thermal/mvebu_thermal.c | 16 ++++++++--------
> 1 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/thermal/mvebu_thermal.c b/drivers/thermal/mvebu_thermal.c
> index 0c9344d..39ddded 100644
> --- a/drivers/thermal/mvebu_thermal.c
> +++ b/drivers/thermal/mvebu_thermal.c
> @@ -22,10 +22,10 @@
> #include <linux/platform_device.h>
> #include <linux/thermal.h>
>
> -#define KIRKWOOD_THERMAL_VALID_OFFSET 9
> -#define KIRKWOOD_THERMAL_VALID_MASK 0x1
> -#define KIRKWOOD_THERMAL_TEMP_OFFSET 10
> -#define KIRKWOOD_THERMAL_TEMP_MASK 0x1FF
> +#define MVEBU_THERMAL_VALID_OFFSET 9
> +#define MVEBU_THERMAL_VALID_MASK 0x1
> +#define MVEBU_THERMAL_TEMP_OFFSET 10
> +#define MVEBU_THERMAL_TEMP_MASK 0x1FF
>
> /* Marvell EBU Thermal Sensor Dev Structure */
> struct mvebu_thermal_priv {
> @@ -41,8 +41,8 @@ static int mvebu_get_temp(struct thermal_zone_device *thermal,
> reg = readl_relaxed(priv->sensor);
>
> /* Valid check */
> - if (!((reg >> KIRKWOOD_THERMAL_VALID_OFFSET) &
> - KIRKWOOD_THERMAL_VALID_MASK)) {
> + if (!((reg >> MVEBU_THERMAL_VALID_OFFSET) &
> + MVEBU_THERMAL_VALID_MASK)) {
> dev_err(&thermal->device,
> "Temperature sensor reading not valid\n");
> return -EIO;
> @@ -53,8 +53,8 @@ static int mvebu_get_temp(struct thermal_zone_device *thermal,
> * documentation the formula for this is:
> * Celsius = (322-reg)/1.3625
> */
> - reg = (reg >> KIRKWOOD_THERMAL_TEMP_OFFSET) &
> - KIRKWOOD_THERMAL_TEMP_MASK;
> + reg = (reg >> MVEBU_THERMAL_TEMP_OFFSET) &
> + MVEBU_THERMAL_TEMP_MASK;
> *temp = ((3220000000UL - (10000000UL * reg)) / 13625);
>
> return 0;
>
next prev parent reply other threads:[~2013-04-11 16:43 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-22 22:25 [PATCH v2 00/14] Marvell EBU thermal sensor consolidation Ezequiel Garcia
2013-03-22 22:25 ` [PATCH v2 01/14] thermal: Rename driver 'kirkwood' -> 'mvebu' Ezequiel Garcia
2013-04-11 16:00 ` [v2,01/14] " Eduardo Valentin
2013-04-11 16:31 ` Ezequiel Garcia
2013-04-11 18:47 ` Eduardo Valentin
2013-04-11 18:57 ` Eduardo Valentin
2013-04-11 19:09 ` Ezequiel Garcia
2013-04-11 16:21 ` Eduardo Valentin
2013-03-22 22:25 ` [PATCH v2 02/14] thermal: mvebu: Rename symbols " Ezequiel Garcia
2013-04-11 16:18 ` [v2,02/14] " Eduardo Valentin
2013-03-22 22:25 ` [PATCH v2 03/14] thermal: mvebu: Move MODULE_DEVICE_TABLE upwards Ezequiel Garcia
2013-04-11 16:25 ` [v2,03/14] " Eduardo Valentin
2013-03-22 22:25 ` [PATCH v2 04/14] thermal: mvebu: Remove unneeded variable initialization Ezequiel Garcia
2013-04-11 16:29 ` [v2, " Eduardo Valentin
2013-04-11 18:54 ` Eduardo Valentin
2013-03-22 22:25 ` [PATCH v2 05/14] thermal: mvebu: Convert to devm_ioremap_resource() Ezequiel Garcia
2013-04-11 16:35 ` [v2,05/14] " Eduardo Valentin
2013-04-11 18:55 ` Eduardo Valentin
2013-03-22 22:25 ` [PATCH v2 06/14] thermal: mvebu: Fix license declaration Ezequiel Garcia
2013-04-11 16:40 ` [v2,06/14] " Eduardo Valentin
2013-04-11 18:55 ` Eduardo Valentin
2013-03-22 22:25 ` [PATCH v2 07/14] thermal: mvebu: Rename kirkwood definitions to mvebu Ezequiel Garcia
2013-04-11 16:43 ` Eduardo Valentin [this message]
2013-03-22 22:25 ` [PATCH v2 08/14] thermal: mvebu: Add infrastructure to support more multiple SoC variants Ezequiel Garcia
2013-03-22 22:25 ` [PATCH v2 09/14] thermal: mvebu: Add support for Armada XP thermal sensor Ezequiel Garcia
2013-03-22 22:25 ` [PATCH v2 10/14] thermal: mvebu: Add support for Armada 370 " Ezequiel Garcia
2013-03-22 22:25 ` [PATCH v2 11/14] thermal: mvebu: Add support for Marvell Dove SoC family Ezequiel Garcia
2013-03-23 11:26 ` Sebastian Hesselbarth
2013-03-24 0:16 ` Ezequiel Garcia
2013-03-25 9:34 ` Ezequiel Garcia
2013-03-22 22:25 ` [PATCH v2 12/14] ARM: mvebu: Add thermal support to Armada XP device tree Ezequiel Garcia
2013-03-22 22:25 ` [PATCH v2 13/14] ARM: mvebu: Add thermal support to Armada 370 " Ezequiel Garcia
2013-03-23 14:18 ` Sergei Shtylyov
2013-03-23 14:20 ` Sergei Shtylyov
2013-03-23 14:25 ` Sergei Shtylyov
2013-03-24 0:22 ` Ezequiel Garcia
2013-03-22 22:25 ` [PATCH v2 14/14] ARM: configs: Update mvebu, dove and kirkwood defconfigs for thermal Ezequiel Garcia
2013-03-23 18:16 ` [PATCH v2 00/14] Marvell EBU thermal sensor consolidation Jason Cooper
2013-03-23 18:28 ` Sebastian Hesselbarth
2013-03-23 18:31 ` Jason Cooper
2013-03-23 18:38 ` Sebastian Hesselbarth
2013-03-25 9:30 ` Andrew Lunn
2013-03-25 10:45 ` Ezequiel Garcia
2013-03-25 12:23 ` Sebastian Hesselbarth
2013-03-25 12:39 ` Ezequiel Garcia
2013-03-25 13:58 ` Sebastian Hesselbarth
2013-03-25 16:29 ` Jason Gunthorpe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5166E83F.4050800@ti.com \
--to=eduardo.valentin@ti$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox