From patchwork Thu Jun 28 18:11:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Ranostay X-Patchwork-Id: 10494621 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3BE9A601BE for ; Thu, 28 Jun 2018 18:11:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4329A2A7CF for ; Thu, 28 Jun 2018 18:11:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 410562A7BD; Thu, 28 Jun 2018 18:11:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1484C2A7D1 for ; Thu, 28 Jun 2018 18:11:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965982AbeF1SLH (ORCPT ); Thu, 28 Jun 2018 14:11:07 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:39745 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965570AbeF1SLG (ORCPT ); Thu, 28 Jun 2018 14:11:06 -0400 Received: by mail-pg0-f65.google.com with SMTP id n2-v6so2810222pgq.6 for ; Thu, 28 Jun 2018 11:11:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=from:to:cc:subject:date:message-id; bh=m7ZEGp7RZ+sIaYi8AHQ08DlwkMiVeSnn/HYIzpCZ31M=; b=WBNe/nps+rdlV0QfWhVDfoolNy41RJ6geFMfmjhKth6FSROSn7RF1UhAFKRNjjkqY7 /3LYv+UxATNM1MTqzDgk4f6XNVaoPheA3ZnUnOKcuTfm9O4BczBEnl0q7sGWciJP4biV EYkKIGNIzX+vzcgigx3d1nWbiTU6dQayktTuo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=m7ZEGp7RZ+sIaYi8AHQ08DlwkMiVeSnn/HYIzpCZ31M=; b=pDPgwoTPLVmsO/EtKzygxecZ6Bw1KKv/lxGVb3NCNdtSdJ/SguaudL58Zy3dqdu6UO kUo8zHowDqRoXayDLqQVYoQyEGb1bV4rvJEeCZUjZTp5spgD3o5Qc/Ud1rruvos/iiwH O3KxgPElsvw4EMhygfRxC3q3+4a7Q19whhGl7dXFbnNZdR2Vv1IMnkcFLFc3AzTXmdKk AJ/Pml5J7saskOTfGH7jiGu9uel8x1Az7TwfmS4yt4HK64Iu+/shG5gnMfMjOKeriSu/ tZPnUdraB01PYoZCzAgGFh26oNN7SLM3cVGjTGRYdFaiNHjZVJDv4IWsD+ZWT/eYtOf3 FTtA== X-Gm-Message-State: APt69E1jhcVjINJj+VGZeT5Exn+OxnDWmh1Ui4tVDhp8IIO9iaxPGdhg sHKg3AhgHxNNwoleScmw/4cDtg== X-Google-Smtp-Source: ADUXVKK9GP+Xv0TMYtW36cMoKBvjaAEuIyX/8WVzn4wUGVVsHOMBgyXRWCxy5AcCtLktrwzfJNrG1A== X-Received: by 2002:a65:42c3:: with SMTP id l3-v6mr9306651pgp.398.1530209466338; Thu, 28 Jun 2018 11:11:06 -0700 (PDT) Received: from niteshade.hsd1.or.comcast.net ([2601:1c2:5000:8d45::3f0e]) by smtp.gmail.com with ESMTPSA id l15-v6sm13739938pfg.88.2018.06.28.11.11.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 11:11:05 -0700 (PDT) From: Matt Ranostay To: linux-media@vger.kernel.org Cc: Matt Ranostay , linux-hwmon@vger.kernel.org Subject: [PATCH v4] media: video-i2c: add hwmon support for amg88xx Date: Thu, 28 Jun 2018 11:11:04 -0700 Message-Id: <20180628181104.16177-1-matt.ranostay@konsulko.com> X-Mailer: git-send-email 2.17.1 Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP AMG88xx has an on-board thermistor which is used for more accurate processing of its temperature readings from the 8x8 thermopile array Cc: linux-hwmon@vger.kernel.org Signed-off-by: Matt Ranostay Acked-by: Guenter Roeck Acked-by: Sakari Ailus --- drivers/media/i2c/Kconfig | 1 + drivers/media/i2c/video-i2c.c | 81 +++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) Changes from v1: * remove unneeded include statement * removed evil &NULL dereference if hwmon isn't enabled * return PTR_ERR instead of boolean IS_ERR from amg88xx_hwmon_init() * use error code returned from hwmon_init() to display dev_warn Changes from v2: * change #ifdef check to use cleaner IS_ENABLED(CONFIG_HWMON) * document why the temperature value isn't sign extended more concisely Changes from v3: * add 'imply HWMON' to avoid build race conditions diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig index 341452fe98df..799a0278b690 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -1002,6 +1002,7 @@ config VIDEO_I2C tristate "I2C transport video support" depends on VIDEO_V4L2 && I2C select VIDEOBUF2_VMALLOC + imply HWMON ---help--- Enable the I2C transport video support which supports the following: diff --git a/drivers/media/i2c/video-i2c.c b/drivers/media/i2c/video-i2c.c index 0b347cc19aa5..7dc9338502e5 100644 --- a/drivers/media/i2c/video-i2c.c +++ b/drivers/media/i2c/video-i2c.c @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -77,6 +78,9 @@ struct video_i2c_chip { /* xfer function */ int (*xfer)(struct video_i2c_data *data, char *buf); + + /* hwmon init function */ + int (*hwmon_init)(struct video_i2c_data *data); }; static int amg88xx_xfer(struct video_i2c_data *data, char *buf) @@ -101,6 +105,74 @@ static int amg88xx_xfer(struct video_i2c_data *data, char *buf) return (ret == 2) ? 0 : -EIO; } +#if IS_ENABLED(CONFIG_HWMON) + +static const u32 amg88xx_temp_config[] = { + HWMON_T_INPUT, + 0 +}; + +static const struct hwmon_channel_info amg88xx_temp = { + .type = hwmon_temp, + .config = amg88xx_temp_config, +}; + +static const struct hwmon_channel_info *amg88xx_info[] = { + &amg88xx_temp, + NULL +}; + +static umode_t amg88xx_is_visible(const void *drvdata, + enum hwmon_sensor_types type, + u32 attr, int channel) +{ + return 0444; +} + +static int amg88xx_read(struct device *dev, enum hwmon_sensor_types type, + u32 attr, int channel, long *val) +{ + struct video_i2c_data *data = dev_get_drvdata(dev); + struct i2c_client *client = data->client; + int tmp = i2c_smbus_read_word_data(client, 0x0e); + + if (tmp < 0) + return tmp; + + /* + * Check for sign bit, this isn't a two's complement value but an + * absolute temperature that needs to be inverted in the case of being + * negative. + */ + if (tmp & BIT(11)) + tmp = -(tmp & 0x7ff); + + *val = (tmp * 625) / 10; + + return 0; +} + +static const struct hwmon_ops amg88xx_hwmon_ops = { + .is_visible = amg88xx_is_visible, + .read = amg88xx_read, +}; + +static const struct hwmon_chip_info amg88xx_chip_info = { + .ops = &amg88xx_hwmon_ops, + .info = amg88xx_info, +}; + +static int amg88xx_hwmon_init(struct video_i2c_data *data) +{ + void *hwmon = devm_hwmon_device_register_with_info(&data->client->dev, + "amg88xx", data, &amg88xx_chip_info, NULL); + + return PTR_ERR(hwmon); +} +#else +#define amg88xx_hwmon_init NULL +#endif + #define AMG88XX 0 static const struct video_i2c_chip video_i2c_chip[] = { @@ -111,6 +183,7 @@ static const struct video_i2c_chip video_i2c_chip[] = { .buffer_size = 128, .bpp = 16, .xfer = &amg88xx_xfer, + .hwmon_init = amg88xx_hwmon_init, }, }; @@ -505,6 +578,14 @@ static int video_i2c_probe(struct i2c_client *client, video_set_drvdata(&data->vdev, data); i2c_set_clientdata(client, data); + if (data->chip->hwmon_init) { + ret = data->chip->hwmon_init(data); + if (ret < 0) { + dev_warn(&client->dev, + "failed to register hwmon device\n"); + } + } + ret = video_register_device(&data->vdev, VFL_TYPE_GRABBER, -1); if (ret < 0) goto error_unregister_device;