From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oi1-f175.google.com (mail-oi1-f175.google.com [209.85.167.175]) (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 65B5A40C5DD for ; Wed, 3 Jun 2026 20:44:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780519451; cv=none; b=mTQ0g2e3ZpT0vWR1TEP5r2ktnGaDEOV2HTidRXImgMCCmeHcTJiPiLV4Esz9YhOf5QoVo/2nKAR2GG9SqCcKqsl4Gz2Qkd/4c3/YOxkiXftXO1Vmy4LKGsnu3Ml16TG8+Udq9Sw1yr/eQ3ptr8wy/vkkan/0Qv4Rkvl83P/fJ0E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780519451; c=relaxed/simple; bh=amPURw1JjZfEDUE22gJ+bKOK7PktxrSxr1SHV7K3oHg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NPr1JiseAqwhPrtn7QneSJtkUVQHMgwBIigSXm9pdKHCT24Njh5NixAbjeKQ6s54hrZuV/BUXAImh4cFy+IbvUP4lnPjs1oP/ORoSAlb8PZPL2lcIBdqsLemqerzlRsam4n7nvuz8FpOSvf0F/mysyLdTu5RKfzBe6uo5H8ORUQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=I5RL9D5u; arc=none smtp.client-ip=209.85.167.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="I5RL9D5u" Received: by mail-oi1-f175.google.com with SMTP id 5614622812f47-48611c43853so1452000b6e.3 for ; Wed, 03 Jun 2026 13:44:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780519448; x=1781124248; 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=RIMHRKZ1kbgwP55bGp0c0OQ+sOxMVw/a+CoqATe1mLs=; b=I5RL9D5uhEAyzv9tsLU2FeMJxU9b/Bi54IP9i0s25oEq6IkiWt3wMeW96YdViiZypi QMTIfabDlD9IQcSkCES6tGRHJCNrtRBNrjOHnnPlJ/rj5W1jTuO6uLKufTvl4AhxTqo7 HHLnF3x5Tc0jfyBsXetMUqdSMKBGyxxWWxaH/0Fxu7TNYRsN8DF5+39ZDetxVDUoj+aj Hrj1Wj5gk+XtMTrUaFqaNvmniHVHDe8VQDaEc6hHWz5RWWMF+HWNYmlCo6upyjKMbdR7 ONK99j3x4hqqOrJTg/ylUFHJCtQP3tqpSsAyqCUEWI5aWdqpjnpuxkEjC6/0zfMXyf2i XkBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780519448; x=1781124248; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=RIMHRKZ1kbgwP55bGp0c0OQ+sOxMVw/a+CoqATe1mLs=; b=Ig8G6Nqnqpw1JRbrh2wx55nFZlhZcygeDStKxhgKCCqEBvRA4CMSFRqmf98Gje4mUE UEckV3PUYc3syseDkG0/dFKJRlp/QXGrlJXY4ILC9C1FM831n9rUpuEjsifxl6vIKFlu yQg+E9O32I6hM4rqISdQKr4LjHqqj//yhXGjYmeN7TdTxTVOle/zD4f8m1/IFnKZovmY URPMbqjinXbFOZSxItAcRrVUq0XSmpt0I+hMzL1PkGZX8MC9Nlpia0EhvFidwaltYesr jO54M5riHyGKvymaGeokLGbUMigSDwW/LWBct5Qb6jEUMOOJ2y/KijDf6Gez/qS+rkUZ TPbg== X-Forwarded-Encrypted: i=1; AFNElJ+lo7YlmgkKBUrBRsfA+SPu0vhiOLh5NqDkdAGA+eS2sgK5i5JpkQ6avXK8XxOu5hi7M7RuHzQJ+LKh//o=@vger.kernel.org X-Gm-Message-State: AOJu0YwjdYEpoGbOcT5GnNbjrXoZ7YIExTmkBgu6afcKTTfprN67afn3 YnMNXxV1va3HBP2Ep7GOBf8N+etTnDtM4MwzC24LEBQitsmdYIS8WfLA X-Gm-Gg: Acq92OFLv5SjyBNQfVHv11GZ4A1FE6/87EOsVYzOSen2PJrOVwZLaQzVgCFAUKES2kS EcX1iZjBqXrw/BqzdaWaON9GbfikvL9tPlMjxb5J2ihX3rt/F+EJ6VgP1qGzsdZC/AlfPJ1JBCS zFGY05PtLhDs+1V/WVCpSZ3786we32RhMlWreD/HOJv9DMBtFSVQp3K7AkRoKxLHM1WQzp64r9Q P5Yn3nESUHOM35kmdh9TR9TGiipDkQS7alHk0bbx7WIR2zMzfpj1Z+3YZDgLT7I/zIJ5ZJ2hVUd pz861Jz4vc64fKUCughQbz7OfkGzmj0Im03+asp7K9nRcmAnME3UijvA0FfCwJ9A3+R9IfkHc/S +ctygepO0xhzST5LsMEs51MOouL6jyUIgTWYzQ024SlsJP90QGIy6gi7ZG4jjWuP0zPRE8TA+Hf Bsx0FU/3RroFiGVhm5isYP4gCuE38E6MZc3nlNaeAbVxwZh9XjAA== X-Received: by 2002:a05:6808:1783:b0:47b:bd7b:10d0 with SMTP id 5614622812f47-4865aa81a6cmr2841639b6e.13.1780519448489; Wed, 03 Jun 2026 13:44:08 -0700 (PDT) Received: from [192.168.1.71] ([2600:1702:56e9:4b40:e3a9:78c5:641e:a58c]) by smtp.gmail.com with ESMTPSA id 5614622812f47-4865b5a5a64sm2667962b6e.4.2026.06.03.13.44.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jun 2026 13:44:07 -0700 (PDT) From: Akash Sukhavasi Date: Wed, 03 Jun 2026 15:42:21 -0500 Subject: [PATCH v2 4/4] dt-bindings: input: remove obsolete matrix-keymap.txt Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260603-b4-remove-redirect-stubs-v2-4-c8c19876ab64@gmail.com> References: <20260603-b4-remove-redirect-stubs-v2-0-c8c19876ab64@gmail.com> In-Reply-To: <20260603-b4-remove-redirect-stubs-v2-0-c8c19876ab64@gmail.com> To: Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Mauro Carvalho Chehab , Vladimir Oltean , Simon Horman , Jonathan Corbet , Shuah Khan , Dmitry Torokhov , Thierry Reding , Jonathan Hunter , Lee Jones Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-doc@vger.kernel.org, linux-input@vger.kernel.org, linux-tegra@vger.kernel.org, Akash Sukhavasi X-Mailer: b4 0.14.3 matrix-keymap.txt has been a single-line redirect to matrix-keymap.yaml since commit 639d6eda3b80 ("dt-bindings: input: Convert matrix-keymap to json-schema"), which introduced the .yaml schema and reduced the .txt to a stub in the same change. The .yaml has the same filename in the same directory, making this redirect unnecessary for discoverability. Eight instances across six files still reference matrix-keymap.txt, forcing readers through an extra hop to reach the .yaml. The stub has not been touched since June 2020. Update all references across input and mfd binding documentation to point directly to matrix-keymap.yaml and remove the stub. Signed-off-by: Akash Sukhavasi --- v2: - Patch 4/4: corrected commit message (eight references in six files, not eight files), Sashiko review. https://sashiko.dev/#/patchset/20260529052246.4934-1-akash.sukhavasi@gmail.com?part=4 v1: https://lore.kernel.org/all/20260529052246.4934-5-akash.sukhavasi@gmail.com/ --- Documentation/devicetree/bindings/input/brcm,bcm-keypad.txt | 2 +- Documentation/devicetree/bindings/input/clps711x-keypad.txt | 2 +- Documentation/devicetree/bindings/input/matrix-keymap.txt | 1 - Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt | 2 +- Documentation/devicetree/bindings/input/pxa27x-keypad.txt | 2 +- Documentation/devicetree/bindings/input/st-keyscan.txt | 2 +- Documentation/devicetree/bindings/mfd/tc3589x.txt | 6 +++--- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Documentation/devicetree/bindings/input/brcm,bcm-keypad.txt b/Documentation/devicetree/bindings/input/brcm,bcm-keypad.txt index 262deab73588..33514eba0c9c 100644 --- a/Documentation/devicetree/bindings/input/brcm,bcm-keypad.txt +++ b/Documentation/devicetree/bindings/input/brcm,bcm-keypad.txt @@ -59,7 +59,7 @@ Board Specific Properties: subsystem (optional). - linux,keymap: The keymap for keys as described in the binding document - devicetree/bindings/input/matrix-keymap.txt. + devicetree/bindings/input/matrix-keymap.yaml. Example: #include "dt-bindings/input/input.h" diff --git a/Documentation/devicetree/bindings/input/clps711x-keypad.txt b/Documentation/devicetree/bindings/input/clps711x-keypad.txt index 3eed8819d05d..5f4514c0cd5f 100644 --- a/Documentation/devicetree/bindings/input/clps711x-keypad.txt +++ b/Documentation/devicetree/bindings/input/clps711x-keypad.txt @@ -5,7 +5,7 @@ Required Properties: - row-gpios: List of GPIOs used as row lines. - poll-interval: Poll interval time in milliseconds. - linux,keymap: The definition can be found at - bindings/input/matrix-keymap.txt. + bindings/input/matrix-keymap.yaml. Optional Properties: - autorepeat: Enable autorepeat feature. diff --git a/Documentation/devicetree/bindings/input/matrix-keymap.txt b/Documentation/devicetree/bindings/input/matrix-keymap.txt deleted file mode 100644 index 79f6d01aecaa..000000000000 --- a/Documentation/devicetree/bindings/input/matrix-keymap.txt +++ /dev/null @@ -1 +0,0 @@ -This file has been moved to matrix-keymap.yaml diff --git a/Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt b/Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt index 1faa7292e21f..460b64d332cd 100644 --- a/Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt +++ b/Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt @@ -12,7 +12,7 @@ Required properties: - nvidia,kbc-col-pins: The KBC pins which are configured as column. This is an array of pin numbers which is used as column. - linux,keymap: The keymap for keys as described in the binding document - devicetree/bindings/input/matrix-keymap.txt. + devicetree/bindings/input/matrix-keymap.yaml. - clocks: Must contain one entry, for the module clock. See ../clocks/clock-bindings.txt for details. - resets: Must contain an entry for each entry in reset-names. diff --git a/Documentation/devicetree/bindings/input/pxa27x-keypad.txt b/Documentation/devicetree/bindings/input/pxa27x-keypad.txt index f8674f7e5ea5..a727d66eece4 100644 --- a/Documentation/devicetree/bindings/input/pxa27x-keypad.txt +++ b/Documentation/devicetree/bindings/input/pxa27x-keypad.txt @@ -10,7 +10,7 @@ Required Properties interval for matrix key. The value is in binary number of 2ms Optional Properties For Matrix Keyes -Please refer to matrix-keymap.txt +Please refer to matrix-keymap.yaml Optional Properties for Direct Keyes - marvell,direct-key-count : How many direct keyes are used. diff --git a/Documentation/devicetree/bindings/input/st-keyscan.txt b/Documentation/devicetree/bindings/input/st-keyscan.txt index 51eb428e5c85..fd88f40faebf 100644 --- a/Documentation/devicetree/bindings/input/st-keyscan.txt +++ b/Documentation/devicetree/bindings/input/st-keyscan.txt @@ -17,7 +17,7 @@ Required properties: See ../pinctrl/pinctrl-bindings.txt for details. - linux,keymap: The keymap for keys as described in the binding document - devicetree/bindings/input/matrix-keymap.txt. + devicetree/bindings/input/matrix-keymap.yaml. - keypad,num-rows: Number of row lines connected to the keypad controller. diff --git a/Documentation/devicetree/bindings/mfd/tc3589x.txt b/Documentation/devicetree/bindings/mfd/tc3589x.txt index 4f22b2b07dc5..a6d356e90f42 100644 --- a/Documentation/devicetree/bindings/mfd/tc3589x.txt +++ b/Documentation/devicetree/bindings/mfd/tc3589x.txt @@ -48,11 +48,11 @@ Optional nodes: - compatible : must be "toshiba,tc3589x-keypad" - debounce-delay-ms : debounce interval in milliseconds - keypad,num-rows : number of rows in the matrix, see - bindings/input/matrix-keymap.txt + bindings/input/matrix-keymap.yaml - keypad,num-columns : number of columns in the matrix, see - bindings/input/matrix-keymap.txt + bindings/input/matrix-keymap.yaml - linux,keymap: the definition can be found in - bindings/input/matrix-keymap.txt + bindings/input/matrix-keymap.yaml - linux,no-autorepeat: do no enable autorepeat feature. - wakeup-source: use any event on keypad as wakeup event. (Legacy property supported: "linux,wakeup") -- 2.54.0