From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4775EC3F2D8 for ; Thu, 5 Mar 2020 17:17:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0B1BA2166E for ; Thu, 5 Mar 2020 17:17:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583428648; bh=yLKxmUs/QSx+OWu07GzBrZWa9oAIwirndtwegzxBVhc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hlVk8GPnttFS7xvG0lev0mtnqe0FpoHPBmCE2AT1RcYswBlMSWmrd4ADLQEB5sKHK KNeJCDrF2lecQmCwOVOmJcsqOasZyPFQbiap2a3f0DDD+mii7+JtMQ2MgNhqTY0OJ4 naEXl/sjX4dO+dG4XtEEps1n78+MbFyOfQrtoaqw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727892AbgCERRU (ORCPT ); Thu, 5 Mar 2020 12:17:20 -0500 Received: from mail.kernel.org ([198.145.29.99]:43024 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728350AbgCERQC (ORCPT ); Thu, 5 Mar 2020 12:16:02 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8EA902166E; Thu, 5 Mar 2020 17:16:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583428562; bh=yLKxmUs/QSx+OWu07GzBrZWa9oAIwirndtwegzxBVhc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bllRYrkbbOk1BLl0ZKVzK0kmF3HlQe28Y34ex5tvGePfhCNgk3FZp4vbLMVW1csL9 wktgkQmLbHC4/PlXUm5xeZbDdaxzn1j8TM4bvoBezK0SKKfeO/VfC4rz40xnAdxUAA 3gm/HAf/Jms1gUR76PgQ3RBgyBRjcoiBmA5mNM5c= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mansour Behabadi , Jiri Kosina , Sasha Levin , linux-input@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 02/12] HID: apple: Add support for recent firmware on Magic Keyboards Date: Thu, 5 Mar 2020 12:15:49 -0500 Message-Id: <20200305171559.30422-2-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200305171559.30422-1-sashal@kernel.org> References: <20200305171559.30422-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org From: Mansour Behabadi [ Upstream commit e433be929e63265b7412478eb7ff271467aee2d7 ] Magic Keyboards with more recent firmware (0x0100) report Fn key differently. Without this patch, Fn key may not behave as expected and may not be configurable via hid_apple fnmode module parameter. Signed-off-by: Mansour Behabadi Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin --- drivers/hid/hid-apple.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c index 31c087e1746d6..197eb75d10ef2 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c @@ -341,7 +341,8 @@ static int apple_input_mapping(struct hid_device *hdev, struct hid_input *hi, unsigned long **bit, int *max) { if (usage->hid == (HID_UP_CUSTOM | 0x0003) || - usage->hid == (HID_UP_MSVENDOR | 0x0003)) { + usage->hid == (HID_UP_MSVENDOR | 0x0003) || + usage->hid == (HID_UP_HPVENDOR2 | 0x0003)) { /* The fn key on Apple USB keyboards */ set_bit(EV_REP, hi->input->evbit); hid_map_usage_clear(hi, usage, bit, max, EV_KEY, KEY_FN); -- 2.20.1