From patchwork Thu Oct 24 13:29:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 13849029 Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) (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 09AC61E201D for ; Thu, 24 Oct 2024 13:29:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729776550; cv=none; b=d3yZY2hbfFEBIIyX8s9OvrXbAr6fc3rgK1PBp5wPnHUzYsN7hFucG0aaPgD+4t/6xP5WRl2hhlS110MIV1UMzFySyJjE6k2lMaNxIMUIUuw9lym/V/l6WIz1LNAcN0bnl1uqY8sGbKA0xaynk//2jmeRlymO/V1xWMRppXTaV5o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729776550; c=relaxed/simple; bh=bFwyN+jEa2XvW5Q/VvqMtLqk9XXyDIBC0cTMCtFmW8I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rh43kAg6A+wNTMZLpboiyvv1Wi8SxkD6/C/tzF/zs40SKEMmknfiYgbb925unfSTuAc59nMkpshx7ViuU51Amt1TpQ2Yz+lbij6/TzxtoWTH9tfvpHHMSuna3sfau9QreCt6k7E4Rarz6v+LQX1elV7vlc5dRtnDXxoEijOeilc= 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=C2L0ccF8; arc=none smtp.client-ip=209.85.222.169 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="C2L0ccF8" Received: by mail-qk1-f169.google.com with SMTP id af79cd13be357-7ac83a98e5eso86417285a.0 for ; Thu, 24 Oct 2024 06:29:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1729776548; x=1730381348; 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=zzgB0Dmc7SbGSRkZ42QPW9VmAklZSsdEpabG3evbtX4=; b=C2L0ccF89lMnCzO/lOABh9M2irnWtNlV01UNnDvwggDQWRVMbTuXginOlkd9tXDFYz jLADbOLpGsn4fEvcPOw1zPUFuRE5fwGkevfhGowXHdiCUXopCz9YPhdBDprM9Oj1j9CL NHSySKqLQdu8900ssc+GlEZ8O8iOJjy5PdHwE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729776548; x=1730381348; 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=zzgB0Dmc7SbGSRkZ42QPW9VmAklZSsdEpabG3evbtX4=; b=ozfn9Sx8+acwrKEmFfiYDx+6m/wrSaNbAu06CmTZ++Vy13zw4F9ExeqVFc/dXU9Ocb L5KToOqn7VeztH4tG5LfLS+Pqrnm0R7Tr7M1IqWcOR0dQ9Y+mcL9qvo5HgplgfMBfLiV vhoJofvjEsMMONCS67k3QDBLdL0YLLDGHGO+N9q1KKoAZSx9uMH+85nu1H+az2hpVppp S4d6bWDYcXM19BaXMuQtYe4M+zg3CEvdjZ092FxFI4eW/RiCkj2DGnvyDTYnYvuEoavm yHpdy6ploRUFeuiIcRBgZERG1Met9PTpOVfW8uwpCmffnj7ZWMcj0eYqGAF3XR/OTVu4 CcMw== X-Forwarded-Encrypted: i=1; AJvYcCUSi7cuFhdyGkjjMRjKSaTg1eqwvFyhgPA3fINgrP0naVbm0bQDCAR0DebGNRUyeoTUS5UQM1iTTBM=@vger.kernel.org X-Gm-Message-State: AOJu0YyHt6phgKjPDdCIATyE83ARWk9pPnvEBQl36n2RzLQ9j/vSt89k bpQBjb0XPeM/AaIn+jZLLLhups5VHAcFWTr/GFqlkBO/5p/eRzZEttaKhL1zow== X-Google-Smtp-Source: AGHT+IHOq1CHjjVbrTOuW87w2sexGCJD7U4FXEseprlQ/Sd8ltK1U55/s300FMFOWnd7m15YHmBXEA== X-Received: by 2002:a05:620a:4621:b0:7a9:aa9e:3a9a with SMTP id af79cd13be357-7b1865e2a18mr350813885a.18.1729776547888; Thu, 24 Oct 2024 06:29:07 -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-7b165a5d663sm484204885a.94.2024.10.24.06.29.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2024 06:29:07 -0700 (PDT) From: Ricardo Ribalda Date: Thu, 24 Oct 2024 13:29:05 +0000 Subject: [PATCH 1/3] iio: hid-sensors: Add proximity and attention IDs Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241024-hpd-v1-1-2a125882f1f8@chromium.org> References: <20241024-hpd-v1-0-2a125882f1f8@chromium.org> In-Reply-To: <20241024-hpd-v1-0-2a125882f1f8@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 - 0x4bd for Human Attention Detected 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 Thu Oct 24 13:29:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 13849030 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 DD3FF1DD9D1 for ; Thu, 24 Oct 2024 13:29:09 +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=1729776552; cv=none; b=chxvhLRC/1C5xEHIRRAwBMcbqqIw6h+6y/CL2orweEtEHuf5T5qLtOQty4uVea1zVXWYVvW8BBHEcO5+l1fmlaW5gTa29kEaeObUeT3YCV7EjhVpKEoaVm1BdhtFGRsz4AypkLdsr6ff5Cc9CNCuo/fpCWFpaptpoKFl5Xo02NY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729776552; 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=EY7+xddvjybC0+0zg3Ew78Unc0YHjU0siJz8N5pi1X1MUXK0mWn+MGm8ZmbvSftG9tt3p5zZ31EixxdgTBuD+wFKc3nLQ/CY8gBf43ebamBe+8/h2p55uA2iL14lPtwymK0bT992Edd+DFIAizaE0PAQtaNfGAbOa6C+8zmgXkw= 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=MBggSU1S; 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="MBggSU1S" Received: by mail-qk1-f182.google.com with SMTP id af79cd13be357-7b12a02596aso58582685a.2 for ; Thu, 24 Oct 2024 06:29:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1729776549; x=1730381349; 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=MBggSU1SDh8XMM99Bnet7Qijn7f47FNPTREisuC15Ta1JXf0yr0iPgFre/vdLI0/bR ynPbTIFaYR7inb6obo/2l9jjCt0Fim8vTyKAtGfbIFk4DyoL2IncraFmLagcy5keEU/j K4uNpbJPF2r+0UsEerz3yM+s/htsi25UvYp5I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729776549; x=1730381349; 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=VpZzbj56xalyWo64AXamMEYa6Cd3H3+t3oqJRoA3wNZaaboBjymkjZP8N2h6oWu65s WLHKX+CKI2/nHB7GkkNWtfwW1gH0s/xNk9hOf7VacylKtDeb2emmyfyeBrpkqvMdhZOz gy+uz2HL5YlP1ic0xE8lCaHCtufX9ViJdn15F9NxwiEm5jd3mvizJ0D7ZcbkKaVZpNiD LXEcfWyggeO9Z5qn9lM7GwIdO2uiGy06v02pMYqAHpvbFu1xRPLYujJD9bgAdlVIH8tp eLAPIUqWhGWWPy3fnPemMC7vnVq+4eNbTrdH8jcOsGCUxfEgKX+fQKr20O8DoL7b016Z Hu+w== X-Forwarded-Encrypted: i=1; AJvYcCVSIOE6WDsFiN9oM/6QQLHJ78lMo/QngpHHPdJJHkGCOoFd1948X9aJmzD/3ftl6v9tq/s1jLFbX1o=@vger.kernel.org X-Gm-Message-State: AOJu0YwjGFI+Qapqbkt77NqRmieePVE5vh1PbNmTm3uQ5OgMzBDMKT6h jrxJNQkwiiADWEe1g/dSL863sBZJhz0B0vGh7I2EfXu2iB123npUe6FiQ16TNQ== X-Google-Smtp-Source: AGHT+IG7U0KSHWrmCe91AVXiWEDTh9XeuV5+Nzyo+RoW/0JSWl+BTa9POmrQvviAAOmkiVGmWOnsOQ== X-Received: by 2002:a05:620a:2994:b0:7a9:cd41:9c0b with SMTP id af79cd13be357-7b186bb3431mr206876585a.17.1729776548724; Thu, 24 Oct 2024 06:29:08 -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-7b165a5d663sm484204885a.94.2024.10.24.06.29.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2024 06:29:08 -0700 (PDT) From: Ricardo Ribalda Date: Thu, 24 Oct 2024 13:29:06 +0000 Subject: [PATCH 2/3] iio: hid-sensors-prox: Factor-in hid_sensor_push_data Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241024-hpd-v1-2-2a125882f1f8@chromium.org> References: <20241024-hpd-v1-0-2a125882f1f8@chromium.org> In-Reply-To: <20241024-hpd-v1-0-2a125882f1f8@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 Thu Oct 24 13:29:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 13849031 Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) (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 0B39F1E285D for ; Thu, 24 Oct 2024 13:29:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729776553; cv=none; b=vCXqOLObdzAHNqosi2ySP2mbQ4gnae/OC5KuTOk1qWniVauQZHHcZMQENLMKE2Fd+GRMIf4njjoolYz95s9+e3iQeBWgqEelUp3SS+OdAZYIoS6T0g4giZQ0+3r0bEStpGpAqQTqzMsQEGgAFU836ZU/p8oeJRDPXQ2HWCt28ZU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729776553; c=relaxed/simple; bh=TNFGg/CYQGxNs+Ld3XxJZ5IfmtwWB2COK0LRP9AdQLs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Aa3dghWq+c2Sv+TgJFpV5/dlkaOuOYVnjlE5SBVCujHMen3Hvk0xo2WN3D3ElyeNZbONzUZI9L2zqKWRdxyaNS8IpM5E3flbrTahUWypkU6l/QWRTyBop//pXYw2q2eUYprUBcTR9qEBBN5DWsGvJ1qUwjhXwAz6RJIlg9jfEic= 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=EVJMBPte; arc=none smtp.client-ip=209.85.222.177 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="EVJMBPte" Received: by mail-qk1-f177.google.com with SMTP id af79cd13be357-7b161fa1c7bso57046085a.0 for ; Thu, 24 Oct 2024 06:29:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1729776550; x=1730381350; 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=2mADvfbNearZia5yRK0i07ANDp2oc6aBLBYcSmlyDG4=; b=EVJMBPteZafBmJap6zDFwn8Z+zsrfzDjto8H3WRlNBNkpzz2XqMSTS2ws2kdzGlgc+ e4ScBYtOzT1IhMS2UMzXS8mUH8kJQh17+MX9y3MRSMhkj5bBR+tweuQrV5MeAWEVrWx2 TI9dPpRCLjMJKDtT8H3qZ364tD9RLfze+473g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729776550; x=1730381350; 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=2mADvfbNearZia5yRK0i07ANDp2oc6aBLBYcSmlyDG4=; b=onqoGbnOGLnboFlYDCDo5oJ0m7sO+eA6VfO2g6sOPmRglMhoE4MKDp7u49meNq7yzw s0QFe5899BYt85ScBdpqMNPIC9ZY0Kj8F9fiW0Lxl5/yC1hZII5QXhDb8W88Bzr5x2Qj tyRA8jbFU32vjMm6tZDPzwDFMyNBBA5JbWizLqWvIV+akeU8GYQNwWWrlbp17ND+k0Yy gVyKgY1N/n93hzi3vHFmyELr10FI+ek9ZEMvOsnC6iACHnTEz9qRJM2JGceRs1gb0yVW oHR2k/UKaN82/CJSkOoP/YDDWbt0kOSNHCC4YymnFNMDKl9K1tndTwFnJSOYvCop4udX Laaw== X-Forwarded-Encrypted: i=1; AJvYcCVdRdpzE2aptv8vNYTJ6g3r/XrLwu9Zl6xGJcYf7lBLZM2eNLOazFk8SQatlXfOwGrWTX3XvoxsvQw=@vger.kernel.org X-Gm-Message-State: AOJu0YyTfkWEVs/8hx8T56ZtzcfphP9KH2zMiRs7iyuM7rVgBIT2QqL1 7tbPWbGQqk8QBR8iut9hCFDZJPPTGTAJBBcnHcRovVW1HppjKJVk8fnRobV7GA== X-Google-Smtp-Source: AGHT+IGLbXLa5kyweKu7WefNH+VU10qvs7wfcV2860hFBGJU+bW6CxA3VhN5gpV4uuydTUUtEpHUDQ== X-Received: by 2002:a05:620a:4720:b0:7a1:62ad:9d89 with SMTP id af79cd13be357-7b186d12a38mr205596785a.64.1729776549881; Thu, 24 Oct 2024 06:29:09 -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-7b165a5d663sm484204885a.94.2024.10.24.06.29.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2024 06:29:09 -0700 (PDT) From: Ricardo Ribalda Date: Thu, 24 Oct 2024 13:29:07 +0000 Subject: [PATCH 3/3] iio: hid-sensor-prox: Add support for more channels Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241024-hpd-v1-3-2a125882f1f8@chromium.org> References: <20241024-hpd-v1-0-2a125882f1f8@chromium.org> In-Reply-To: <20241024-hpd-v1-0-2a125882f1f8@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 | 161 ++++++++++++++++++++---------------- 1 file changed, 89 insertions(+), 72 deletions(-) diff --git a/drivers/iio/light/hid-sensor-prox.c b/drivers/iio/light/hid-sensor-prox.c index d38564fe22df..97550d0d21a9 100644 --- a/drivers/iio/light/hid-sensor-prox.c +++ b/drivers/iio/light/hid-sensor-prox.c @@ -13,16 +13,26 @@ #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_USAGE ARRAY_SIZE(prox_usage_ids) 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_USAGE]; + struct iio_chan_spec channels[MAX_USAGE]; + u32 channel2usage[MAX_USAGE]; + u32 human_presence[MAX_USAGE]; int scale_pre_decml; int scale_post_decml; int scale_precision; + unsigned long scan_mask[2]; + int num_channels; }; static const u32 prox_sensitivity_addresses[] = { @@ -30,17 +40,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, +#define PROX_CHANNEL(_indexed, _channel) \ + {\ + .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),\ + .indexed = _indexed,\ + .channel = _channel,\ } + +/* Channel definitions (same order as prox_usage_ids) */ +static const struct iio_chan_spec prox_channels[] = { + PROX_CHANNEL(false, 0), // PRESENCE + PROX_CHANNEL(true, 1), // PROXIMITY + PROX_CHANNEL(true, 2), // ATTENTION }; /* Adjust channel real bits based on report descriptor */ @@ -62,7 +78,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; @@ -71,29 +87,22 @@ 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 { + if (chan->scan_index >= prox_state->num_channels) { *val = 0; 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: @@ -103,7 +112,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: @@ -178,48 +187,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; - } + if (chan == prox_state->num_channels) + return -EINVAL; + + switch (raw_len) { + case 1: + prox_state->human_presence[chan] = *(u8 *)raw_data; + break; + case 4: + prox_state->human_presence[chan] = *(u32 *)raw_data; break; } - return ret; + return 0; } /* 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_USAGE; 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 */ @@ -250,22 +274,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;