From patchwork Sun Jan 17 23:10:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Weng Xuetian X-Patchwork-Id: 8051151 Return-Path: X-Original-To: patchwork-platform-driver-x86@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4B9A99F744 for ; Sun, 17 Jan 2016 23:11:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 58C022021A for ; Sun, 17 Jan 2016 23:11:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 634AA20109 for ; Sun, 17 Jan 2016 23:11:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753265AbcAQXLI (ORCPT ); Sun, 17 Jan 2016 18:11:08 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:35785 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753191AbcAQXLE (ORCPT ); Sun, 17 Jan 2016 18:11:04 -0500 Received: by mail-wm0-f68.google.com with SMTP id 123so6167374wmz.2; Sun, 17 Jan 2016 15:11:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=iGISjda6tfb2AjbK+NJRNIT553gu7ZwO5F4Y1/qAaQQ=; b=I3SDr1Z9/9Ty0OESc24FXVf+mHkhwUU90tWt3hWXTfUrn4WKC5mI9sIA3qkq30XvFa h5RGzG/jRn+RN/zJasKpOBBydARlD71XeG4BB+UwLTFJ73efjyDnXLlNj1p4DHWxT4V8 btSL4iO7Awk3nn5Q3EbzHg4uVg+in5ZbfBLaQa91nANCp5X9UcwavJLPSprhaEa+MIBr BUj9wpijzBZCX4zx0AZQ/dlBZXx0Z2b4zVwF5cDTJZTqD9yguqhkqjmRA95LIdbG3BLo HXAIKW/k9oFk8B74DGZl4xQ7LEbu6Gm3yoHfwiKzyQmxHlHyWoseM4g8gQhF5o/ux7tW vPXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=iGISjda6tfb2AjbK+NJRNIT553gu7ZwO5F4Y1/qAaQQ=; b=DV+ggRsXSlRykzaiI4Hr5woSdA58aBSd12WY2oExGu/Knde9CAcdkvTHJTo/FeBJuB CVOd8WiKLtldQAWrp3O2krQSy8iP3W0TOFPOhy6my1QmGfG6+JLVK8ztmHfb8bkVBQqj Ko5aXDxD1UXkUNsdAgtxvA49Lcp8/hLB9DDN/wOFpjpACXl331UZzJhcE9+8okdUZb8t XZ0Z9xrSsR1R3cAlmtOKIFkxt5rjeRM6TFzH1N5gthbuSnGxm/Yno17Kps4EZ7rhxD5Q He0fZumJUQ94+OBOGjBt1X44GQHcWeYZt2ISSRmnQvM5YhltQxhpSF1Olu2GhXkXH1iX 0IDQ== X-Gm-Message-State: AG10YOQcQCAHSK2QgiHUwPHU1XuF7+BAdDXN5EdhobQ84mJnfIiGzQ73v4wOue7DupTtWA== X-Received: by 10.28.98.133 with SMTP id w127mr9495026wmb.4.1453072263296; Sun, 17 Jan 2016 15:11:03 -0800 (PST) Received: from csslayer.info ([2a02:2ca0:64:8e::3]) by smtp.gmail.com with ESMTPSA id cv10sm21008577wjb.17.2016.01.17.15.11.02 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 17 Jan 2016 15:11:02 -0800 (PST) From: Weng Xuetian To: Chen Yu Cc: Darren Hart , linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, Weng Xuetian Subject: [PATCH v5] surface pro 4: Add support for Surface Pro 4 Buttons Date: Sun, 17 Jan 2016 15:10:38 -0800 Message-Id: <1453072238-14789-1-git-send-email-wengxt@gmail.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1452627835-20806-1-git-send-email-wengxt@gmail.com> References: <1452627835-20806-1-git-send-email-wengxt@gmail.com> Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Surface Pro 4 buttons are managed by a device with _HID "MSHW0040" different from Surface Pro 3. This commit adds MSHW0040 to id list to support the Surface Pro 4. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=109871 Signed-off-by: Weng Xuetian Acked-by: Chen Yu --- v5: - rename device name macro as required by Chen Yu v4: - Do not rename the driver. v3: - Fix commit message grammar mistakes. v2: - Reformat patch with -M -C --- drivers/platform/x86/Kconfig | 4 ++-- drivers/platform/x86/surfacepro3_button.c | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 1089eaa..ea76d67 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -940,8 +940,8 @@ config INTEL_PMC_IPC with other entities in the CPU. config SURFACE_PRO3_BUTTON - tristate "Power/home/volume buttons driver for Microsoft Surface Pro 3 tablet" + tristate "Power/home/volume buttons driver for Microsoft Surface Pro 3/4 tablet" depends on ACPI && INPUT ---help--- - This driver handles the power/home/volume buttons on the Microsoft Surface Pro 3 tablet. + This driver handles the power/home/volume buttons on the Microsoft Surface Pro 3/4 tablet. endif # X86_PLATFORM_DEVICES diff --git a/drivers/platform/x86/surfacepro3_button.c b/drivers/platform/x86/surfacepro3_button.c index f7dade3..b9c38f6 100644 --- a/drivers/platform/x86/surfacepro3_button.c +++ b/drivers/platform/x86/surfacepro3_button.c @@ -1,6 +1,6 @@ /* * power/home/volume button support for - * Microsoft Surface Pro 3 tablet. + * Microsoft Surface Pro 3/4 tablet. * * Copyright (c) 2015 Intel Corporation. * All rights reserved. @@ -19,9 +19,10 @@ #include #include -#define SURFACE_BUTTON_HID "MSHW0028" +#define SURFACE_PRO3_BUTTON_HID "MSHW0028" +#define SURFACE_PRO4_BUTTON_HID "MSHW0040" #define SURFACE_BUTTON_OBJ_NAME "VGBI" -#define SURFACE_BUTTON_DEVICE_NAME "Surface Pro 3 Buttons" +#define SURFACE_BUTTON_DEVICE_NAME "Surface Pro 3/4 Buttons" #define SURFACE_BUTTON_NOTIFY_PRESS_POWER 0xc6 #define SURFACE_BUTTON_NOTIFY_RELEASE_POWER 0xc7 @@ -54,7 +55,8 @@ MODULE_LICENSE("GPL v2"); * acpi_driver. */ static const struct acpi_device_id surface_button_device_ids[] = { - {SURFACE_BUTTON_HID, 0}, + {SURFACE_PRO3_BUTTON_HID, 0}, + {SURFACE_PRO4_BUTTON_HID, 0}, {"", 0}, }; MODULE_DEVICE_TABLE(acpi, surface_button_device_ids);