From patchwork Thu Mar 19 13:00:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 229110 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 7D00EC4332D for ; Thu, 19 Mar 2020 13:13:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 514E721556 for ; Thu, 19 Mar 2020 13:13:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584623639; bh=yLKxmUs/QSx+OWu07GzBrZWa9oAIwirndtwegzxBVhc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mhIZglT+yqQGSHaPpQGRYxuAxkEpXS67qv5RPSnU13gvsrcXLgG+xJQtF4QKMxBHq eIX3t+Mkpot8WbQ31uSJoxZ8OjWqrylj+OF0aJJShebW7LJhWlHlGkLWSFXB2QnQ45 8mob59vpn4JKcEXUknruaHGd3ibOEogCOaIy10ng= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727089AbgCSNN6 (ORCPT ); Thu, 19 Mar 2020 09:13:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:33134 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728219AbgCSNN5 (ORCPT ); Thu, 19 Mar 2020 09:13:57 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 212DC20722; Thu, 19 Mar 2020 13:13:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584623636; bh=yLKxmUs/QSx+OWu07GzBrZWa9oAIwirndtwegzxBVhc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eFXSnZMD53769EmpMTQYctWVZBdR3RrfCaSguvxmv6eZDzUuioUyiJgKKlMvahxr9 +Q7w/1h4en8wVbzwdIXxfnxN51knaguZkscOQxGa47uNeftulkiHCpzm6nfcwAlkSP 2tjRID957pTaxyknZ/Bwvo8AYAqRU3SN5q4JvcVo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mansour Behabadi , Jiri Kosina , Sasha Levin Subject: [PATCH 4.9 80/90] HID: apple: Add support for recent firmware on Magic Keyboards Date: Thu, 19 Mar 2020 14:00:42 +0100 Message-Id: <20200319123953.133710067@linuxfoundation.org> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200319123928.635114118@linuxfoundation.org> References: <20200319123928.635114118@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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);