Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp3038002ybz; Mon, 27 Apr 2020 08:55:04 -0700 (PDT) X-Google-Smtp-Source: APiQypL4Dbu11aHginbVJca81gQwlvwouj0lJLV2B2OTPUeOahgK8/bnpLCopdKMYCKKL7MIzyMi X-Received: by 2002:aa7:c2ce:: with SMTP id m14mr20242944edp.305.1588002903945; Mon, 27 Apr 2020 08:55:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588002903; cv=none; d=google.com; s=arc-20160816; b=aes1tT17EzMhTloRce0LmNgh0WRBBNfTRUM15yiHO5D3lYvuHs57R4nI1pvG3LDLfd Lw/R75W1iypH1Vey//y/ryrodxa+RUxhDu0+n9lhweQIUP1OPK6kJqAQxGVEvoHeQeWI I0mA1HoGT71R5Avnx3F6kiDfSBPYVeIU09Gr0nBt7mTVDQnP2TfzUVpL6VjiSfLCSMXJ 7aj9U2hohyajNY8FrYmtDGFeKcIwgIfZNZS/pg5D7Oh2Lpxb7Lc5sqEhUuWUd4Zl+UW7 27lMsfjB7nNsV+TNU32cJARIRP9kEEg0k1MQqWMJozyqv38JInihLLPBmFB7m8AojrKr Cang== 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=nwpdNW/FPAgeOHqy4G+r3r1WvyVbwDRXzUpzGHkuL3I=; b=FHIu8vX4P/yNjOiUzYIqmJw4O7STq9oQ8t0DMFocfY3bSxyk8xSsvp3aQGEoHA7TeX bJ52cUO2HEvpf1K51qGowocIRfB8UZdBlYIbg5AleBCywY9LhGThimflRs4CllWzqWPo Adud4u3mSh1dTcQfXrHHyMS/4M1TTEPK0jR1TvPxTe+G4IW1+oBdwojxDWcXSoowg31j htzNh/DzmNvPvCdip/D6cfED2l/kWHAo0cBBMbfLFK+E4ZcfWRnL8RDtrC+X78sGO4F+ NPEe2ipQw+bpKOksh7+VYbhdzFYFWAtK5xmruhQivNJAI3gnSasHarR2wnNdmOjmwrm+ 6kyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=B7GyR+5F; 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 nm1si8881317ejb.451.2020.04.27.08.54.38; Mon, 27 Apr 2020 08:55:03 -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=B7GyR+5F; 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 S1728511AbgD0PvI (ORCPT + 99 others); Mon, 27 Apr 2020 11:51:08 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:36941 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728499AbgD0PvG (ORCPT ); Mon, 27 Apr 2020 11:51:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588002664; 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=nwpdNW/FPAgeOHqy4G+r3r1WvyVbwDRXzUpzGHkuL3I=; b=B7GyR+5FSJzXfW3spMpbCqVxgoRVjjc1NyOiASdbi5aKU4LubhOvnx3sQ0pNlv5iKXCCZe KdTx+ZSqLCXchu9i4mGH2MaezjgB2FbVKyNoL+U2NS4Eo3IGBR0hjmqQWI/3p/xYBKZNTj QU5Nb0vwwjWIfvNtoAzR+Ldt5QRoies= 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-18-2xTMlrUUO1-PBe8vEDwX0Q-1; Mon, 27 Apr 2020 11:51:00 -0400 X-MC-Unique: 2xTMlrUUO1-PBe8vEDwX0Q-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DEFB7800685; Mon, 27 Apr 2020 15:50:58 +0000 (UTC) Received: from x1.localdomain.com (ovpn-114-38.ams2.redhat.com [10.36.114.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A43260BEC; Mon, 27 Apr 2020 15:50:56 +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 v2 7/8] iio: light: cm32181: Add support for parsing CPM0 and CPM1 ACPI tables Date: Mon, 27 Apr 2020 17:50:36 +0200 Message-Id: <20200427155037.218390-7-hdegoede@redhat.com> In-Reply-To: <20200427155037.218390-1-hdegoede@redhat.com> References: <20200427155037.218390-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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 | 99 +++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/drivers/iio/light/cm32181.c b/drivers/iio/light/cm32181.c index 92f99cbb5cc1..04ba636415c9 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 }; @@ -76,6 +86,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 i2c_client *client, char *obj_nam= e, + 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(&client->dev); + if (!handle) + return -ENODEV; + + status =3D acpi_evaluate_object(handle, obj_name, NULL, &buffer); + if (ACPI_FAILURE(status)) { + dev_err(&client->dev, "object %s not found\n", obj_name); + return -ENODEV; + } + + cpm =3D buffer.pointer; + if (cpm->package.count > count) + dev_warn(&client->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 i2c_client *client =3D cm32181->client; + int i, count; + + count =3D cm32181_acpi_get_cpm(client, "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(client, "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. @@ -121,6 +217,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(&client->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, --=20 2.26.0