From patchwork Tue Jan 16 18:17:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Duje_Mihanovi=C4=87?= X-Patchwork-Id: 188582 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:42cf:b0:101:a8e8:374 with SMTP id q15csp450828dye; Tue, 16 Jan 2024 10:38:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IFaxMAmXSYI82/Wyjza4eDqSiCeqci/1GMwbtqcFKDHXLbTBQSqXJ7/420TQvbgSrnrtgQW X-Received: by 2002:a05:6a20:9588:b0:19a:9a1c:9b97 with SMTP id iu8-20020a056a20958800b0019a9a1c9b97mr4043198pzb.95.1705430335547; Tue, 16 Jan 2024 10:38:55 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705430335; cv=pass; d=google.com; s=arc-20160816; b=wMPd7P5NMIZQAmOlbS4aN1dhJ36Pj+sIRX8k+ZyYVHBgOmnPEDjZZb9F/90o1JrK7Q mAGt12ug4KH0c1U8gKBPoJyQZM3LqqMVcuRMv7A1xC3EGztlhkRZtbJYBrW9ILvLc8Cb 2DhfwOzI/QQ82LZ5zhHQY3g1QlN/P9XtOscevnl2NL4JAK5lS0/6J5mAjqLxDhXs9zt9 MF7uehclKAJjoomE1ANzmRbvpS/8gwe1ZqmsTyvEH8FpR33TbNXmua/+nXvtGtOV4cHC b5k0r5w7ehlPcZOp9Jz/VYA9uTkGfU4eByvJw7eak8BFvds6dQuaRVEdKFS4oyEenDZ7 bWOQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from; bh=CeU4kKuel6qGXcdYHnHRz3GYUy5aQCgDsnH/k1rKNd8=; fh=/qD3te58dCYMe/6jYQnHWPqRSTfYbCdmt3nHn49ICCQ=; b=IjwOlbYFXzAcvM86wKM9WRh8V5CNq2w7REQ8SvQTrX1M8ndJO5Mzukev/981MIReyZ c9Cfp/MP5r0hhHWqxR6hgrI8Dq/mat6iZY2ktxmVuZwo1sZyzcMFw3rs2AyjuMO0Kzsn G4XhfPCCD6sduj14GRnenAgPmnnAHuLOCKtGBI2T6yhDlojp2IhUv2tmPFmRnCLIoUCu 10yVGozkE8tgLMyjVKmc1EBKo6/i5hlk9wOgbaIp1sYFuaQFMcdtk6mrHgl1e2aJphLb xc/Dle82bViBVwKymR4AB+Qeu2J1EhFFBqVw75Sef23E6AT7K2sdgxaw9e32haWUaWdI 1RyA== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel+bounces-27679-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-27679-ouuuleilei=gmail.com@vger.kernel.org" Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id t3-20020a6564c3000000b00577475ee5f6si10684337pgv.618.2024.01.16.10.38.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jan 2024 10:38:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-27679-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel+bounces-27679-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-27679-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 8D76A289BEC for ; Tue, 16 Jan 2024 18:19:38 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 578BB1D6A2; Tue, 16 Jan 2024 18:18:46 +0000 (UTC) Received: from mx.skole.hr (mx1.hosting.skole.hr [161.53.165.185]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E756F1CFA8; Tue, 16 Jan 2024 18:18:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=skole.hr Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=skole.hr Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=161.53.165.185 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705429123; cv=none; b=CPDFdZO/wLiJwxWitzjdA38XwIISmGENVCTShPD4aIK1TX4LoiPQs+vV0BQ3vdHUqGSQZ9+m9PfSeRkz6wDtL5z3f9yCp3pFKxk91N8/UeHM7U0R0JX7+tjPFgzWDK8oZZOFO4wwUILKA85WunYPobBOzoSWP23HfvZqpyGSnMw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705429123; c=relaxed/simple; bh=QHO9UQMEs5KY0cgVzuXHyTQ8hJjnYblKkQRGc4wBjq8=; h=Received:From:Date:Subject:MIME-Version:Content-Type: Content-Transfer-Encoding:Message-Id:References:In-Reply-To:To:Cc: X-Mailer:X-Developer-Signature:X-Developer-Key; b=As20v6jmlLwmmVxK7iB7f9Dq+ewTgSnGC0wmpwUcdtKmACk7M+SmTduPe5DTJ2FqFr3PdcQCArSu78SLVxYkJ2ZG32iijaGTvtjQv8A87RN4WI+wIrkXnp+HYXZyhRTM+ReIAEZICC8ECzzaDQrMX17wB2LlDe9uiJ48ObHjFZw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=161.53.165.185 Received: from mx1.hosting.skole.hr (localhost.localdomain [127.0.0.1]) by mx.skole.hr (mx.skole.hr) with ESMTP id 8A2258AA33; Tue, 16 Jan 2024 19:18:33 +0100 (CET) From: =?utf-8?q?Duje_Mihanovi=C4=87?= Date: Tue, 16 Jan 2024 19:17:47 +0100 Subject: [PATCH 1/2] ARM: pxa: drop MOUSE_NAVPOINT_PXA27x from defconfig Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240116-navpoint-removal-v1-1-593ae4954a83@skole.hr> References: <20240116-navpoint-removal-v1-0-593ae4954a83@skole.hr> In-Reply-To: <20240116-navpoint-removal-v1-0-593ae4954a83@skole.hr> To: Russell King , Dmitry Torokhov Cc: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, =?utf-8?q?Duje_Mihanovi=C4=87?= X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=696; i=duje.mihanovic@skole.hr; h=from:subject:message-id; bh=QHO9UQMEs5KY0cgVzuXHyTQ8hJjnYblKkQRGc4wBjq8=; b=owEBbQKS/ZANAwAIAZoRnrBCLZbhAcsmYgBlpshZphHiIKgo91Jkvc5Qul/7GDtz+ZKyshc41 v4yNNyf5eCJAjMEAAEIAB0WIQRT351NnD/hEPs2LXiaEZ6wQi2W4QUCZabIWQAKCRCaEZ6wQi2W 4YwMD/0bfbz2aIxE1NkfuZihRIZj+XOgBCaXr57qwMpS39lzlKENq5m1tU9Gx/tgIToVY7/eEWa 2eHSB3IUj1C/l6bRdstbN1U/fcPJO4Cm4LAdHcvzMw4nIdvJHvzjS0onisfQrTg6ybWQaVWJNZH BsjIfvhvWR3gQ87VtbFiUQI2p9Q57WJU5yR8by57+GK5pEZUkozGTHXSFFbp9Rn/oDcBuVTpYEu KLDcfQSW3L+74VnwQeYIyAVfOWKYKti5Oprhd0Vj9GahMeD0hYh2oHMJY/mwkbRxbFiLuS1mnD7 NluAbmA8hhW4hJAlogDtFfwccrCXAmPUR0qKxI0tGDQ7XJqLex+tI0t/0wLS7ehZS/HxXfsRc4x XFu7FEKgw4IxO0YBYRZLGQu7N4ZBERWdw9iC+wq3treJIbxrxgg000qb4ytstdwJpKNB+5TLpsm eRdqqjSPFr5ItfVAWKD9/O4FQk3uwA85rRy1/ody9Y3otcCVJhQ6dFY91PxlRgPaHhyG90rJqx6 GLip7qgljT/nhnLe8L7GPP8/J0AZZLeQqsWAHGPaYNgVAqGiee3AbkaERFv+kkeG19Gdqqcq38U u60yjjM/3xU9JWopCHErRitqOXNI0WpN8kSdxvtMn1bvhIyP7grvxA5Xtaz1jxktvfZqnAqqC7K SKlRZPCg+VsK0vA== X-Developer-Key: i=duje.mihanovic@skole.hr; a=openpgp; fpr=53DF9D4D9C3FE110FB362D789A119EB0422D96E1 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788273319962735898 X-GMAIL-MSGID: 1788273319962735898 Drop the Synaptics NavPoint touchpad from pxa_defconfig in preparation for removal of the driver. Signed-off-by: Duje Mihanović --- arch/arm/configs/pxa_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig index 9e81b1849e4c..960a7f3efc3a 100644 --- a/arch/arm/configs/pxa_defconfig +++ b/arch/arm/configs/pxa_defconfig @@ -244,7 +244,6 @@ CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_SERIAL=m CONFIG_MOUSE_CYAPA=m CONFIG_MOUSE_ELAN_I2C=m -CONFIG_MOUSE_NAVPOINT_PXA27x=m CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ADS7846=m CONFIG_TOUCHSCREEN_ATMEL_MXT=m From patchwork Tue Jan 16 18:17:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Duje_Mihanovi=C4=87?= X-Patchwork-Id: 188583 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:42cf:b0:101:a8e8:374 with SMTP id q15csp450964dye; Tue, 16 Jan 2024 10:39:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IG18pKzBTYpz6S/82alhtVSSHhMKDLOvw7x1eTuX2g3DWXgUAIU7tnhj6LIE7N0Iw3OBIxX X-Received: by 2002:a05:6358:c3a3:b0:175:cc57:41ba with SMTP id fl35-20020a056358c3a300b00175cc5741bamr4623959rwb.56.1705430355337; Tue, 16 Jan 2024 10:39:15 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705430355; cv=pass; d=google.com; s=arc-20160816; b=LXfIZFgO7SZT5FtwzncbCAjsqfvECVB+scgDZMZoax06jUgGt43biWYPpR1XQDnj4R UMiSOuAPMb15Up5Ig0rCpmDqUizDCazh8Mg8EnQOrstE7swScy2ZIWBmaHx4HcOoUj6n Ss9xhhL1vrIoewwlwoLKHyZbVmscB08XV2FbQ6JExs7Fhvmo5ovI4p/TfqlAvd/Ku/OY kx7yPIelwEyVVGm27cXYRdlamtp79jDhzswrSTYbfKdpV38gna7uiecP2fXsLfDGcgz5 P2zO7JAc3h33Q3qdWJysdKHg4UImq/WgzJQVpENybIcrE7L7TGKlsv+zhBkqarAIxHzq 6NIA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from; bh=T5I0TVxfKZo/wRMq5tKVAoQMmEubltHeCDcf3ntQB8E=; fh=/qD3te58dCYMe/6jYQnHWPqRSTfYbCdmt3nHn49ICCQ=; b=QxIqVdk8E+RT6vAwmpFIBkTS1SY2IrvkkDf+/0foyWQEQeOsl5tbpk/DwO6QjjjQpD Bn4YR5opZNlCi5LmpRhZBzNGeHPBC/Khv32joOqkZsPNksGP0sc1N1Np6wYBqnHeKEXt QhtBncikjo/DF1pbg/VtNc4BB02DSC42mg7wddc3tzZKO5d3PNQsWaGMfgWM3XTPAYUS n0ZaiJ8M+EjvOxtY8pDIPMOurewnmCsPmQwkuRwTTUxXCt+iXy05jFhrfof31hrny93M XXBXg7zLE0amSefGfoji/m7MGUzcpXjEK6yURHfu9dHa4O4r5HFAp5fRBpmF8x0DDakw Mqng== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel+bounces-27681-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-27681-ouuuleilei=gmail.com@vger.kernel.org" Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id p33-20020a056a000a2100b006ce7ec100ecsi11795396pfh.87.2024.01.16.10.39.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jan 2024 10:39:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-27681-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel+bounces-27681-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-27681-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 6CCB628A0E8 for ; Tue, 16 Jan 2024 18:19:57 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AD1001DA3E; Tue, 16 Jan 2024 18:18:49 +0000 (UTC) Received: from mx.skole.hr (mx2.hosting.skole.hr [161.53.165.186]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EA1C81CFAF; Tue, 16 Jan 2024 18:18:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=skole.hr Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=skole.hr Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=161.53.165.186 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705429125; cv=none; b=FtWvOhvNVdmbHG+rosIdrjncqWvBEouKiBKFyaqB2GlDim2cDxO/JV0KLDsjCxHctH95Dawb92xGAl8DskiCPyCxP2d9p9gBLTRXLIIMkUcVdjwIH4wsgv06VfJkJfiCXX3yV73iQZz62j5MDZrVXgvGXeDNOfFDr2Mky5X+K5Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705429125; c=relaxed/simple; bh=y4deC5Cgqx7fRp7LD9HtVaSOzjNxB1A2V1ZZtL1F/D0=; h=Received:From:Date:Subject:MIME-Version:Content-Type: Content-Transfer-Encoding:Message-Id:References:In-Reply-To:To:Cc: X-Mailer:X-Developer-Signature:X-Developer-Key; b=lTXDvOb4aNvAQzbUWRQprTBxDg5NqDmoldKbjvvcFOh6Zwshow+aOYR9wCZ6AmXRlOBKwwuevU9uly+rabfPss3hNTRgYDEMNAs3G6TH2ZKBiSDhW9MIp1hX8aci4gOFrqDC5FPC0kh3eXfFeqdjEqw4Lr0eHatbyjKiBGpJxHc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=161.53.165.186 Received: from mx2.hosting.skole.hr (localhost.localdomain [127.0.0.1]) by mx.skole.hr (mx.skole.hr) with ESMTP id 8A8FD8BDCF; Tue, 16 Jan 2024 19:18:34 +0100 (CET) From: =?utf-8?q?Duje_Mihanovi=C4=87?= Date: Tue, 16 Jan 2024 19:17:48 +0100 Subject: [PATCH 2/2] input/navpoint: remove driver Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240116-navpoint-removal-v1-2-593ae4954a83@skole.hr> References: <20240116-navpoint-removal-v1-0-593ae4954a83@skole.hr> In-Reply-To: <20240116-navpoint-removal-v1-0-593ae4954a83@skole.hr> To: Russell King , Dmitry Torokhov Cc: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, =?utf-8?q?Duje_Mihanovi=C4=87?= X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=12816; i=duje.mihanovic@skole.hr; h=from:subject:message-id; bh=y4deC5Cgqx7fRp7LD9HtVaSOzjNxB1A2V1ZZtL1F/D0=; b=owEBbQKS/ZANAwAIAZoRnrBCLZbhAcsmYgBlpshZHDT0cv4NS50LELztkYzA8RmWx6VcbWFcI psEo2DE4/uJAjMEAAEIAB0WIQRT351NnD/hEPs2LXiaEZ6wQi2W4QUCZabIWQAKCRCaEZ6wQi2W 4cfJD/9+eouFy5p2m0YPub9zgWKsUenyH8zhHPWGsx2kNhGhQ7xq2rQ+tvZKzuFNcDffuxqOeGA oxqY7ATNDmY8Om7BfTuXzkBsnaVAEavdK+T9ZJRDSqPADiiC9kLuVmCG0Vadn87RlwhyMUyrhKg ad8DYouFzUW5w7QsEY/5YTDdi93ej7JtRL6giDWjld/Ec4rOjP5sFOL+f8PcGgpt/8P2Q2ufGNW 6zulfFf5bKGYkPxK6ZorKwioUV1rjBoqLcRmpL0URdWklU1QFK0gBxxpVyGaGZXPC9o/QlbJCcu flzp4qP8sBW+4doKlceU+JS2dJ/32LCIcfQSfDOBqFn1UpyvPF+aZhgA6xp9Y8CyjhsA30LoZ9n BOwOgOQYx5P1yCDtQwkXk0Pd241nuvL2+KXjjVT/Y7/R16o5riAr/edzsCZH9VJXDuDT091SDso ywmSpoSy/h6lQvGGQrsg/tGRe8+AUGz6Qr1EhD8hh7mOLqxrYEMcHpf0YiqY2fp3EMvmhYAr+7L cQgFt8aei5EZdLb0esgeIH7OpALaBHaBawe/I89ZuA4z/v/ruKTJSmDTjo7x1U3YbeaeMYm2i8a wL8JuEnxKWq9oLmQnrrZgwt3BadlfOOJY+Ptsr67j1vpJuUzyXzRH6Sf1p/cNs++4ErSleK9G93 O28j6LU7eHQxfnQ== X-Developer-Key: i=duje.mihanovic@skole.hr; a=openpgp; fpr=53DF9D4D9C3FE110FB362D789A119EB0422D96E1 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788272114896045230 X-GMAIL-MSGID: 1788273340045397790 This driver does not use the SPI core as it should, instead tampering with the SSP registers manually. Besides this, it relies on the global GPIO namespace. Refactoring the driver is almost certainly not worth it as it was seemingly only implemented in the HP iPAQ hx4700 removed more than a year ago in d6df7df7ae5a ("ARM: pxa: remove unused board files"), so let's remove it. Signed-off-by: Duje Mihanović --- drivers/input/mouse/Kconfig | 12 -- drivers/input/mouse/Makefile | 1 - drivers/input/mouse/navpoint.c | 361 ----------------------------------------- include/linux/input/navpoint.h | 9 - 4 files changed, 383 deletions(-) diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig index 32cc4c62a716..833b643f0616 100644 --- a/drivers/input/mouse/Kconfig +++ b/drivers/input/mouse/Kconfig @@ -439,16 +439,4 @@ config MOUSE_SYNAPTICS_USB To compile this driver as a module, choose M here: the module will be called synaptics_usb. -config MOUSE_NAVPOINT_PXA27x - tristate "Synaptics NavPoint (PXA27x SSP/SPI)" - depends on PXA27x && PXA_SSP - help - This driver adds support for the Synaptics NavPoint touchpad connected - to a PXA27x SSP port in SPI slave mode. The device emulates a mouse; - a tap or tap-and-a-half drag gesture emulates the left mouse button. - For example, use the xf86-input-evdev driver for an X pointing device. - - To compile this driver as a module, choose M here: the - module will be called navpoint. - endif diff --git a/drivers/input/mouse/Makefile b/drivers/input/mouse/Makefile index 92b3204ce84e..a1336d5bee6f 100644 --- a/drivers/input/mouse/Makefile +++ b/drivers/input/mouse/Makefile @@ -15,7 +15,6 @@ obj-$(CONFIG_MOUSE_GPIO) += gpio_mouse.o obj-$(CONFIG_MOUSE_INPORT) += inport.o obj-$(CONFIG_MOUSE_LOGIBM) += logibm.o obj-$(CONFIG_MOUSE_MAPLE) += maplemouse.o -obj-$(CONFIG_MOUSE_NAVPOINT_PXA27x) += navpoint.o obj-$(CONFIG_MOUSE_PC110PAD) += pc110pad.o obj-$(CONFIG_MOUSE_PS2) += psmouse.o obj-$(CONFIG_MOUSE_RISCPC) += rpcmouse.o diff --git a/drivers/input/mouse/navpoint.c b/drivers/input/mouse/navpoint.c deleted file mode 100644 index c00dc1275da2..000000000000 --- a/drivers/input/mouse/navpoint.c +++ /dev/null @@ -1,361 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Synaptics NavPoint (PXA27x SSP/SPI) driver. - * - * Copyright (C) 2012 Paul Parsons - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* - * Synaptics Modular Embedded Protocol: Module Packet Format. - * Module header byte 2:0 = Length (# bytes that follow) - * Module header byte 4:3 = Control - * Module header byte 7:5 = Module Address - */ -#define HEADER_LENGTH(byte) ((byte) & 0x07) -#define HEADER_CONTROL(byte) (((byte) >> 3) & 0x03) -#define HEADER_ADDRESS(byte) ((byte) >> 5) - -struct navpoint { - struct ssp_device *ssp; - struct input_dev *input; - struct device *dev; - int gpio; - int index; - u8 data[1 + HEADER_LENGTH(0xff)]; -}; - -/* - * Initialization values for SSCR0_x, SSCR1_x, SSSR_x. - */ -static const u32 sscr0 = 0 - | SSCR0_TUM /* TIM = 1; No TUR interrupts */ - | SSCR0_RIM /* RIM = 1; No ROR interrupts */ - | SSCR0_SSE /* SSE = 1; SSP enabled */ - | SSCR0_Motorola /* FRF = 0; Motorola SPI */ - | SSCR0_DataSize(16) /* DSS = 15; Data size = 16-bit */ - ; -static const u32 sscr1 = 0 - | SSCR1_SCFR /* SCFR = 1; SSPSCLK only during transfers */ - | SSCR1_SCLKDIR /* SCLKDIR = 1; Slave mode */ - | SSCR1_SFRMDIR /* SFRMDIR = 1; Slave mode */ - | SSCR1_RWOT /* RWOT = 1; Receive without transmit mode */ - | SSCR1_RxTresh(1) /* RFT = 0; Receive FIFO threshold = 1 */ - | SSCR1_SPH /* SPH = 1; SSPSCLK inactive 0.5 + 1 cycles */ - | SSCR1_RIE /* RIE = 1; Receive FIFO interrupt enabled */ - ; -static const u32 sssr = 0 - | SSSR_BCE /* BCE = 1; Clear BCE */ - | SSSR_TUR /* TUR = 1; Clear TUR */ - | SSSR_EOC /* EOC = 1; Clear EOC */ - | SSSR_TINT /* TINT = 1; Clear TINT */ - | SSSR_PINT /* PINT = 1; Clear PINT */ - | SSSR_ROR /* ROR = 1; Clear ROR */ - ; - -/* - * MEP Query $22: Touchpad Coordinate Range Query is not supported by - * the NavPoint module, so sampled values provide the default limits. - */ -#define NAVPOINT_X_MIN 1278 -#define NAVPOINT_X_MAX 5340 -#define NAVPOINT_Y_MIN 1572 -#define NAVPOINT_Y_MAX 4396 -#define NAVPOINT_PRESSURE_MIN 0 -#define NAVPOINT_PRESSURE_MAX 255 - -static void navpoint_packet(struct navpoint *navpoint) -{ - int finger; - int gesture; - int x, y, z; - - switch (navpoint->data[0]) { - case 0xff: /* Garbage (packet?) between reset and Hello packet */ - case 0x00: /* Module 0, NULL packet */ - break; - - case 0x0e: /* Module 0, Absolute packet */ - finger = (navpoint->data[1] & 0x01); - gesture = (navpoint->data[1] & 0x02); - x = ((navpoint->data[2] & 0x1f) << 8) | navpoint->data[3]; - y = ((navpoint->data[4] & 0x1f) << 8) | navpoint->data[5]; - z = navpoint->data[6]; - input_report_key(navpoint->input, BTN_TOUCH, finger); - input_report_abs(navpoint->input, ABS_X, x); - input_report_abs(navpoint->input, ABS_Y, y); - input_report_abs(navpoint->input, ABS_PRESSURE, z); - input_report_key(navpoint->input, BTN_TOOL_FINGER, finger); - input_report_key(navpoint->input, BTN_LEFT, gesture); - input_sync(navpoint->input); - break; - - case 0x19: /* Module 0, Hello packet */ - if ((navpoint->data[1] & 0xf0) == 0x10) - break; - fallthrough; - default: - dev_warn(navpoint->dev, - "spurious packet: data=0x%02x,0x%02x,...\n", - navpoint->data[0], navpoint->data[1]); - break; - } -} - -static irqreturn_t navpoint_irq(int irq, void *dev_id) -{ - struct navpoint *navpoint = dev_id; - struct ssp_device *ssp = navpoint->ssp; - irqreturn_t ret = IRQ_NONE; - u32 status; - - status = pxa_ssp_read_reg(ssp, SSSR); - if (status & sssr) { - dev_warn(navpoint->dev, - "unexpected interrupt: status=0x%08x\n", status); - pxa_ssp_write_reg(ssp, SSSR, (status & sssr)); - ret = IRQ_HANDLED; - } - - while (status & SSSR_RNE) { - u32 data; - - data = pxa_ssp_read_reg(ssp, SSDR); - navpoint->data[navpoint->index + 0] = (data >> 8); - navpoint->data[navpoint->index + 1] = data; - navpoint->index += 2; - if (HEADER_LENGTH(navpoint->data[0]) < navpoint->index) { - navpoint_packet(navpoint); - navpoint->index = 0; - } - status = pxa_ssp_read_reg(ssp, SSSR); - ret = IRQ_HANDLED; - } - - return ret; -} - -static void navpoint_up(struct navpoint *navpoint) -{ - struct ssp_device *ssp = navpoint->ssp; - int timeout; - - clk_prepare_enable(ssp->clk); - - pxa_ssp_write_reg(ssp, SSCR1, sscr1); - pxa_ssp_write_reg(ssp, SSSR, sssr); - pxa_ssp_write_reg(ssp, SSTO, 0); - pxa_ssp_write_reg(ssp, SSCR0, sscr0); /* SSCR0_SSE written last */ - - /* Wait until SSP port is ready for slave clock operations */ - for (timeout = 100; timeout != 0; --timeout) { - if (!(pxa_ssp_read_reg(ssp, SSSR) & SSSR_CSS)) - break; - msleep(1); - } - - if (timeout == 0) - dev_err(navpoint->dev, - "timeout waiting for SSSR[CSS] to clear\n"); - - if (gpio_is_valid(navpoint->gpio)) - gpio_set_value(navpoint->gpio, 1); -} - -static void navpoint_down(struct navpoint *navpoint) -{ - struct ssp_device *ssp = navpoint->ssp; - - if (gpio_is_valid(navpoint->gpio)) - gpio_set_value(navpoint->gpio, 0); - - pxa_ssp_write_reg(ssp, SSCR0, 0); - - clk_disable_unprepare(ssp->clk); -} - -static int navpoint_open(struct input_dev *input) -{ - struct navpoint *navpoint = input_get_drvdata(input); - - navpoint_up(navpoint); - - return 0; -} - -static void navpoint_close(struct input_dev *input) -{ - struct navpoint *navpoint = input_get_drvdata(input); - - navpoint_down(navpoint); -} - -static int navpoint_probe(struct platform_device *pdev) -{ - const struct navpoint_platform_data *pdata = - dev_get_platdata(&pdev->dev); - struct ssp_device *ssp; - struct input_dev *input; - struct navpoint *navpoint; - int error; - - if (!pdata) { - dev_err(&pdev->dev, "no platform data\n"); - return -EINVAL; - } - - if (gpio_is_valid(pdata->gpio)) { - error = gpio_request_one(pdata->gpio, GPIOF_OUT_INIT_LOW, - "SYNAPTICS_ON"); - if (error) - return error; - } - - ssp = pxa_ssp_request(pdata->port, pdev->name); - if (!ssp) { - error = -ENODEV; - goto err_free_gpio; - } - - /* HaRET does not disable devices before jumping into Linux */ - if (pxa_ssp_read_reg(ssp, SSCR0) & SSCR0_SSE) { - pxa_ssp_write_reg(ssp, SSCR0, 0); - dev_warn(&pdev->dev, "ssp%d already enabled\n", pdata->port); - } - - navpoint = kzalloc(sizeof(*navpoint), GFP_KERNEL); - input = input_allocate_device(); - if (!navpoint || !input) { - error = -ENOMEM; - goto err_free_mem; - } - - navpoint->ssp = ssp; - navpoint->input = input; - navpoint->dev = &pdev->dev; - navpoint->gpio = pdata->gpio; - - input->name = pdev->name; - input->dev.parent = &pdev->dev; - - __set_bit(EV_KEY, input->evbit); - __set_bit(EV_ABS, input->evbit); - __set_bit(BTN_LEFT, input->keybit); - __set_bit(BTN_TOUCH, input->keybit); - __set_bit(BTN_TOOL_FINGER, input->keybit); - - input_set_abs_params(input, ABS_X, - NAVPOINT_X_MIN, NAVPOINT_X_MAX, 0, 0); - input_set_abs_params(input, ABS_Y, - NAVPOINT_Y_MIN, NAVPOINT_Y_MAX, 0, 0); - input_set_abs_params(input, ABS_PRESSURE, - NAVPOINT_PRESSURE_MIN, NAVPOINT_PRESSURE_MAX, - 0, 0); - - input->open = navpoint_open; - input->close = navpoint_close; - - input_set_drvdata(input, navpoint); - - error = request_irq(ssp->irq, navpoint_irq, 0, pdev->name, navpoint); - if (error) - goto err_free_mem; - - error = input_register_device(input); - if (error) - goto err_free_irq; - - platform_set_drvdata(pdev, navpoint); - dev_dbg(&pdev->dev, "ssp%d, irq %d\n", pdata->port, ssp->irq); - - return 0; - -err_free_irq: - free_irq(ssp->irq, navpoint); -err_free_mem: - input_free_device(input); - kfree(navpoint); - pxa_ssp_free(ssp); -err_free_gpio: - if (gpio_is_valid(pdata->gpio)) - gpio_free(pdata->gpio); - - return error; -} - -static void navpoint_remove(struct platform_device *pdev) -{ - const struct navpoint_platform_data *pdata = - dev_get_platdata(&pdev->dev); - struct navpoint *navpoint = platform_get_drvdata(pdev); - struct ssp_device *ssp = navpoint->ssp; - - free_irq(ssp->irq, navpoint); - - input_unregister_device(navpoint->input); - kfree(navpoint); - - pxa_ssp_free(ssp); - - if (gpio_is_valid(pdata->gpio)) - gpio_free(pdata->gpio); -} - -static int navpoint_suspend(struct device *dev) -{ - struct platform_device *pdev = to_platform_device(dev); - struct navpoint *navpoint = platform_get_drvdata(pdev); - struct input_dev *input = navpoint->input; - - mutex_lock(&input->mutex); - if (input_device_enabled(input)) - navpoint_down(navpoint); - mutex_unlock(&input->mutex); - - return 0; -} - -static int navpoint_resume(struct device *dev) -{ - struct platform_device *pdev = to_platform_device(dev); - struct navpoint *navpoint = platform_get_drvdata(pdev); - struct input_dev *input = navpoint->input; - - mutex_lock(&input->mutex); - if (input_device_enabled(input)) - navpoint_up(navpoint); - mutex_unlock(&input->mutex); - - return 0; -} - -static DEFINE_SIMPLE_DEV_PM_OPS(navpoint_pm_ops, - navpoint_suspend, navpoint_resume); - -static struct platform_driver navpoint_driver = { - .probe = navpoint_probe, - .remove_new = navpoint_remove, - .driver = { - .name = "navpoint", - .pm = pm_sleep_ptr(&navpoint_pm_ops), - }, -}; - -module_platform_driver(navpoint_driver); - -MODULE_AUTHOR("Paul Parsons "); -MODULE_DESCRIPTION("Synaptics NavPoint (PXA27x SSP/SPI) driver"); -MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:navpoint"); diff --git a/include/linux/input/navpoint.h b/include/linux/input/navpoint.h deleted file mode 100644 index d464ffb4db52..000000000000 --- a/include/linux/input/navpoint.h +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright (C) 2012 Paul Parsons - */ - -struct navpoint_platform_data { - int port; /* PXA SSP port for pxa_ssp_request() */ - int gpio; /* GPIO for power on/off */ -};