From patchwork Fri Mar 22 22:25:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 2323231 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 771BBDFE82 for ; Fri, 22 Mar 2013 22:34:07 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UJATv-0006Gx-25; Fri, 22 Mar 2013 22:30:39 +0000 Received: from mail.free-electrons.com ([94.23.35.102]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UJAPJ-00048o-Ug for linux-arm-kernel@lists.infradead.org; Fri, 22 Mar 2013 22:25:55 +0000 Received: by mail.free-electrons.com (Postfix, from userid 106) id E19D5863; Fri, 22 Mar 2013 23:25:53 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.3.2 Received: from localhost.localdomain (20.222.3.200.ros.express.com.ar [200.3.222.20]) by mail.free-electrons.com (Postfix) with ESMTPA id 350A97DE; Fri, 22 Mar 2013 23:25:49 +0100 (CET) From: Ezequiel Garcia To: , Subject: [PATCH v2 08/14] thermal: mvebu: Add infrastructure to support more multiple SoC variants Date: Fri, 22 Mar 2013 19:25:08 -0300 Message-Id: <1363991114-4225-9-git-send-email-ezequiel.garcia@free-electrons.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1363991114-4225-1-git-send-email-ezequiel.garcia@free-electrons.com> References: <1363991114-4225-1-git-send-email-ezequiel.garcia@free-electrons.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130322_182554_259569_EC2ED57F X-CRM114-Status: GOOD ( 17.88 ) X-Spam-Score: -4.4 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -2.5 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Lior Amsalem , Thomas Petazzoni , Jason Cooper , Nobuhiro Iwamatsu , Andrew Lunn , Ezequiel Garcia , Gregory Clement , Zhang Rui , Sebastian Hesselbarth X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This commit adds the infrastructure required for mvebu thermal driver to support multiple SoC variants. In particular, we add support for an optional memory resource, and a new struct to contain the operation for each SoC variant. Signed-off-by: Ezequiel Garcia --- drivers/thermal/mvebu_thermal.c | 80 +++++++++++++++++++++++++++++++-------- 1 files changed, 64 insertions(+), 16 deletions(-) diff --git a/drivers/thermal/mvebu_thermal.c b/drivers/thermal/mvebu_thermal.c index 39ddded..a7c9b34 100644 --- a/drivers/thermal/mvebu_thermal.c +++ b/drivers/thermal/mvebu_thermal.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #define MVEBU_THERMAL_VALID_OFFSET 9 @@ -27,36 +28,56 @@ #define MVEBU_THERMAL_TEMP_OFFSET 10 #define MVEBU_THERMAL_TEMP_MASK 0x1FF +struct mvebu_thermal_ops; + /* Marvell EBU Thermal Sensor Dev Structure */ struct mvebu_thermal_priv { void __iomem *sensor; + void __iomem *control; + struct mvebu_thermal_ops *ops; +}; + +struct mvebu_thermal_ops { + /* Converts the sensor register to ajunction temperature */ + unsigned long (*sensor_temp)(struct mvebu_thermal_priv *); + + /* Initialize the sensor (optional) */ + void (*init_sensor)(struct mvebu_thermal_priv *); + + /* Test for a valid sensor value (optional) */ + bool (*is_valid)(struct mvebu_thermal_priv *); }; +static bool mvebu_is_valid(struct mvebu_thermal_priv *priv) +{ + unsigned long reg = readl_relaxed(priv->sensor); + + return (reg >> MVEBU_THERMAL_VALID_OFFSET) & + MVEBU_THERMAL_VALID_MASK; +} + +static unsigned long orion_sensor_temp(struct mvebu_thermal_priv *priv) +{ + unsigned long reg = readl_relaxed(priv->sensor); + + reg = (reg >> MVEBU_THERMAL_TEMP_OFFSET) & + MVEBU_THERMAL_TEMP_MASK; + return (3220000000UL - (10000000UL * reg)) / 13625; +} + static int mvebu_get_temp(struct thermal_zone_device *thermal, unsigned long *temp) { - unsigned long reg; struct mvebu_thermal_priv *priv = thermal->devdata; - reg = readl_relaxed(priv->sensor); - /* Valid check */ - if (!((reg >> MVEBU_THERMAL_VALID_OFFSET) & - MVEBU_THERMAL_VALID_MASK)) { + if (priv->ops->is_valid && !priv->ops->is_valid(priv)) { dev_err(&thermal->device, "Temperature sensor reading not valid\n"); return -EIO; } - /* - * Calculate temperature. According to Marvell internal - * documentation the formula for this is: - * Celsius = (322-reg)/1.3625 - */ - reg = (reg >> MVEBU_THERMAL_TEMP_OFFSET) & - MVEBU_THERMAL_TEMP_MASK; - *temp = ((3220000000UL - (10000000UL * reg)) / 13625); - + *temp = priv->ops->sensor_temp(priv); return 0; } @@ -64,18 +85,33 @@ static struct thermal_zone_device_ops ops = { .get_temp = mvebu_get_temp, }; +static const struct mvebu_thermal_ops kirkwood_ops = { + .sensor_temp = orion_sensor_temp, + .is_valid = mvebu_is_valid, +}; + static const struct of_device_id mvebu_thermal_id_table[] = { - { .compatible = "marvell,kirkwood-thermal" }, - {} + { + .compatible = "marvell,kirkwood-thermal", + .data = &kirkwood_ops, + }, + { + /* sentinel */ + }, }; MODULE_DEVICE_TABLE(of, mvebu_thermal_id_table); static int mvebu_thermal_probe(struct platform_device *pdev) { struct thermal_zone_device *thermal; + const struct of_device_id *match; struct mvebu_thermal_priv *priv; struct resource *res; + match = of_match_device(mvebu_thermal_id_table, &pdev->dev); + if (!match) + return -ENODEV; + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { dev_err(&pdev->dev, "Failed to get platform resource\n"); @@ -90,6 +126,18 @@ static int mvebu_thermal_probe(struct platform_device *pdev) if (IS_ERR(priv->sensor)) return PTR_ERR(priv->sensor); + res = platform_get_resource(pdev, IORESOURCE_MEM, 1); + if (res) { + priv->control = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(priv->control)) + return PTR_ERR(priv->control); + } + + priv->ops = (struct mvebu_thermal_ops *)match->data; + + if (priv->ops->init_sensor) + priv->ops->init_sensor(priv); + thermal = thermal_zone_device_register("mvebu_thermal", 0, 0, priv, &ops, NULL, 0, 0); if (IS_ERR(thermal)) {