Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp4395498ybz; Tue, 28 Apr 2020 10:32:28 -0700 (PDT) X-Google-Smtp-Source: APiQypJBZ4xNjvqit5GjjKh5txCunKV7GUDPX1kdLe68uW5H+Bqt21j+df4eEABS47aEkunVljgP X-Received: by 2002:a50:e841:: with SMTP id k1mr24590283edn.245.1588095147869; Tue, 28 Apr 2020 10:32:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588095147; cv=none; d=google.com; s=arc-20160816; b=t4V2KxWvuU3QClgffOPZEGmAwrjL4M22AWq2G0pHbgzERkLcK0lePqGW5XHFrgdkEU O9cBsPAFFB+8sBYQXFQby81B3CYX9UnhrbMQ95qj6EamaDo2JzqoRcecq4WP/L8npdaa +4Ed0j+WH4qkp7mVIb+GTA8UiSoeNQrE3P1Kx2CCVaB5OSODzn6MEZmNLZFB3I+eqvpr RZTsW9IL8RidE3IfuLM2D8V9RT/Xz6wh1XGTSFwpgE9ThmfhQUpzy9NUYphozA+E+Jko dQz9IN6o7xL1rk8my5sDysSkXO1qb2JxlZWfHRcglv0jGU/bHXAMoKCjTr4bn9GvnBm1 3DXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=0MFeTCwZptPfYXG0YvnE+SOjIUCfWe/f2t0TSJABKZc=; b=kHXUY7GKkWGzYUskfTY1dXO768CSnknNOup0Pz6hNxqd5tQ0Y5iUuwkuikOZMA9I8X S1EeArXJk0u/WOz5pJSHAvaGUIL1WWLcifzwg85Oyzq21SDmIi5RxzLEZTT5YOq//9dh sKsO1nL0t++UN7EMYiHDvNIo79JhlSl4oFL4ekNEiWqaaXOsg9SnJC6JwdmHKAwmSRAK d5T3yL//wBnhG2IJFxqf96YpsgpAhvgjf1Ql/C1y4AwC+OO02ek5OSK5JPPxq8NtfJXt BKo6Pnh49RbLIDxGCt6tuQdXx+wltDfRI04oi3S/2ksK0Gmy98dy0tIxWHdqQCHo+Ohq BT4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=CPp4i0HH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x16si2037088eds.487.2020.04.28.10.32.04; Tue, 28 Apr 2020 10:32:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=CPp4i0HH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728657AbgD1RaL (ORCPT + 99 others); Tue, 28 Apr 2020 13:30:11 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:40249 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728619AbgD1RaJ (ORCPT ); Tue, 28 Apr 2020 13:30:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588095007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0MFeTCwZptPfYXG0YvnE+SOjIUCfWe/f2t0TSJABKZc=; b=CPp4i0HH0r6LjlQW9B+iIuqFt3yAY6HFk7tdSam6GoPsseP4Yhv7+7sWL6TbHF69uKrwAM MCi5x6UKBFq/cDiLjvJiU8W33bt7i2C94oqLsheuDJgqHhSYfG/FgzDgvZUPaE9mYhih45 sCvXHJozVerolezpZ9Bhv1GpsFCsp1U= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-319-aOPIsIe1NO6fGEHG-mBABw-1; Tue, 28 Apr 2020 13:30:02 -0400 X-MC-Unique: aOPIsIe1NO6fGEHG-mBABw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A937F1937FDE; Tue, 28 Apr 2020 17:30:00 +0000 (UTC) Received: from x1.localdomain.com (ovpn-114-62.ams2.redhat.com [10.36.114.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1BF155C1D4; Tue, 28 Apr 2020 17:29:57 +0000 (UTC) From: Hans de Goede To: "Rafael J . Wysocki" , Len Brown , Darren Hart , Andy Shevchenko , Jonathan Cameron Cc: Hans de Goede , linux-acpi@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , linux-iio@vger.kernel.org, Andy Shevchenko Subject: [PATCH v3 10/11] iio: light: cm32181: Add support for parsing CPM0 and CPM1 ACPI tables Date: Tue, 28 Apr 2020 19:29:22 +0200 Message-Id: <20200428172923.567806-10-hdegoede@redhat.com> In-Reply-To: <20200428172923.567806-1-hdegoede@redhat.com> References: <20200428172923.567806-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Content-Transfer-Encoding: quoted-printable Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On ACPI based systems the CPLM3218 ACPI device node describing the CM3218[1] sensor typically will have some extra tables with register init values for initializing the sensor and calibration info. This is based on a newer version of cm32181.c, with a copyright of: * Copyright (C) 2014 Capella Microsystems Inc. * Author: Kevin Tsai * * This program is free software; you can redistribute it and/or modify i= t * under the terms of the GNU General Public License version 2, as publis= hed * by the Free Software Foundation. Which is floating around on the net in various places, but the changes from this newer version never made it upstream. This was tested on the following models: Acer Switch 10 SW5-012 (CM32181) Asus T100TA (CM3218), Asus T100CHI (CM3218) and HP X2 10-n000nd (CM32181)= . Reviewed-by: Andy Shevchenko Signed-off-by: Hans de Goede --- Changes in v2: - Factor out the parsing into a separate helper function --- drivers/iio/light/cm32181.c | 101 ++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/drivers/iio/light/cm32181.c b/drivers/iio/light/cm32181.c index cae2264e4336..d8b128286527 100644 --- a/drivers/iio/light/cm32181.c +++ b/drivers/iio/light/cm32181.c @@ -4,6 +4,7 @@ * Author: Kevin Tsai */ =20 +#include #include #include #include @@ -53,6 +54,15 @@ =20 #define SMBUS_ALERT_RESPONSE_ADDRESS 0x0c =20 +/* CPM0 Index 0: device-id (3218 or 32181), 1: Unknown, 2: init_regs_bit= map */ +#define CPM0_REGS_BITMAP 2 +#define CPM0_HEADER_SIZE 3 + +/* CPM1 Index 0: lux_per_bit, 1: calibscale, 2: resolution (100000) */ +#define CPM1_LUX_PER_BIT 0 +#define CPM1_CALIBSCALE 1 +#define CPM1_SIZE 3 + /* CM3218 Family */ static const int cm3218_als_it_bits[] =3D { 0, 1, 2, 3 }; static const int cm3218_als_it_values[] =3D { 100000, 200000, 400000, 80= 0000 }; @@ -65,6 +75,7 @@ static const int cm32181_als_it_values[] =3D { =20 struct cm32181_chip { struct i2c_client *client; + struct device *dev; struct mutex lock; u16 conf_regs[CM32181_CONF_REG_NUM]; unsigned long init_regs_bitmap; @@ -76,6 +87,92 @@ struct cm32181_chip { const int *als_it_values; }; =20 +static int cm32181_read_als_it(struct cm32181_chip *cm32181, int *val2); + +#ifdef CONFIG_ACPI +/** + * cm32181_acpi_get_cpm() - Get CPM object from ACPI + * @client pointer of struct i2c_client. + * @obj_name pointer of ACPI object name. + * @count maximum size of return array. + * @vals pointer of array for return elements. + * + * Convert ACPI CPM table to array. + * + * Return: -ENODEV for fail. Otherwise is number of elements. + */ +static int cm32181_acpi_get_cpm(struct device *dev, char *obj_name, + u64 *values, int count) +{ + struct acpi_buffer buffer =3D { ACPI_ALLOCATE_BUFFER, NULL }; + union acpi_object *cpm, *elem; + acpi_handle handle; + acpi_status status; + int i; + + handle =3D ACPI_HANDLE(dev); + if (!handle) + return -ENODEV; + + status =3D acpi_evaluate_object(handle, obj_name, NULL, &buffer); + if (ACPI_FAILURE(status)) { + dev_err(dev, "object %s not found\n", obj_name); + return -ENODEV; + } + + cpm =3D buffer.pointer; + if (cpm->package.count > count) + dev_warn(dev, "%s table contains %d values, only using first %d values= \n", + obj_name, cpm->package.count, count); + + count =3D min_t(int, cpm->package.count, count); + for (i =3D 0; i < count; i++) { + elem =3D &(cpm->package.elements[i]); + values[i] =3D elem->integer.value; + } + + kfree(buffer.pointer); + + return count; +} + +static void cm32181_acpi_parse_cpm_tables(struct cm32181_chip *cm32181) +{ + u64 vals[CPM0_HEADER_SIZE + CM32181_CONF_REG_NUM]; + struct device *dev =3D cm32181->dev; + int i, count; + + count =3D cm32181_acpi_get_cpm(dev, "CPM0", vals, ARRAY_SIZE(vals)); + if (count <=3D CPM0_HEADER_SIZE) + return; + + count -=3D CPM0_HEADER_SIZE; + + cm32181->init_regs_bitmap =3D vals[CPM0_REGS_BITMAP]; + cm32181->init_regs_bitmap &=3D GENMASK(count - 1, 0); + for_each_set_bit(i, &cm32181->init_regs_bitmap, count) + cm32181->conf_regs[i] =3D vals[CPM0_HEADER_SIZE + i]; + + count =3D cm32181_acpi_get_cpm(dev, "CPM1", vals, ARRAY_SIZE(vals)); + if (count !=3D CPM1_SIZE) + return; + + cm32181->lux_per_bit =3D vals[CPM1_LUX_PER_BIT]; + + /* Check for uncalibrated devices */ + if (vals[CPM1_CALIBSCALE] =3D=3D CM32181_CALIBSCALE_DEFAULT) + return; + + cm32181->calibscale =3D vals[CPM1_CALIBSCALE]; + /* CPM1 lux_per_bit is for the current it value */ + cm32181_read_als_it(cm32181, &cm32181->lux_per_bit_base_it); +} +#else +static void cm32181_acpi_parse_cpm_tables(struct cm32181_chip *cm32181) +{ +} +#endif /* CONFIG_ACPI */ + /** * cm32181_reg_init() - Initialize CM32181 registers * @cm32181: pointer of struct cm32181. @@ -119,6 +216,9 @@ static int cm32181_reg_init(struct cm32181_chip *cm32= 181) cm32181->lux_per_bit =3D CM32181_LUX_PER_BIT; cm32181->lux_per_bit_base_it =3D CM32181_LUX_PER_BIT_BASE_IT; =20 + if (ACPI_HANDLE(cm32181->dev)) + cm32181_acpi_parse_cpm_tables(cm32181); + /* Initialize registers*/ for_each_set_bit(i, &cm32181->init_regs_bitmap, CM32181_CONF_REG_NUM) { ret =3D i2c_smbus_write_word_data(client, i, @@ -361,6 +461,7 @@ static int cm32181_probe(struct i2c_client *client) =20 cm32181 =3D iio_priv(indio_dev); cm32181->client =3D client; + cm32181->dev =3D dev; =20 mutex_init(&cm32181->lock); indio_dev->dev.parent =3D dev; --=20 2.26.0