From patchwork Mon Oct 28 10:12:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 13853245 Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9FFDA1D0E38 for ; Mon, 28 Oct 2024 10:12:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730110348; cv=none; b=OyD+RcGU6qBaesyQ7s4QNlorCDJqaXvLGud6RES+UI+/3QkHcNIV7baz6T4KCsoIk90E3hNufwAyg1/N+f1OnpNgrtIXr/7C3lKMG1jj4BYMwgYXQXp82B0x4zjgei17Z7S2J8DPvyO22+WopgBOaFZgJmQvE6eIeL/g1R2Crh4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730110348; c=relaxed/simple; bh=E5IKpWlBrs6BrNxKGj8gL69lGAFGxkNE1Vi/39M/35Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fUKndPGCYV6RNUG4aeIKfMlC7Jw39YbbOdTFheCcI5pTz3UAJu/glYqT36yyDkwEKvApiZDr3OMrRiVLHDYxk/Teyjf4+vVMjmh+fdhAXNRiT5AliRKASx3unJSlsSwaYIc+WtyRjNQo2cN9p4bqKUPbTlW9hTEPgUwYrWPtfts= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=Y59vsHYe; arc=none smtp.client-ip=209.85.222.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Y59vsHYe" Received: by mail-qk1-f179.google.com with SMTP id af79cd13be357-7b154f71885so399029385a.0 for ; Mon, 28 Oct 2024 03:12:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1730110345; x=1730715145; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=XRIQcTwMhYqGctEPu/xoF4uEWBP35j2ZdxAtYHSbb2E=; b=Y59vsHYecOLkSWgZLMMjGcvS6rtWiYWPwkWp/UtBM2/+2/K1eeS7nRhcpxJ5FBqxLU fJNqw4hGZuJRDiCoNfOour4uOP6iYVMluRQy2rnZUXXE8DQOnC0M7LfmgFP1GR+g0DNO pgq9Rktkud2RsBaYUNC33C1O1tnkVbWZZbZP0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730110345; x=1730715145; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XRIQcTwMhYqGctEPu/xoF4uEWBP35j2ZdxAtYHSbb2E=; b=otNXsBd4nbPXBv/V2DTTi7+D74Z3olj+lTqnyiIgcQ41IHseyc2cB3JaShgr8dKnSB Ddx5NLYTKNRT4f+XXc96S40z2Lae6L0lcTMbyRLSGwVIcG26nsc2ZMWtpyGdCfBmLUAo mBNcS3jiExu00C7paZ603+z3lrlDMeemLI4Ez1MgnoavQjfGBV16xn7XoB2tmmZQ+UXj 95Y3HcHhkyMP71IL7HGpCWGbTaJzfsTjUGqKGkUH2QtJg61xlW3WRXAwztZQ212trcUr QxsYwkAPXjHbhX9HjQnEoMbJFMk+ZsWqHqwjNk0Y4pYC1V4mtihaPXVScxjRM1anGpdw zUGQ== X-Forwarded-Encrypted: i=1; AJvYcCWGORsAYQaX42Ppls4w3pQVk1rZ53QKz5MzvqPc84ZfSNEiQOoToOMP/Vn5/B/+A6GgjRCHGbtpeuUmgQ==@vger.kernel.org X-Gm-Message-State: AOJu0YzJvBVPEohs7RBWExY+jkr5i7rcNuZHkbggYHf9/9jnA7RUMozN Eaa0CEOI9FH1hbfl3XLzWECesysA31mU32sI+MvzqUuX0kEIlaR+6eQSOqkmHQ== X-Google-Smtp-Source: AGHT+IHsZfrL95wV+H91XB+R0gfoIc0eDU5H8YGXxr3YjqWTDf3Oef34MoOXLotCH0ugOLZSOTidVw== X-Received: by 2002:a05:620a:2482:b0:7a9:d14f:2374 with SMTP id af79cd13be357-7b193f3e043mr1206071685a.44.1730110345653; Mon, 28 Oct 2024 03:12:25 -0700 (PDT) Received: from denia.c.googlers.com (189.216.85.34.bc.googleusercontent.com. [34.85.216.189]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7b18d279126sm305483385a.9.2024.10.28.03.12.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Oct 2024 03:12:24 -0700 (PDT) From: Ricardo Ribalda Date: Mon, 28 Oct 2024 10:12:21 +0000 Subject: [PATCH v2 1/5] iio: hid-sensors: Add proximity and attention IDs Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241028-hpd-v2-1-18f6e79154d7@chromium.org> References: <20241028-hpd-v2-0-18f6e79154d7@chromium.org> In-Reply-To: <20241028-hpd-v2-0-18f6e79154d7@chromium.org> To: Jiri Kosina , Benjamin Tissoires , Jonathan Cameron , Srinivas Pandruvada , Lars-Peter Clausen Cc: Harvey Yang , linux-input@vger.kernel.org, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.13.0 The HID Usage Table at https://usb.org/sites/default/files/hut1_5.pdf reserves: - 0x4b2 for Human Proximity Range Distance between a human and the computer. Default unit of measure is meters; https://www.usb.org/sites/default/files/hutrr39b_0.pdf - 0x4bd for Human Attention Detected Human-Presence sensors detect the presence of humans in the sensor’s field-of-view using diverse and evolving technologies. Some presence sensors are implemented with low resolution video cameras, which can additionally track a subject’s attention (i.e. if the user is ‘looking’ at the system with the integrated sensor). A Human-Presence sensor, providing a Host with the user’s attention state, allows the Host to optimize its behavior. For example, to brighten/dim the system display, based on the user’s attention to the system (potentially prolonging battery life). Default unit is true/false; https://www.usb.org/sites/default/files/hutrr107-humanpresenceattention_1.pdf Signed-off-by: Ricardo Ribalda --- include/linux/hid-sensor-ids.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/linux/hid-sensor-ids.h b/include/linux/hid-sensor-ids.h index 6730ee900ee1..8a03d9696b1c 100644 --- a/include/linux/hid-sensor-ids.h +++ b/include/linux/hid-sensor-ids.h @@ -30,6 +30,8 @@ #define HID_USAGE_SENSOR_PROX 0x200011 #define HID_USAGE_SENSOR_DATA_PRESENCE 0x2004b0 #define HID_USAGE_SENSOR_HUMAN_PRESENCE 0x2004b1 +#define HID_USAGE_SENSOR_HUMAN_PROXIMITY 0x2004b2 +#define HID_USAGE_SENSOR_HUMAN_ATTENTION 0x2004bd /* Pressure (200031) */ #define HID_USAGE_SENSOR_PRESSURE 0x200031 From patchwork Mon Oct 28 10:12:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 13853246 Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EA9FF1D2F76 for ; Mon, 28 Oct 2024 10:12:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730110350; cv=none; b=GgqOTZ26iea7DtiQsVMc8DLuGxGFYbbvCRHy8JMpcp9ouvDCBTKqtLQz5id4h/nk/Zi9DqN+TNZ2zL8JGz0YKirMm0A9svUngUKMkRuNQIW1cbJprMfHqF2+6tcQ4oJAfQA65aXFC6bYDktEaM0vU1DpqlIeHPvAa31znw96BK8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730110350; c=relaxed/simple; bh=NTUbVMYf2x+7q0/8Barwlk+9iZKYWLsfR/svD0SOK6M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MjiXhlCJYXReqtzx2EcKNJ4qjCqyfsWPEwVzja7/8UJXvtZ7XfRKZPzvYJ/l6sYfsS6Muml7rpd0KRuJcxH8WSebWBcfB+eoN01ZBBKzXU2XObvhLm7xTsvg/zflT23EbhWOLRWCJqi3qvHEKYGvd/+hsnZXEFJevUabfuU98EU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=d3oHDZMt; arc=none smtp.client-ip=209.85.222.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="d3oHDZMt" Received: by mail-qk1-f182.google.com with SMTP id af79cd13be357-7b153047b29so273869185a.3 for ; Mon, 28 Oct 2024 03:12:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1730110348; x=1730715148; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=gQttLL6CFS2JGt87dEF+H1Jt5OZPaXEa5P0U/qvO3f8=; b=d3oHDZMtR18DuCbqysVGh6pi6eeljQ3JK6Yz2PfKryIKssvbyVizk60igQBz6e8yM6 17T5GLtrlJUjQFl5kuhwV2LZks0X0GJzL2RumsNmGypwYTx51+jrHdi4mj+acaSSqqYa 5JLeen0kjS3O9ot4+miMlPaofp/x+xu5dD/l0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730110348; x=1730715148; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gQttLL6CFS2JGt87dEF+H1Jt5OZPaXEa5P0U/qvO3f8=; b=qGFsyiYze0oI1IrSnerqg+PpFHfelCo6NzNk04wdgKblHQ0Z8t+J0y+QOVzd+oVOWN oNooTggSFIzftHvqO7MhbZ/+BYOtao8jYA914E6djS1oTjeEO2FMw2RkYx1L9cKOwX3x wl7VOdVt7siwYfYxcrHnmtOb9YNilXEW1rFHZMNGrv2Fq0NwXuggL0nhA4ZC25ATtlwW HD58p0CqYvE1U6tTGSW7gMKm+oOR3/+BGngfuRF3+M+bLmr3z9C9opJCbRnOgp1pLBDY 1EgDISISZiZIA+FyzhFsK1asuLHxAT65o5Gn9zN/kptAe8Ajn8sqUOX21WNE/E1AEYI0 12QQ== X-Forwarded-Encrypted: i=1; AJvYcCW8SBQy0ctWN+cUqBr3JgAzxx0a+tX0gbsAu4gFn1aeHPLBhLpQkOhKZPEf0WhbYgbaId+sQ6SwY02t3Q==@vger.kernel.org X-Gm-Message-State: AOJu0YyHHFBSWOH+FGwZoDbxSNWzrFf0EHqoI0FtY8hCcOPegMi8u6nm iij39GjVaA26UXTY2CtuaXBaK1Qh+lX0s8njmGjyOtUsgFrFw7QWq5o88Ah9jw== X-Google-Smtp-Source: AGHT+IE7gju3lR9oh1XlvsgIv53d3OKuEjmakLCZimRscmiZdz5oon55ZQwCRr1XRbsUh4kcj4mSzg== X-Received: by 2002:a05:620a:2413:b0:7b1:558e:97b0 with SMTP id af79cd13be357-7b193f75ca1mr1105568885a.66.1730110347886; Mon, 28 Oct 2024 03:12:27 -0700 (PDT) Received: from denia.c.googlers.com (189.216.85.34.bc.googleusercontent.com. [34.85.216.189]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7b18d279126sm305483385a.9.2024.10.28.03.12.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Oct 2024 03:12:26 -0700 (PDT) From: Ricardo Ribalda Date: Mon, 28 Oct 2024 10:12:22 +0000 Subject: [PATCH v2 2/5] iio: hid-sensors-prox: Factor-in hid_sensor_push_data Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241028-hpd-v2-2-18f6e79154d7@chromium.org> References: <20241028-hpd-v2-0-18f6e79154d7@chromium.org> In-Reply-To: <20241028-hpd-v2-0-18f6e79154d7@chromium.org> To: Jiri Kosina , Benjamin Tissoires , Jonathan Cameron , Srinivas Pandruvada , Lars-Peter Clausen Cc: Harvey Yang , linux-input@vger.kernel.org, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.13.0 The function is only called from one place and it is a one-liner. Signed-off-by: Ricardo Ribalda --- drivers/iio/light/hid-sensor-prox.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/iio/light/hid-sensor-prox.c b/drivers/iio/light/hid-sensor-prox.c index 26c481d2998c..d38564fe22df 100644 --- a/drivers/iio/light/hid-sensor-prox.c +++ b/drivers/iio/light/hid-sensor-prox.c @@ -153,14 +153,6 @@ static const struct iio_info prox_info = { .write_raw = &prox_write_raw, }; -/* Function to push data to buffer */ -static void hid_sensor_push_data(struct iio_dev *indio_dev, const void *data, - int len) -{ - dev_dbg(&indio_dev->dev, "hid_sensor_push_data\n"); - iio_push_to_buffers(indio_dev, data); -} - /* Callback handler to send event after all samples are received and captured */ static int prox_proc_event(struct hid_sensor_hub_device *hsdev, unsigned usage_id, @@ -170,10 +162,10 @@ static int prox_proc_event(struct hid_sensor_hub_device *hsdev, struct prox_state *prox_state = iio_priv(indio_dev); dev_dbg(&indio_dev->dev, "prox_proc_event\n"); - if (atomic_read(&prox_state->common_attributes.data_ready)) - hid_sensor_push_data(indio_dev, - &prox_state->human_presence, - sizeof(prox_state->human_presence)); + if (atomic_read(&prox_state->common_attributes.data_ready)) { + dev_dbg(&indio_dev->dev, "hid_sensor_push_data\n"); + iio_push_to_buffers(indio_dev, &prox_state->human_presence); + } return 0; } From patchwork Mon Oct 28 10:12:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 13853247 Received: from mail-ot1-f45.google.com (mail-ot1-f45.google.com [209.85.210.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0B5F21D47B0 for ; Mon, 28 Oct 2024 10:12:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730110353; cv=none; b=FavIvCs4jdeagchk9RAhudeKtt3NRz1Bcpj6jiKW99uIlsugINLZwjF8c4NheFJ6SNoR/NWNp1uJnU6elsvgYmnqCOuXaQ6dF8OQXf30ry4wWrqyjyTBBw+SqDuFQBVTvHoR07iLZVgcPQ3XA/nTMHWKZLCwzA58mLyX8D/JK7s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730110353; c=relaxed/simple; bh=4bCSwXGldVFEtUT5qrvYVydkbPDWuToQV+lF2z5ko1I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nJ7bIexFL9qbZ1ALMGUZasNH5DB5jrG9zOZwMF6J9JTHgGmIi7JuVZF0zYY7ABh2vKDy+Q2zLrjMs/h1HsgVulqhYLbw/w3L0+K7TRa7IZ4cvXwMSvId9wAzPkbfrRNYDtL+u3OYoBDoKe0tsJNV1JOBbPSipESLtnQ4HtiaVDY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=c7gFfzld; arc=none smtp.client-ip=209.85.210.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="c7gFfzld" Received: by mail-ot1-f45.google.com with SMTP id 46e09a7af769-7181eb9ad46so2524531a34.1 for ; Mon, 28 Oct 2024 03:12:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1730110350; x=1730715150; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=9/Nw+Z2C8++SkotXhnvxy5oczDl/NlKLGO4AgXeyxps=; b=c7gFfzldP44+pIcn7kWVc/GEBmRlzRW9K7L7u0J8Izx5y8VPQppRx3YkLhEzlAEcvJ 1SMGbxEuDOTw5mdgWWSSx1I3YRYMcM76gu8QZgVpEfPJcgfhFFAVo9AE/D16N4fgTTxk /ynUpCAbBxzHDrGyhTpmBiLM/GVCA7VGsOiiI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730110350; x=1730715150; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9/Nw+Z2C8++SkotXhnvxy5oczDl/NlKLGO4AgXeyxps=; b=iPeTAP1dpzBqePrh8l+nuURYhT1J5baayhFjbo1E1eksFialX8FfC2qt1h8N8SNpza R1/Mqymo9y36fCxKbzpIESnMPJodgg1LRAY3fwlBH8yKnQcEctkdG87PNNH34Le2zBgn QcPig2hBLz8JzV58DiuVCqMgtz9ZfauosJMYk3tNkiBIdKjIMwpKL8ASabC5xnZZsfzb NR1RAxqGPYC/Wg3HIre25HplXm2SopRf/KNqT9PBpqH7g6cKiXC+Um3KjeHMWIUH6Shx +urirtxK0SvwTh59EvaPxmRcduwnSJsUoWJjcrML0nDVKvPnzA3rqYIEd+ngc74rWLYU UAFw== X-Forwarded-Encrypted: i=1; AJvYcCWWbCT3xI+JkHp+M6zfW0SzU+W/n2Ut2woNS/lDRPiWZ9clWR2SKPGuFYHNGQMxN+OgJm9JWLtEQVFE4w==@vger.kernel.org X-Gm-Message-State: AOJu0Yxs791V2ITD43YVBwf6HE188pfbokdfQyQEdgptVYV+lFUMQgT6 BtKDL7MrvCdWfAoa+fdhsuQkDTEqrGL1Z+crxBV94xyoq1Z2QjjF0957Hjj5xQ== X-Google-Smtp-Source: AGHT+IHU7X7YnOpDH71s5rrRZNp8zyVeEUWpYp93iX9QSZPr5jCTuWTJHx74iwaLdzUD4h7eRmC4bA== X-Received: by 2002:a05:6358:57a2:b0:1bc:7c89:6018 with SMTP id e5c5f4694b2df-1c3f9e6315emr78856255d.9.1730110350005; Mon, 28 Oct 2024 03:12:30 -0700 (PDT) Received: from denia.c.googlers.com (189.216.85.34.bc.googleusercontent.com. [34.85.216.189]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7b18d279126sm305483385a.9.2024.10.28.03.12.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Oct 2024 03:12:28 -0700 (PDT) From: Ricardo Ribalda Date: Mon, 28 Oct 2024 10:12:23 +0000 Subject: [PATCH v2 3/5] iio: Add channel type for attention Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241028-hpd-v2-3-18f6e79154d7@chromium.org> References: <20241028-hpd-v2-0-18f6e79154d7@chromium.org> In-Reply-To: <20241028-hpd-v2-0-18f6e79154d7@chromium.org> To: Jiri Kosina , Benjamin Tissoires , Jonathan Cameron , Srinivas Pandruvada , Lars-Peter Clausen Cc: Harvey Yang , linux-input@vger.kernel.org, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.13.0 Add a new channel type representing if the user's attention state to the the system. This usually means if the user is looking at the screen or not. Signed-off-by: Ricardo Ribalda --- Documentation/ABI/testing/sysfs-bus-iio | 7 +++++++ drivers/iio/industrialio-core.c | 1 + include/uapi/linux/iio/types.h | 1 + tools/iio/iio_event_monitor.c | 2 ++ 4 files changed, 11 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio index 89943c2d54e8..d5a2f93bd051 100644 --- a/Documentation/ABI/testing/sysfs-bus-iio +++ b/Documentation/ABI/testing/sysfs-bus-iio @@ -2339,3 +2339,10 @@ KernelVersion: 6.10 Contact: linux-iio@vger.kernel.org Description: The value of current sense resistor in Ohms. + +What: /sys/.../iio:deviceX/in_attention_raw +KernelVersion: 6.13 +Contact: linux-iio@vger.kernel.org +Description: + Boolean value representing the user's attention to the system. + This usually means if the user is looking at the screen or not. diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index 6a6568d4a2cb..bdfb51275b68 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -95,6 +95,7 @@ static const char * const iio_chan_type_name_spec[] = { [IIO_DELTA_VELOCITY] = "deltavelocity", [IIO_COLORTEMP] = "colortemp", [IIO_CHROMATICITY] = "chromaticity", + [IIO_ATTENTION] = "attention", }; static const char * const iio_modifier_names[] = { diff --git a/include/uapi/linux/iio/types.h b/include/uapi/linux/iio/types.h index f2e0b2d50e6b..12886d4465e4 100644 --- a/include/uapi/linux/iio/types.h +++ b/include/uapi/linux/iio/types.h @@ -51,6 +51,7 @@ enum iio_chan_type { IIO_DELTA_VELOCITY, IIO_COLORTEMP, IIO_CHROMATICITY, + IIO_ATTENTION, }; enum iio_modifier { diff --git a/tools/iio/iio_event_monitor.c b/tools/iio/iio_event_monitor.c index 8073c9e4fe46..ed9a677f1028 100644 --- a/tools/iio/iio_event_monitor.c +++ b/tools/iio/iio_event_monitor.c @@ -63,6 +63,7 @@ static const char * const iio_chan_type_name_spec[] = { [IIO_DELTA_VELOCITY] = "deltavelocity", [IIO_COLORTEMP] = "colortemp", [IIO_CHROMATICITY] = "chromaticity", + [IIO_ATTENTION] = "attention", }; static const char * const iio_ev_type_text[] = { @@ -183,6 +184,7 @@ static bool event_is_known(struct iio_event_data *event) case IIO_DELTA_VELOCITY: case IIO_COLORTEMP: case IIO_CHROMATICITY: + case IIO_ATTENTION: break; default: return false; From patchwork Mon Oct 28 10:12:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 13853248 Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BD9281D54D6 for ; Mon, 28 Oct 2024 10:12:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730110353; cv=none; b=fZBdI//Em/YGy+WGrQh/PL/kKFHJdbIN80jW1JdCYQ7c+dO3f6qBRvoUPUW9Z7JAmXmemD6R+IPq39NzzbJ3WWjyIN/G1KUneZgdXrrouo1BOk1UnYfYe76vgq1bYSbwf+TSfx0+M3P3oxvWRO3ne82PjuXeBF32Z1VaaR45+lk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730110353; c=relaxed/simple; bh=CUtvkf+t59QX4prslptAVYmO9B9yIfrnRI6r3hKSoAg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cWzop1HEnR+BltqMvhvi+EIpngwuyzG1xVeFdD4D2RoplzokmUhnAJPKgUiaM9qKa3jGtnO0L3lcP+mHWiz91i1tss7pQZ2YoXmYgWMctN5RYRQjh2xDLFtCPBVX8BpBHWFs8hUVG7Rx/+HNHzknH7J5OSW0eJ3dRai/ymdVgNI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=jJtFebvL; arc=none smtp.client-ip=209.85.222.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="jJtFebvL" Received: by mail-qk1-f171.google.com with SMTP id af79cd13be357-7b1488fde46so327173285a.2 for ; Mon, 28 Oct 2024 03:12:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1730110351; x=1730715151; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=adgmJOhHcaFkex36EFAe1BXPWl8Ng3rQHGIFjAA8UGA=; b=jJtFebvLLF0asJft9hXpQ6nSjl4dbDOVD1SFuDbo4Vk7qc2g4nwkH28z2JhA6sC/pQ t9hKRWlYJaAg08UYdWNkMmRSJT2GeeqWj52GIowJN86J79jdYHohkERrAYAJG9nBwIC8 nJ8E9fipb28kE8RilyhQRekd7L4aooWnhR42Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730110351; x=1730715151; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=adgmJOhHcaFkex36EFAe1BXPWl8Ng3rQHGIFjAA8UGA=; b=Ww1rg5dPMZ7eLVS+3VO0V4r2jmbtiteqatO7DhjazwWe9GCNPBzZJXn7CEq24Pe39k 5588N+mtxr6q7BhHuN2FpRPGoc8nLKzuTrCpa2N++681WCkEW1CUxN3x6L7l7q6AtqDT obtYAc9iWalomL1PFtQBOBMGmg33X+ytn8OZ2jjvllX+++on69oliYM2N29SmIhXqIq9 us1iXVoaLV9RkcU7jqsEp8zPsjNucUbjFw6cMiNj2GyJtzKCYV7xSeNbZ2OiyrsoX3Eg iKDuFZFz0XaZ/vIrVxJybEQjMC51Yf03I0vjwz44by13KwDa4oA59zwrmfLeR+ZkbDDY v41Q== X-Forwarded-Encrypted: i=1; AJvYcCXFNhlYgkjQwFAMv3s0oDkN2ZZVRPzO0682d/wxQhLU6x9j/LgH6OHEsibvW/Dunh0UGVWXnt6w/Yb0PA==@vger.kernel.org X-Gm-Message-State: AOJu0YzzqVq5/fJGtjZbY/CLumNqPQQVDX4r1DLzeXkN6KYonwcj5nXc DkELS+b1yMPEipv56FLkuy12kDobZ2OaZ3X0nGwzVrxPgVBue3u4JRBvUte4FA== X-Google-Smtp-Source: AGHT+IEvNa1/u021S1k1XErRR5bkD/RvaCZqUFQg81oUJKijF5rpiMRdpeKxB40Z9diyYoooWSmBCw== X-Received: by 2002:a05:620a:2801:b0:7af:cf73:d70 with SMTP id af79cd13be357-7b193f0b137mr1497661185a.39.1730110350726; Mon, 28 Oct 2024 03:12:30 -0700 (PDT) Received: from denia.c.googlers.com (189.216.85.34.bc.googleusercontent.com. [34.85.216.189]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7b18d279126sm305483385a.9.2024.10.28.03.12.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Oct 2024 03:12:30 -0700 (PDT) From: Ricardo Ribalda Date: Mon, 28 Oct 2024 10:12:24 +0000 Subject: [PATCH v2 4/5] iio: hid-sensors-prox: Make proximity channel indexed Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241028-hpd-v2-4-18f6e79154d7@chromium.org> References: <20241028-hpd-v2-0-18f6e79154d7@chromium.org> In-Reply-To: <20241028-hpd-v2-0-18f6e79154d7@chromium.org> To: Jiri Kosina , Benjamin Tissoires , Jonathan Cameron , Srinivas Pandruvada , Lars-Peter Clausen Cc: Harvey Yang , linux-input@vger.kernel.org, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.13.0 We are going to introduce more proximity channels. Make proximity a indexed channel now, in a simple patch, so the change can be easily bisected if there are any issues. Signed-off-by: Ricardo Ribalda --- drivers/iio/light/hid-sensor-prox.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/iio/light/hid-sensor-prox.c b/drivers/iio/light/hid-sensor-prox.c index d38564fe22df..0f12a8a83790 100644 --- a/drivers/iio/light/hid-sensor-prox.c +++ b/drivers/iio/light/hid-sensor-prox.c @@ -40,6 +40,7 @@ static const struct iio_chan_spec prox_channels[] = { BIT(IIO_CHAN_INFO_SAMP_FREQ) | BIT(IIO_CHAN_INFO_HYSTERESIS), .scan_index = CHANNEL_SCAN_INDEX_PRESENCE, + .indexed = true, } }; From patchwork Mon Oct 28 10:12:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 13853249 Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 14C621D5CC5 for ; Mon, 28 Oct 2024 10:12:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730110355; cv=none; b=HIzdSWbb0BI40yeWGX1riwfy8s0KKKq6Bb8Urerb5CxK5AebUoHYNnqJlfFssu5eJW2b8KoWDUuLJfUe6F/19vsRZZPVdTHtPRseQQ90jBKYFHNR2owgwDMZtdxP8fsev2Egq/usliaDWn8p1yva4dORMQV76z/RYbxv3hWI7Ps= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730110355; c=relaxed/simple; bh=NtTBjVPCukfy6qXUeEEjV+EaTIUrNtFyd0P2oXLNfLs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HE8cCiCJ8XDinYk943UgDxVZ9XJj+9SSecI2PzvFVz1r8/WMBS4FB5cG91DcxISguqodcB0NzX3eUviAnY40BcsWvMBayiEZHfBaKOtirqg1IgvIGdiOO0DQcFKr4z5TIDp2iadtPzdGxQNMYHL9J/7D8abgch7ckWS76S5UzO0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=RQMHDrLQ; arc=none smtp.client-ip=209.85.222.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="RQMHDrLQ" Received: by mail-qk1-f173.google.com with SMTP id af79cd13be357-7b152a23e9aso324259285a.0 for ; Mon, 28 Oct 2024 03:12:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1730110352; x=1730715152; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=gYaDRZS7eycBx6nL/lvgNDYBfbu64MJ0DrtpIvQKBd8=; b=RQMHDrLQhO+d7sIe6iDrjc/BIR7bmFWgo+kwrzecqQ+FVGDDICatqCFL1feH8GYYLx cFxF77rFVzWQuCl65nUsHeIt+JXtmPVtS4lB2ADYBXvJSyEyX9/zgT3yiRaJovGsh3aa qHImNSge40P5mtGGMRC/COdvXRFQ2WZdSDdbQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730110352; x=1730715152; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gYaDRZS7eycBx6nL/lvgNDYBfbu64MJ0DrtpIvQKBd8=; b=QqhGMDOtua+5hoot4wOPHkwkaGulvCH8Ng71PxaazA8YEDpyDo/MXvOs1u3x8OYAsd 5AlYHe0T+A7c+Uid1Dws893by7V4+p48TmAG3utDLkUR0vW8xRDee1a91fS+GqESJfwo Mz+p+j8CQbBXm0bV3X7V0XxkxzLgQqQJh8XhC6iWMzyaF0OY9IRymvn34LfxJIzV55EL wmTg5/lfdDAtEUN6zcez1PKQZ9QuoV4g9TakBu1U6didlZBkCyI0MVwGqjt5KZePMIzm hSL1QGKhy/O6uLaRkVN6niXrh4Za69y8gZJ63ytvNajpXDRZn0VEqQ9/u959xkswaq3f aYXg== X-Forwarded-Encrypted: i=1; AJvYcCXTl2RnYQPbcAzzcEcGZHbWTEbXjz1kbRXibUEqN+sJC7bfMi4Wc+ZjmC9kg/fpBBwuoF7qXTK9athl9w==@vger.kernel.org X-Gm-Message-State: AOJu0Ywxe03FAcPpNOAKmeSCRBvt8Uik3mK4ocH9yjo7cq284vXzP1He oby3YNReMcxMieaI7cSvFJSW276uLUdvANnbAVzHlU0GudojtVlkifsAhNajhQ== X-Google-Smtp-Source: AGHT+IHNdqRNeM3bvpX5KZk4zUyVm0jdxPChZwsuv/lKavdxSlXErx5iCwCVNzmhBEo3DVOxqjQN6g== X-Received: by 2002:a05:620a:2904:b0:7a9:a991:f6d7 with SMTP id af79cd13be357-7b193f4dcb4mr1057542585a.48.1730110352056; Mon, 28 Oct 2024 03:12:32 -0700 (PDT) Received: from denia.c.googlers.com (189.216.85.34.bc.googleusercontent.com. [34.85.216.189]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7b18d279126sm305483385a.9.2024.10.28.03.12.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Oct 2024 03:12:31 -0700 (PDT) From: Ricardo Ribalda Date: Mon, 28 Oct 2024 10:12:25 +0000 Subject: [PATCH v2 5/5] iio: hid-sensor-prox: Add support for more channels Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241028-hpd-v2-5-18f6e79154d7@chromium.org> References: <20241028-hpd-v2-0-18f6e79154d7@chromium.org> In-Reply-To: <20241028-hpd-v2-0-18f6e79154d7@chromium.org> To: Jiri Kosina , Benjamin Tissoires , Jonathan Cameron , Srinivas Pandruvada , Lars-Peter Clausen Cc: Harvey Yang , linux-input@vger.kernel.org, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.13.0 Egis620 supports 3 channels: presense, proximity and attention. Modify the driver so it can read those channels as well. Signed-off-by: Ricardo Ribalda --- drivers/iio/light/hid-sensor-prox.c | 171 ++++++++++++++++++++---------------- 1 file changed, 95 insertions(+), 76 deletions(-) diff --git a/drivers/iio/light/hid-sensor-prox.c b/drivers/iio/light/hid-sensor-prox.c index 0f12a8a83790..e6f81d40a492 100644 --- a/drivers/iio/light/hid-sensor-prox.c +++ b/drivers/iio/light/hid-sensor-prox.c @@ -13,16 +13,31 @@ #include #include "../common/hid-sensors/hid-sensor-trigger.h" -#define CHANNEL_SCAN_INDEX_PRESENCE 0 +static const u32 prox_usage_ids[] = { + HID_USAGE_SENSOR_HUMAN_PRESENCE, + HID_USAGE_SENSOR_HUMAN_PROXIMITY, + HID_USAGE_SENSOR_HUMAN_ATTENTION, +}; +#define MAX_CHANNELS ARRAY_SIZE(prox_usage_ids) + +enum { + HID_HUMAN_PRESENCE, + HID_HUMAN_PROXIMITY, + HID_HUMAN_ATTENTION, +}; struct prox_state { struct hid_sensor_hub_callbacks callbacks; struct hid_sensor_common common_attributes; - struct hid_sensor_hub_attribute_info prox_attr; - u32 human_presence; + struct hid_sensor_hub_attribute_info prox_attr[MAX_CHANNELS]; + struct iio_chan_spec channels[MAX_CHANNELS]; + u32 channel2usage[MAX_CHANNELS]; + u32 human_presence[MAX_CHANNELS]; int scale_pre_decml; int scale_post_decml; int scale_precision; + unsigned long scan_mask[2]; // One entry plus one terminator. + int num_channels; }; static const u32 prox_sensitivity_addresses[] = { @@ -30,18 +45,23 @@ static const u32 prox_sensitivity_addresses[] = { HID_USAGE_SENSOR_DATA_PRESENCE, }; -/* Channel definitions */ -static const struct iio_chan_spec prox_channels[] = { - { - .type = IIO_PROXIMITY, - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), - .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) | - BIT(IIO_CHAN_INFO_SCALE) | - BIT(IIO_CHAN_INFO_SAMP_FREQ) | - BIT(IIO_CHAN_INFO_HYSTERESIS), - .scan_index = CHANNEL_SCAN_INDEX_PRESENCE, - .indexed = true, +#define PROX_CHANNEL(_type, _indexed, _channel) \ + {\ + .type = _type,\ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),\ + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |\ + BIT(IIO_CHAN_INFO_SCALE) |\ + BIT(IIO_CHAN_INFO_SAMP_FREQ) |\ + BIT(IIO_CHAN_INFO_HYSTERESIS),\ + .indexed = _indexed,\ + .channel = _channel,\ } + +/* Channel definitions (same order as prox_usage_ids) */ +static const struct iio_chan_spec prox_channels[] = { + PROX_CHANNEL(IIO_PROXIMITY, true, HID_HUMAN_PRESENCE), + PROX_CHANNEL(IIO_PROXIMITY, true, HID_HUMAN_PROXIMITY), + PROX_CHANNEL(IIO_ATTENTION, false, 0), }; /* Adjust channel real bits based on report descriptor */ @@ -63,7 +83,7 @@ static int prox_read_raw(struct iio_dev *indio_dev, { struct prox_state *prox_state = iio_priv(indio_dev); struct hid_sensor_hub_device *hsdev; - int report_id = -1; + int report_id; u32 address; int ret_type; s32 min; @@ -72,29 +92,20 @@ static int prox_read_raw(struct iio_dev *indio_dev, *val2 = 0; switch (mask) { case IIO_CHAN_INFO_RAW: - switch (chan->scan_index) { - case CHANNEL_SCAN_INDEX_PRESENCE: - report_id = prox_state->prox_attr.report_id; - min = prox_state->prox_attr.logical_minimum; - address = HID_USAGE_SENSOR_HUMAN_PRESENCE; - hsdev = prox_state->common_attributes.hsdev; - break; - default: - report_id = -1; - break; - } - if (report_id >= 0) { - hid_sensor_power_state(&prox_state->common_attributes, - true); - *val = sensor_hub_input_attr_get_raw_value( - hsdev, hsdev->usage, address, report_id, - SENSOR_HUB_SYNC, min < 0); - hid_sensor_power_state(&prox_state->common_attributes, - false); - } else { - *val = 0; + if (chan->scan_index >= prox_state->num_channels) return -EINVAL; - } + address = prox_state->channel2usage[chan->scan_index]; + report_id = prox_state->prox_attr[chan->scan_index].report_id; + hsdev = prox_state->common_attributes.hsdev; + min = prox_state->prox_attr[chan->scan_index].logical_minimum; + hid_sensor_power_state(&prox_state->common_attributes, true); + *val = sensor_hub_input_attr_get_raw_value(hsdev, + hsdev->usage, + address, + report_id, + SENSOR_HUB_SYNC, + min < 0); + hid_sensor_power_state(&prox_state->common_attributes, false); ret_type = IIO_VAL_INT; break; case IIO_CHAN_INFO_SCALE: @@ -104,7 +115,7 @@ static int prox_read_raw(struct iio_dev *indio_dev, break; case IIO_CHAN_INFO_OFFSET: *val = hid_sensor_convert_exponent( - prox_state->prox_attr.unit_expo); + prox_state->prox_attr[chan->scan_index].unit_expo); ret_type = IIO_VAL_INT; break; case IIO_CHAN_INFO_SAMP_FREQ: @@ -179,48 +190,63 @@ static int prox_capture_sample(struct hid_sensor_hub_device *hsdev, { struct iio_dev *indio_dev = platform_get_drvdata(priv); struct prox_state *prox_state = iio_priv(indio_dev); - int ret = -EINVAL; - - switch (usage_id) { - case HID_USAGE_SENSOR_HUMAN_PRESENCE: - switch (raw_len) { - case 1: - prox_state->human_presence = *(u8 *)raw_data; - return 0; - case 4: - prox_state->human_presence = *(u32 *)raw_data; - return 0; - default: + int chan; + + for (chan = 0; chan < prox_state->num_channels; chan++) + if (prox_state->channel2usage[chan] == usage_id) break; - } - break; + if (chan == prox_state->num_channels) + return -EINVAL; + + switch (raw_len) { + case 1: + prox_state->human_presence[chan] = *(u8 *)raw_data; + return 0; + case 4: + prox_state->human_presence[chan] = *(u32 *)raw_data; + return 0; } - return ret; + return -EINVAL; } /* Parse report which is specific to an usage id*/ static int prox_parse_report(struct platform_device *pdev, struct hid_sensor_hub_device *hsdev, - struct iio_chan_spec *channels, - unsigned usage_id, struct prox_state *st) { + struct iio_chan_spec *channels = st->channels; + int index = 0; int ret; + int i; + + for (i = 0; i < MAX_CHANNELS; i++) { + u32 usage_id = prox_usage_ids[i]; + + ret = sensor_hub_input_get_attribute_info(hsdev, + HID_INPUT_REPORT, + hsdev->usage, + usage_id, + &st->prox_attr[index]); + if (ret < 0) + continue; + st->channel2usage[index] = usage_id; + st->scan_mask[0] |= BIT(index); + channels[index] = prox_channels[i]; + channels[index].scan_index = index; + prox_adjust_channel_bit_mask(channels, index, + st->prox_attr[index].size); + dev_dbg(&pdev->dev, "prox %x:%x\n", st->prox_attr[index].index, + st->prox_attr[index].report_id); + index++; + } - ret = sensor_hub_input_get_attribute_info(hsdev, HID_INPUT_REPORT, - usage_id, - HID_USAGE_SENSOR_HUMAN_PRESENCE, - &st->prox_attr); - if (ret < 0) + if (!index) return ret; - prox_adjust_channel_bit_mask(channels, CHANNEL_SCAN_INDEX_PRESENCE, - st->prox_attr.size); - dev_dbg(&pdev->dev, "prox %x:%x\n", st->prox_attr.index, - st->prox_attr.report_id); + st->num_channels = index; - return ret; + return 0; } /* Function to initialize the processing for usage id */ @@ -251,22 +277,15 @@ static int hid_prox_probe(struct platform_device *pdev) return ret; } - indio_dev->channels = devm_kmemdup(&pdev->dev, prox_channels, - sizeof(prox_channels), GFP_KERNEL); - if (!indio_dev->channels) { - dev_err(&pdev->dev, "failed to duplicate channels\n"); - return -ENOMEM; - } - - ret = prox_parse_report(pdev, hsdev, - (struct iio_chan_spec *)indio_dev->channels, - hsdev->usage, prox_state); + ret = prox_parse_report(pdev, hsdev, prox_state); if (ret) { dev_err(&pdev->dev, "failed to setup attributes\n"); return ret; } - indio_dev->num_channels = ARRAY_SIZE(prox_channels); + indio_dev->num_channels = prox_state->num_channels; + indio_dev->channels = prox_state->channels; + indio_dev->available_scan_masks = prox_state->scan_mask; indio_dev->info = &prox_info; indio_dev->name = name; indio_dev->modes = INDIO_DIRECT_MODE;