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: 838542 Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) (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 F24851E2009 for ; Thu, 24 Oct 2024 13:29:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729776551; cv=none; b=Vtx1CJzakLhLKKD6QFrMfAwa0EtUED+Wj1/gumfHQDf5iHZvIsuZbbbgjsE3NBM1Tooud42nIgMXuDZPIkgMo8K+nn9hpWzlBvOYJwUmhL65DzGKU/KzZkwW/wuG7zUEQ/lfZJ7OcgaITd+REuMBbUbrq6SMTuLQwQgY2JMPV8s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729776551; c=relaxed/simple; bh=bFwyN+jEa2XvW5Q/VvqMtLqk9XXyDIBC0cTMCtFmW8I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NAnpLfRK5H3BU2F5u2tXnAPeNGnEHqVC0qSWDLjVzRZypTwaV+IcDFDbf04BLdtvaG8sxHBBRnaUStDG5MXPmaBtwcI8+StoMXgIlCD/eQLDwHSNcpuBiGnd59gDs0qg6Ea6tBQ+fYuTAw0mC9PCYYYmQgoDfJYQ4OUrzFtChgU= 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.176 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-f176.google.com with SMTP id af79cd13be357-7b155cca097so74913785a.1 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=UG9JGd3k0IR+Ptf6EwC//4BH2je2+3Dtyn/G/7O/y6fCRgHGyartUXWVWvHKtXBkei JaKfT6cpcT3PVOeevqAh0mN48InfQIH0yReNlKveSr+PAZRUr7N4rT4Ebrgz9d2TYtFu N8JuMgXUYiF401jtX+50gWtSS9sjkQfix+pCrEMJQTuU+PryZQWKTCs+/zb9uxtb0roU 1HPncrjCn5ibYJKB4FEMSP0B8vQeX65ZaLt1277s35OBMOtTmOjcdHCosChZ1u8gfY3W b9ZmwaVVBY9qq/Ji7BpaNV/JdPuVHVAyKudQSIrP3yVi/+aV8dKNZLZWIJnRr9sORYs2 U0Fg== X-Forwarded-Encrypted: i=1; AJvYcCWflragAMJEIUPgiyUm7m1z50jjtpKh0+4XhXlec+mFIVgoTc98I7ypV8Bi12yW3nIZnecb+eT65orTTQ==@vger.kernel.org X-Gm-Message-State: AOJu0YwxTyIMUwNJuHA63niMsyIDVle3Vp4Ko5H9UqolDMX9mteLxLbx koX1FNEpdzYT8tuNOOjB1ZZ+uho56UDT0yIzl+WGwOCjDId7mFWR+d1npYt2+g== 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-input@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: 838244 Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) (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 E061F1E2607 for ; Thu, 24 Oct 2024 13:29:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729776552; cv=none; b=rgpmwMqirTGMKOc+xEvafgOPKo6I1X5coQq3REWXOA7K1IvsAv0gzhyYWae4LUmhlEvgc0falWVHrKVF1wEEUOLwloutrDThy2U/JiWBM6BtlxH2OX7rQAu/b5KOZ1diao40eJV7I4TlZ28oS3mzyLkIUl0pN23PNSg8dQWcUAY= 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.172 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-f172.google.com with SMTP id af79cd13be357-7b157c9ad12so59772685a.1 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=oFRfJRSBo/c0OjwXShf3AS6CN1k6i7VzRGJby0orUYOsQEDdxFIS1XhHgeeTcG2Rfx 2VPc5fLit+RbxVaA367CyPy/l8kJrlkfDlxxT2KAcMISrXuWtrHklKoN4DBxMgruJePC AIIFzXtcwfHe4ius7ynjLKOenV6Dc6zltyX8oujfe7i95aFj6KCmD0PH6xY3j9g6xuSd 6Bw33PHc5Cor4QuZZ1nzZrcIrJ9XL4zjcYRVGMYjKYauM9OPsKhQvJ8jglob3mL43zxl hEPJ97Xa8PA39C8OR9BEJqDCU39xXHw+ldU+vqp8WahPkXzCZyXEFQcQgN+q8l9utXex ExYg== X-Forwarded-Encrypted: i=1; AJvYcCXoUhIeYYaOTu/g3arxcIJd0+isEbcG+G1I90xYpr6Vgq9MtqeHJcbS+TH4YEA2XMwbXftFLkhjjttj7Q==@vger.kernel.org X-Gm-Message-State: AOJu0YwpqLvBZldDDwKCK7MoDfum42RYM9AvctJ+T1G2y2XL3AHW080u 8ZQ4Wtc+aSWpIl3jGMvr5jA1kMSMSOP5szP7MyAGgUVL3GnToGVK7hWlj2R2YQ== 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-input@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: 838541 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 17A741E32A5 for ; Thu, 24 Oct 2024 13:29:10 +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=1729776555; cv=none; b=jssiWbruYV9p5XOHOQESjZ2g1Fyf7sQxrVKq6Lu39T7/hRi7rpYDE7d0rCTxyP7cKfDlaYMbfruXbEkc4pEH1LWfWCMKRHH6gFbw4BJnEJqy2KHwdhIj2MkAlLIq4zCW0hnVIij7B2xzBeeM87rgSMTREeA4Dv/CRq4W/9OdLx8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729776555; c=relaxed/simple; bh=TNFGg/CYQGxNs+Ld3XxJZ5IfmtwWB2COK0LRP9AdQLs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YiMijSZ0k8nvD6OVgCIKQeAMbK6sg1KWinJAjLoeqXpDpaslaek/MQI29aufXpCCTgKNgq38KGa5rG6oGyIRlVUVWrjmS9LC9IFwjw3TfzIJFaQAJZve+5X7K9j6HaBZpsoag7nhgmSTs9BlUOzLNmwEK/Njg9GGwSPBKmJLtlE= 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.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="EVJMBPte" Received: by mail-qk1-f182.google.com with SMTP id af79cd13be357-7b14f3927ddso56405285a.3 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=YbgBimr3vsYN4pwnedj2S7aHJQlzr17kNKH7edRCIcNwPXhwcaXjK+buRsEcUWky8e IgUeSIPvwgVIEsvsn6CHDXCwyp34QegUObzKigFEz/EhwOCK6tRXsQsiFfm/s4x7DHUW eYE4UpQkdMPYMu4/3BDFSslhm5emjvUWe5Tbq0s+f+oziYns5lH48vLe4+20GxN7zBTF ObWm2J6g9maMCkffZTef48V+K05l6TygMdpugZGD067iRc/uVwsIbq7Rw6baF9GZbjep 938MUmppF8Pq0esQV5BzFIKbv4kCehTyzCOK4SghQl1XRDq4egmYEsbp0t/2DcejjuuM AHrw== X-Forwarded-Encrypted: i=1; AJvYcCXXZeEaLIhzUIpvop3zP5wva754cjZkfxJP9Fe38JGtf41M8DETr6Vcem1YLkj61ybuNyA67llWP+0dEg==@vger.kernel.org X-Gm-Message-State: AOJu0Yyinl/MqyS0u0zf0wh95nsECk7gAwVRW6Wbg1Rf2SPYFRTwinOj 9aT0i4329imQLSY0ELl2XIjydJ/9vlrjCKJeW5ZVm/erApdkHiT+8bQVS0vWXg== 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-input@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;