From patchwork Mon Oct 5 16:03:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maximilian Luz X-Patchwork-Id: 11816939 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7A02C6CA for ; Mon, 5 Oct 2020 16:03:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5F1EC2075A for ; Mon, 5 Oct 2020 16:03:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dkZZyMll" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727395AbgJEQDg (ORCPT ); Mon, 5 Oct 2020 12:03:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726760AbgJEQDd (ORCPT ); Mon, 5 Oct 2020 12:03:33 -0400 Received: from mail-ej1-x644.google.com (mail-ej1-x644.google.com [IPv6:2a00:1450:4864:20::644]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 082E4C0613CE; Mon, 5 Oct 2020 09:03:33 -0700 (PDT) Received: by mail-ej1-x644.google.com with SMTP id ce10so12758953ejc.5; Mon, 05 Oct 2020 09:03:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=z9aCwmkE9rVihKPnzER4l7iBu2YQtTm4952+qUhOwyM=; b=dkZZyMllAT9EUL1lcGMdjkhjaJFQJKe3NEE9f/cK6Sk6a/wtXIOgc4F7loeKJtUW5R IkZ3d/9+jod3GJUbj2g+FkRWu6XucR2FxdkHs/atpPG154FB2n2bJAsNRnNn/Kefz625 LLwLEuGFM9mzLasX4iTyI3mTXnlFnYfmJw9AthSosBNw1MwzJ6ZN8BMPZj06m7189Y+p rEpHw8W0kPJ7Wplfg9Wy77ABBm3LwxsmzkjvqozPeEWrFrEgJxubmZQ3L15dn9NQne4s E2v5uAhaMsR5O5NG8UnJetKvnMpj3IGRqILyw44bpOTnhYN/rU2MZwZIGSiHJZBVzMsT OAOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=z9aCwmkE9rVihKPnzER4l7iBu2YQtTm4952+qUhOwyM=; b=f0Nm0qrvz/F9VG6xrlFsLQF3bUVs4iG5DGuZM4ngj16Z86Dfp1boulzG4ldJYo5p49 2z/gwDbPprgPH+H+lcF7qdayrkWklgt0gxnRQJO7YSz8Pzd+z/XLgackcWmK4xtPLdea efHDJswpaF/d6QqQx56xyI/Kv7RlYnTJwUK+hDhQifPupyf6lUw3/xtiPNwROG5+dL2T VlvPGyIvGdym1H9hkGymdOJjrJqrEYOsZky/TD0SJzHu5s8qV1Ww+mOecHb/bESDi/u1 exdlmeEO2/oyehQIrsMaf1RqaPu8mD89YGPGd+6BqO8nL54mCOLUeKktiz3LX5Epn9fd uK6g== X-Gm-Message-State: AOAM531u2rj+v5Rvb4PMZoIpXzh44a1U9SiFx1GzyinRLNxCx5AS1hCR CY4u7ZSlB2KoJh3bzBzoAg3A5UJkHdU= X-Google-Smtp-Source: ABdhPJxm+eOq+ue3YqcxJdp+gpnByPmg3v/9k9O11iHZY3T2+FE78F3AbAKglk3Q7PK92ipRTrLMMA== X-Received: by 2002:a17:906:6855:: with SMTP id a21mr379085ejs.289.1601913811154; Mon, 05 Oct 2020 09:03:31 -0700 (PDT) Received: from xws.fritz.box (pd9e5a952.dip0.t-ipconnect.de. [217.229.169.82]) by smtp.gmail.com with ESMTPSA id y3sm51788ejk.92.2020.10.05.09.03.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Oct 2020 09:03:30 -0700 (PDT) From: Maximilian Luz To: platform-driver-x86@vger.kernel.org Cc: Andy Shevchenko , Darren Hart , Hans de Goede , Mark Gross , Mika Westerberg , Gayatri Kammela , Enric Balletbo i Serra , =?utf-8?q?Bla=C5=BE_?= =?utf-8?q?Hrastnik?= , Stephen Just , Dan Carpenter , Benjamin Tissoires , Chen Yu , linux-kernel@vger.kernel.org, Maximilian Luz Subject: [PATCH v2 1/5] platform: Add Surface platform directory Date: Mon, 5 Oct 2020 18:03:03 +0200 Message-Id: <20201005160307.39201-2-luzmaximilian@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201005160307.39201-1-luzmaximilian@gmail.com> References: <20201005160307.39201-1-luzmaximilian@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org It may make sense to split the Microsoft Surface hardware platform drivers out to a separate subdirectory, since some of it may be shared between ARM and x86 in the future (regarding devices like the Surface Pro X). Further, newer Surface devices will require additional platform drivers for fundamental support (mostly regarding their embedded controller), which may also warrant this split from a size perspective. This commit introduces a new platform/surface subdirectory for the Surface device family, with subsequent commits moving existing Surface drivers over from platform/x86. Signed-off-by: Maximilian Luz --- Changes in v2: - Do not create a separate MAINTAINERS entry for platform/surface. Instead add drivers/platform/surface to x86 platform drivers entry. This incorporates recent changes in the x86 platform driver MAINTAINERS entry. - Fix typo in commit message. --- MAINTAINERS | 1 + drivers/platform/Kconfig | 2 ++ drivers/platform/Makefile | 1 + drivers/platform/surface/Kconfig | 20 ++++++++++++++++++++ drivers/platform/surface/Makefile | 7 +++++++ 5 files changed, 31 insertions(+) create mode 100644 drivers/platform/surface/Kconfig create mode 100644 drivers/platform/surface/Makefile diff --git a/MAINTAINERS b/MAINTAINERS index b1c97a16b6ce..21b4b4c975b3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -18863,6 +18863,7 @@ L: platform-driver-x86@vger.kernel.org S: Maintained T: git git://git.infradead.org/linux-platform-drivers-x86.git F: drivers/platform/olpc/ +F: drivers/platform/surface/ F: drivers/platform/x86/ X86 PLATFORM DRIVERS - ARCH diff --git a/drivers/platform/Kconfig b/drivers/platform/Kconfig index 971426bb4302..18fc6a08569e 100644 --- a/drivers/platform/Kconfig +++ b/drivers/platform/Kconfig @@ -13,3 +13,5 @@ source "drivers/platform/chrome/Kconfig" source "drivers/platform/mellanox/Kconfig" source "drivers/platform/olpc/Kconfig" + +source "drivers/platform/surface/Kconfig" diff --git a/drivers/platform/Makefile b/drivers/platform/Makefile index 6fda58c021ca..af62d93f0e46 100644 --- a/drivers/platform/Makefile +++ b/drivers/platform/Makefile @@ -9,3 +9,4 @@ obj-$(CONFIG_MIPS) += mips/ obj-$(CONFIG_OLPC_EC) += olpc/ obj-$(CONFIG_GOLDFISH) += goldfish/ obj-$(CONFIG_CHROME_PLATFORMS) += chrome/ +obj-$(CONFIG_SURFACE_PLATFORM) += surface/ diff --git a/drivers/platform/surface/Kconfig b/drivers/platform/surface/Kconfig new file mode 100644 index 000000000000..806b088ddae2 --- /dev/null +++ b/drivers/platform/surface/Kconfig @@ -0,0 +1,20 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# Microsoft Surface Platform-Specific Drivers +# + +menuconfig SURFACE_PLATFORM + bool "Microsoft Surface Platform-Specific Device Drivers" + default y + help + Say Y here to get to see options for platform-specific device drivers + for Microsoft Surface devices. This option alone does not add any + kernel code. + + If you say N, all options in this submenu will be skipped and disabled. + +if SURFACE_PLATFORM + +# place Microsoft Surface platform drivers here + +endif # SURFACE_PLATFORM diff --git a/drivers/platform/surface/Makefile b/drivers/platform/surface/Makefile new file mode 100644 index 000000000000..11788a44713f --- /dev/null +++ b/drivers/platform/surface/Makefile @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile for linux/drivers/platform/surface +# Microsoft Surface Platform-Specific Drivers +# + +# place Microsoft Surface platform drivers here From patchwork Mon Oct 5 16:03:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maximilian Luz X-Patchwork-Id: 11816943 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C68676CA for ; Mon, 5 Oct 2020 16:03:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A952C206CB for ; Mon, 5 Oct 2020 16:03:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lF41dGFJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727778AbgJEQDl (ORCPT ); Mon, 5 Oct 2020 12:03:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727654AbgJEQDh (ORCPT ); Mon, 5 Oct 2020 12:03:37 -0400 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C320CC0613CE; Mon, 5 Oct 2020 09:03:35 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id dt13so3372859ejb.12; Mon, 05 Oct 2020 09:03:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QqZlieJiKz7vG6xUay2HjJB344jisx0YbRObfbt2BOc=; b=lF41dGFJJXq/Aap8sKLNLIi8pUKjM/PyBzeE1tA3tu8aOUq+oQNBS0Ya/K/0cNqWMl WtqKK5d6ZlCdTOS/uvJQ9x941qIBFGdoPSdmXLVOIP8X2LJjfXhvdRl18FIR7ONhO9vX gB7UbInCxce8JHstXpdnBrnYm5j1WcNRYQtdi+CnRiPcAZEwp5KoXT9ItVvweLRcpd7R 7SiYyUA0jLtQ1kRndZjos3go5SoyWsz1uYqLnnoRpvyZS7jkg1XkxBF/Ygwhh/J13N/x r05WbMHHnqFO+4pKpGhoOk7tTaV3+2kTJOIKL0+GSqsmnL0MGe5M65jw/3eNgNpUIJt3 WzJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QqZlieJiKz7vG6xUay2HjJB344jisx0YbRObfbt2BOc=; b=bTTOCBrtIei/nOhh1zAk6t4o0k3oSs6TzSnSSMuAgZtuRIsWqI9g2wmuhIGibqwdHj 9ybW5YKJRCuklgwUjRbo9HedsUMvrO/6AvYYbgUCA1CByyTiqmJsmJ8ZkwKcyGEZpiZQ VPOkbkYomZg7AcPVKjvyJJ2fT0Ft0yfmklU76nsyvrb+OT479aLiOe/uq00aV+vDXy6A uR570IX9HN067fWfWgJgzXeJdD2VsusJSL0JNlzCIKijDsCwJUZzjhc8QHogQxQhUTpx WEtUCSEDzbgqeA7HRHXM2lb2B87UxRc05Vlk+H47+l4GiwvY2d/XK0jiTnUBbVg+bIip WX5Q== X-Gm-Message-State: AOAM533RZHwNuo167vrU/jp7Hz1aLZL2+Kn4vGCILiuqdVl7/QMOv1Y1 oQE9JtkmOsfD7VPEKdbFSStehGgEakI= X-Google-Smtp-Source: ABdhPJxswPy963Yar5eeXrZKAqfmYj/jmld7zx4OEkpUeWAh44VHbIVpB66rLNufAPPHu5RNGmUpZA== X-Received: by 2002:a17:906:af75:: with SMTP id os21mr445132ejb.28.1601913812811; Mon, 05 Oct 2020 09:03:32 -0700 (PDT) Received: from xws.fritz.box (pd9e5a952.dip0.t-ipconnect.de. [217.229.169.82]) by smtp.gmail.com with ESMTPSA id y3sm51788ejk.92.2020.10.05.09.03.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Oct 2020 09:03:32 -0700 (PDT) From: Maximilian Luz To: platform-driver-x86@vger.kernel.org Cc: Andy Shevchenko , Darren Hart , Hans de Goede , Mark Gross , Mika Westerberg , Gayatri Kammela , Enric Balletbo i Serra , =?utf-8?q?Bla=C5=BE_?= =?utf-8?q?Hrastnik?= , Stephen Just , Dan Carpenter , Benjamin Tissoires , Chen Yu , linux-kernel@vger.kernel.org, Maximilian Luz Subject: [PATCH v2 2/5] platform/surface: Move Surface 3 WMI driver to platform/surface Date: Mon, 5 Oct 2020 18:03:04 +0200 Message-Id: <20201005160307.39201-3-luzmaximilian@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201005160307.39201-1-luzmaximilian@gmail.com> References: <20201005160307.39201-1-luzmaximilian@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Move the Surface 3 WMI driver from platform/x86 to the newly created platform/surface directory. Signed-off-by: Maximilian Luz --- drivers/platform/surface/Kconfig | 12 +++++++++++- drivers/platform/surface/Makefile | 2 +- drivers/platform/{x86 => surface}/surface3-wmi.c | 0 drivers/platform/x86/Kconfig | 12 ------------ drivers/platform/x86/Makefile | 1 - 5 files changed, 12 insertions(+), 15 deletions(-) rename drivers/platform/{x86 => surface}/surface3-wmi.c (100%) diff --git a/drivers/platform/surface/Kconfig b/drivers/platform/surface/Kconfig index 806b088ddae2..1566b32a1884 100644 --- a/drivers/platform/surface/Kconfig +++ b/drivers/platform/surface/Kconfig @@ -15,6 +15,16 @@ menuconfig SURFACE_PLATFORM if SURFACE_PLATFORM -# place Microsoft Surface platform drivers here +config SURFACE3_WMI + tristate "Surface 3 WMI Driver" + depends on ACPI_WMI + depends on DMI + depends on INPUT + depends on SPI + help + Say Y here if you have a Surface 3. + + To compile this driver as a module, choose M here: the module will + be called surface3-wmi. endif # SURFACE_PLATFORM diff --git a/drivers/platform/surface/Makefile b/drivers/platform/surface/Makefile index 11788a44713f..f889d521420f 100644 --- a/drivers/platform/surface/Makefile +++ b/drivers/platform/surface/Makefile @@ -4,4 +4,4 @@ # Microsoft Surface Platform-Specific Drivers # -# place Microsoft Surface platform drivers here +obj-$(CONFIG_SURFACE3_WMI) += surface3-wmi.o diff --git a/drivers/platform/x86/surface3-wmi.c b/drivers/platform/surface/surface3-wmi.c similarity index 100% rename from drivers/platform/x86/surface3-wmi.c rename to drivers/platform/surface/surface3-wmi.c diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 0d91d136bc3b..0759913c9846 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -870,18 +870,6 @@ config INTEL_VBTN To compile this driver as a module, choose M here: the module will be called intel_vbtn. -config SURFACE3_WMI - tristate "Surface 3 WMI Driver" - depends on ACPI_WMI - depends on DMI - depends on INPUT - depends on SPI - help - Say Y here if you have a Surface 3. - - To compile this driver as a module, choose M here: the module will - be called surface3-wmi. - config SURFACE_3_BUTTON tristate "Power/home/volume buttons driver for Microsoft Surface 3 tablet" depends on ACPI && KEYBOARD_GPIO && I2C diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index 5f823f7eff45..29563a32b3e3 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -82,7 +82,6 @@ obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o obj-$(CONFIG_INTEL_VBTN) += intel-vbtn.o # Microsoft -obj-$(CONFIG_SURFACE3_WMI) += surface3-wmi.o obj-$(CONFIG_SURFACE_3_BUTTON) += surface3_button.o obj-$(CONFIG_SURFACE_3_POWER_OPREGION) += surface3_power.o obj-$(CONFIG_SURFACE_PRO3_BUTTON) += surfacepro3_button.o From patchwork Mon Oct 5 16:03:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maximilian Luz X-Patchwork-Id: 11816941 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C477E6CA for ; Mon, 5 Oct 2020 16:03:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A95FB206DD for ; Mon, 5 Oct 2020 16:03:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HnqTvrDd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726760AbgJEQDh (ORCPT ); Mon, 5 Oct 2020 12:03:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727569AbgJEQDh (ORCPT ); Mon, 5 Oct 2020 12:03:37 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 975CEC0613A8; Mon, 5 Oct 2020 09:03:36 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id lw21so8769383ejb.6; Mon, 05 Oct 2020 09:03:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=P1alwE6/TrOFlXLMswuzb/9hNUWfzhQ0/xjCElKc5HI=; b=HnqTvrDd0Q8fFQWJdXx8pr1sJlWco3wT6ADaz9xEni3iRXOLuwomRW+rCITg5m/WLM HS1dZZz/pY7EYSdKKze0mR28ZLjx6sFaD9qzawGJYORSNMQNrb6Ne/cLh5r053Tmcu0K 4PH4IpIrU0RwrXAkSOdSbnNoeeVKG5gh5DIERPllObCc4Rdf+0mNeWiyzYMkaljd6CbE o7evQdPzDtU3DqUMbudS7yPD8wYre6YzdakUsufw+Tg5CZDCHq6WYFZbEh5YqEUH3gsI nJnToa5OOjhlE7LxDyiVR07SNUyym6Vp3FBGczJLam2Woooti7Bho0iugqCatWGMHP// Hpag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=P1alwE6/TrOFlXLMswuzb/9hNUWfzhQ0/xjCElKc5HI=; b=V3mLUnI1PAfo9hd/Z9MdcpC1CXSqkb0M2uF0Rbg2yGxwP1G6bsykJ/feF/VYMO9mxt MeDqqaqq3GuKnZhNhmK7SI8clexmyXBu+A0jCwfHZ56tl1SQGiTmXtYUoxj/UVtPi028 orvX4i3cbM+rPnM2j0wb84D9xpscfXqTugcvERP2qCRB9DOrurBKnM/cUqcMVvlEFmLz WCjlJTEVj4EwIFh5K4iNJ4IPqos0pIfq2htondWQ0J4rTfZSAGpOsYKh8Jd916Bvs6CZ 2SZxgHF+A8wxHxjLHWBIpVU0sJRgCzv0ZkfIZs1MMbpY27pZxOIXFQrgYEwwrn7bHg6D 8Pog== X-Gm-Message-State: AOAM533eR9p1J/zEL7Q770YyB/H6eqfPcb4r1c3+6QffDz/cpPreN/1a ZPb5JsGZX5BQzcWr9X+gnB68toJBv8s= X-Google-Smtp-Source: ABdhPJwJAxUgOtDt5dMVBYthTbfXqGRoZqexCtKs/YYgEszVdQFp8vo+HT8iSjZa9waocsLu+3KJaw== X-Received: by 2002:a17:906:1e10:: with SMTP id g16mr430678ejj.438.1601913814500; Mon, 05 Oct 2020 09:03:34 -0700 (PDT) Received: from xws.fritz.box (pd9e5a952.dip0.t-ipconnect.de. [217.229.169.82]) by smtp.gmail.com with ESMTPSA id y3sm51788ejk.92.2020.10.05.09.03.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Oct 2020 09:03:33 -0700 (PDT) From: Maximilian Luz To: platform-driver-x86@vger.kernel.org Cc: Andy Shevchenko , Darren Hart , Hans de Goede , Mark Gross , Mika Westerberg , Gayatri Kammela , Enric Balletbo i Serra , =?utf-8?q?Bla=C5=BE_?= =?utf-8?q?Hrastnik?= , Stephen Just , Dan Carpenter , Benjamin Tissoires , Chen Yu , linux-kernel@vger.kernel.org, Maximilian Luz Subject: [PATCH v2 3/5] platform/surface: Move Surface 3 Button driver to platform/surface Date: Mon, 5 Oct 2020 18:03:05 +0200 Message-Id: <20201005160307.39201-4-luzmaximilian@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201005160307.39201-1-luzmaximilian@gmail.com> References: <20201005160307.39201-1-luzmaximilian@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Move the Surface 3 Button driver from platform/x86 to the newly created platform/surface directory. Signed-off-by: Maximilian Luz --- drivers/platform/surface/Kconfig | 6 ++++++ drivers/platform/surface/Makefile | 1 + drivers/platform/{x86 => surface}/surface3_button.c | 0 drivers/platform/x86/Kconfig | 6 ------ drivers/platform/x86/Makefile | 1 - 5 files changed, 7 insertions(+), 7 deletions(-) rename drivers/platform/{x86 => surface}/surface3_button.c (100%) diff --git a/drivers/platform/surface/Kconfig b/drivers/platform/surface/Kconfig index 1566b32a1884..22075ca451b0 100644 --- a/drivers/platform/surface/Kconfig +++ b/drivers/platform/surface/Kconfig @@ -27,4 +27,10 @@ config SURFACE3_WMI To compile this driver as a module, choose M here: the module will be called surface3-wmi. +config SURFACE_3_BUTTON + tristate "Power/home/volume buttons driver for Microsoft Surface 3 tablet" + depends on ACPI && KEYBOARD_GPIO && I2C + help + This driver handles the power/home/volume buttons on the Microsoft Surface 3 tablet. + endif # SURFACE_PLATFORM diff --git a/drivers/platform/surface/Makefile b/drivers/platform/surface/Makefile index f889d521420f..8588dc178245 100644 --- a/drivers/platform/surface/Makefile +++ b/drivers/platform/surface/Makefile @@ -5,3 +5,4 @@ # obj-$(CONFIG_SURFACE3_WMI) += surface3-wmi.o +obj-$(CONFIG_SURFACE_3_BUTTON) += surface3_button.o diff --git a/drivers/platform/x86/surface3_button.c b/drivers/platform/surface/surface3_button.c similarity index 100% rename from drivers/platform/x86/surface3_button.c rename to drivers/platform/surface/surface3_button.c diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 0759913c9846..5fba590a1a67 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -870,12 +870,6 @@ config INTEL_VBTN To compile this driver as a module, choose M here: the module will be called intel_vbtn. -config SURFACE_3_BUTTON - tristate "Power/home/volume buttons driver for Microsoft Surface 3 tablet" - depends on ACPI && KEYBOARD_GPIO && I2C - help - This driver handles the power/home/volume buttons on the Microsoft Surface 3 tablet. - config SURFACE_3_POWER_OPREGION tristate "Surface 3 battery platform operation region support" depends on ACPI && I2C diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index 29563a32b3e3..0fd70d5d2cf3 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -82,7 +82,6 @@ obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o obj-$(CONFIG_INTEL_VBTN) += intel-vbtn.o # Microsoft -obj-$(CONFIG_SURFACE_3_BUTTON) += surface3_button.o obj-$(CONFIG_SURFACE_3_POWER_OPREGION) += surface3_power.o obj-$(CONFIG_SURFACE_PRO3_BUTTON) += surfacepro3_button.o From patchwork Mon Oct 5 16:03:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maximilian Luz X-Patchwork-Id: 11816945 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8E9BC6CA for ; Mon, 5 Oct 2020 16:03:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 73B74206DD for ; Mon, 5 Oct 2020 16:03:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="H+AG5dHv" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727502AbgJEQDv (ORCPT ); Mon, 5 Oct 2020 12:03:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727707AbgJEQDi (ORCPT ); Mon, 5 Oct 2020 12:03:38 -0400 Received: from mail-ej1-x642.google.com (mail-ej1-x642.google.com [IPv6:2a00:1450:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F4163C0613CE; Mon, 5 Oct 2020 09:03:37 -0700 (PDT) Received: by mail-ej1-x642.google.com with SMTP id c22so11424465ejx.0; Mon, 05 Oct 2020 09:03:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DGhCGthpGnpGVEJv/+ZRguWk8wCmOwJoA9fKbUTSkJM=; b=H+AG5dHv93Ve+EOaV05DP3+2fQOseMJpl7DrYzVJvwa1bWQmwFdF6TF24/qvfAjhys PRE6cKzb+50GHa584QvgYCkeXjZWHbk/nY7IKpach6Jnx3j588cOpohL7jthIo47VQdE xNz3er2OZZWvRICLOX6314JI4FXHTO8/wjlxpglzaMj7nRb43KdoTIHwGw8mJVV2VVhm L0KTY6mhEPdspfAESXn6kbPL4ZCdlAjU9FfAMMjkefgK6zpZt05XQV6ttucZySnY7CTw pBno+HXhsUljK6NCTInB5VRbb4/hXtWRs9qK5A+XcceQebjj1UJoTEYQHjalvN9Tfc6j ahDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DGhCGthpGnpGVEJv/+ZRguWk8wCmOwJoA9fKbUTSkJM=; b=eQAyW+fYuxyux9oFAMW6W9I3gr+1LVMgfHBFKiAKU4a3f+hDb5KV65lk0xvnm3/rJw 2ajv5v7dju3v8pFfzkIHKHkd2ScOp/xiikfJEtSKOug/uarkaMm9iMp/v323YCz+OQPJ XP13ZiClUueAwXMEWFzCTslugHvcxz8eLSV5FvPELYo1eUKVKGFUxntWBJyOAx13YFNv QzGKc0IoOVf9/IBTel3uRZWCHjR2wCRBTdvgLCRJV813VmBbE9l4dd4e+xeK9Ibxwr3+ WDBdEe2p3UKfgDkpzWUYEfAXvfPxlysSv9gSPkvlh424CmmjVSOYBcjrG4PDPRvnI4d8 kArA== X-Gm-Message-State: AOAM5311jEOwLjXTDIsZKplLpT1gxT89pai/qy5U/zZ8jJ+5wNiDbiX6 sJ2mtuHf3zarRhNd/QbjesARtXs4Up4= X-Google-Smtp-Source: ABdhPJzPwBJEYEc9s4YUjTTZT8SZU/fBBqj3gJ9pgS+MQ1seJota137+Eu6wSYCA16mWXV2D9+7JJA== X-Received: by 2002:a17:906:7254:: with SMTP id n20mr406762ejk.382.1601913816191; Mon, 05 Oct 2020 09:03:36 -0700 (PDT) Received: from xws.fritz.box (pd9e5a952.dip0.t-ipconnect.de. [217.229.169.82]) by smtp.gmail.com with ESMTPSA id y3sm51788ejk.92.2020.10.05.09.03.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Oct 2020 09:03:35 -0700 (PDT) From: Maximilian Luz To: platform-driver-x86@vger.kernel.org Cc: Andy Shevchenko , Darren Hart , Hans de Goede , Mark Gross , Mika Westerberg , Gayatri Kammela , Enric Balletbo i Serra , =?utf-8?q?Bla=C5=BE_?= =?utf-8?q?Hrastnik?= , Stephen Just , Dan Carpenter , Benjamin Tissoires , Chen Yu , linux-kernel@vger.kernel.org, Maximilian Luz Subject: [PATCH v2 4/5] platform/surface: Move Surface 3 Power OpRegion driver to platform/surface Date: Mon, 5 Oct 2020 18:03:06 +0200 Message-Id: <20201005160307.39201-5-luzmaximilian@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201005160307.39201-1-luzmaximilian@gmail.com> References: <20201005160307.39201-1-luzmaximilian@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Move the Surface 3 Power operation region driver from platform/x86 to the newly created platform/surface directory. Signed-off-by: Maximilian Luz --- drivers/platform/surface/Kconfig | 7 +++++++ drivers/platform/surface/Makefile | 1 + drivers/platform/{x86 => surface}/surface3_power.c | 0 drivers/platform/x86/Kconfig | 7 ------- drivers/platform/x86/Makefile | 1 - 5 files changed, 8 insertions(+), 8 deletions(-) rename drivers/platform/{x86 => surface}/surface3_power.c (100%) diff --git a/drivers/platform/surface/Kconfig b/drivers/platform/surface/Kconfig index 22075ca451b0..2af26379804c 100644 --- a/drivers/platform/surface/Kconfig +++ b/drivers/platform/surface/Kconfig @@ -33,4 +33,11 @@ config SURFACE_3_BUTTON help This driver handles the power/home/volume buttons on the Microsoft Surface 3 tablet. +config SURFACE_3_POWER_OPREGION + tristate "Surface 3 battery platform operation region support" + depends on ACPI && I2C + help + This driver provides support for ACPI operation + region of the Surface 3 battery platform driver. + endif # SURFACE_PLATFORM diff --git a/drivers/platform/surface/Makefile b/drivers/platform/surface/Makefile index 8588dc178245..4940d4db58b2 100644 --- a/drivers/platform/surface/Makefile +++ b/drivers/platform/surface/Makefile @@ -6,3 +6,4 @@ obj-$(CONFIG_SURFACE3_WMI) += surface3-wmi.o obj-$(CONFIG_SURFACE_3_BUTTON) += surface3_button.o +obj-$(CONFIG_SURFACE_3_POWER_OPREGION) += surface3_power.o diff --git a/drivers/platform/x86/surface3_power.c b/drivers/platform/surface/surface3_power.c similarity index 100% rename from drivers/platform/x86/surface3_power.c rename to drivers/platform/surface/surface3_power.c diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 5fba590a1a67..8417ee0178d0 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -870,13 +870,6 @@ config INTEL_VBTN To compile this driver as a module, choose M here: the module will be called intel_vbtn. -config SURFACE_3_POWER_OPREGION - tristate "Surface 3 battery platform operation region support" - depends on ACPI && I2C - help - This driver provides support for ACPI operation - region of the Surface 3 battery platform driver. - config SURFACE_PRO3_BUTTON tristate "Power/home/volume buttons driver for Microsoft Surface Pro 3/4 tablet" depends on ACPI && INPUT diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index 0fd70d5d2cf3..ffa31f57d9a2 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -82,7 +82,6 @@ obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o obj-$(CONFIG_INTEL_VBTN) += intel-vbtn.o # Microsoft -obj-$(CONFIG_SURFACE_3_POWER_OPREGION) += surface3_power.o obj-$(CONFIG_SURFACE_PRO3_BUTTON) += surfacepro3_button.o # MSI From patchwork Mon Oct 5 16:03:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maximilian Luz X-Patchwork-Id: 11816947 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 957D66CA for ; Mon, 5 Oct 2020 16:03:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7B5B0206DD for ; Mon, 5 Oct 2020 16:03:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Ei9Ko36o" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728027AbgJEQDv (ORCPT ); Mon, 5 Oct 2020 12:03:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727224AbgJEQDk (ORCPT ); Mon, 5 Oct 2020 12:03:40 -0400 Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC8D1C0613A7; Mon, 5 Oct 2020 09:03:39 -0700 (PDT) Received: by mail-ed1-x542.google.com with SMTP id p13so4015018edi.7; Mon, 05 Oct 2020 09:03:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YSnkx38z+wZbKzjG3g1MnOT9jVsKnRmjaQJ/DDTPAzU=; b=Ei9Ko36o8OcwevDxebkdZKZOMjQbtBZNZ5DEox2X6gaie+3scRgS4djqjNZU73YW0y I8wowtarZ4dDUeSTB77J8IjIFN5G8VsUO3zbPxaoG1auzcP2oVGNCr+uRYohuLy1RimF 4BCR52O8ABUv9Oh1k5lBCa+UEC4CupC5zHKbZEhQFU6dBaBdet+IiDnezVNGVC8PwqAC O1x7PnFM9Do75Ch84aiNtinqIB9N6vikF3827DHBb74lzctrGsmzWJnD/8i6wrLqUpEv Bho59L6JiZnTl7i9owtJvHZBtl6Q77pjZQ6bKe5L9+VpTUXIcXjl03KPiV+PpJYc9axG lpXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YSnkx38z+wZbKzjG3g1MnOT9jVsKnRmjaQJ/DDTPAzU=; b=un9or2FPT5vPA//GEbU2C3C8YGUTcuiNxXp/LOJznQF1iO/u0ptyb8gWJOtT/WEJkI Zug0+F/exB2FZ1uNnbOwKVJP0xKEybbaDyPUbWBM8iMOF6riZljGTNumunPEWQdSg6il uRPxbeLsnSMk57edvbC7voGUiYtUSTMnYmMO8kKzRk+HKYMrkm26+vk13OdeN6m63C+2 fCqYWJwVvx82HjgLzGMtcuuaDbXfJUvfnRKufZZrorDb4MMT3KTgkRlbMqai5mzsLu3o 7RYNB0VzV4xdZR/S900b5dZRm+BInzAEgsL7eJG2SsTijmTEcNVO63mGMDtYww2liGdl ucqA== X-Gm-Message-State: AOAM530oSsUcWT9Tvrg8LLwnZa9sZ7cei+f11djdDmC/DlUDCDWHTbAv 0WOwpA7W3NNGitExCkfV+cmx5c6IpC0= X-Google-Smtp-Source: ABdhPJx3guHWaqOHXaKXFuEbSYwiSnume7yH5KhMz10m/1yXqwJS8PpQU3s7GuYS71FCgr/4eSeZ9A== X-Received: by 2002:a50:dac1:: with SMTP id s1mr387884edj.74.1601913817935; Mon, 05 Oct 2020 09:03:37 -0700 (PDT) Received: from xws.fritz.box (pd9e5a952.dip0.t-ipconnect.de. [217.229.169.82]) by smtp.gmail.com with ESMTPSA id y3sm51788ejk.92.2020.10.05.09.03.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Oct 2020 09:03:37 -0700 (PDT) From: Maximilian Luz To: platform-driver-x86@vger.kernel.org Cc: Andy Shevchenko , Darren Hart , Hans de Goede , Mark Gross , Mika Westerberg , Gayatri Kammela , Enric Balletbo i Serra , =?utf-8?q?Bla=C5=BE_?= =?utf-8?q?Hrastnik?= , Stephen Just , Dan Carpenter , Benjamin Tissoires , Chen Yu , linux-kernel@vger.kernel.org, Maximilian Luz Subject: [PATCH v2 5/5] platform/surface: Move Surface Pro 3 Button driver to platform/surface Date: Mon, 5 Oct 2020 18:03:07 +0200 Message-Id: <20201005160307.39201-6-luzmaximilian@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201005160307.39201-1-luzmaximilian@gmail.com> References: <20201005160307.39201-1-luzmaximilian@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Move the Surface Pro 3 Button driver from platform/x86 to the newly created platform/surface directory. Signed-off-by: Maximilian Luz --- MAINTAINERS | 2 +- drivers/platform/surface/Kconfig | 6 ++++++ drivers/platform/surface/Makefile | 1 + drivers/platform/{x86 => surface}/surfacepro3_button.c | 0 drivers/platform/x86/Kconfig | 6 ------ drivers/platform/x86/Makefile | 3 --- 6 files changed, 8 insertions(+), 10 deletions(-) rename drivers/platform/{x86 => surface}/surfacepro3_button.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 21b4b4c975b3..57ea792c0ab1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11536,7 +11536,7 @@ MICROSOFT SURFACE PRO 3 BUTTON DRIVER M: Chen Yu L: platform-driver-x86@vger.kernel.org S: Supported -F: drivers/platform/x86/surfacepro3_button.c +F: drivers/platform/surface/surfacepro3_button.c MICROTEK X6 SCANNER M: Oliver Neukum diff --git a/drivers/platform/surface/Kconfig b/drivers/platform/surface/Kconfig index 2af26379804c..fcd80e860132 100644 --- a/drivers/platform/surface/Kconfig +++ b/drivers/platform/surface/Kconfig @@ -40,4 +40,10 @@ config SURFACE_3_POWER_OPREGION This driver provides support for ACPI operation region of the Surface 3 battery platform driver. +config SURFACE_PRO3_BUTTON + 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/4 tablet. + endif # SURFACE_PLATFORM diff --git a/drivers/platform/surface/Makefile b/drivers/platform/surface/Makefile index 4940d4db58b2..dcb1df06d57a 100644 --- a/drivers/platform/surface/Makefile +++ b/drivers/platform/surface/Makefile @@ -7,3 +7,4 @@ obj-$(CONFIG_SURFACE3_WMI) += surface3-wmi.o obj-$(CONFIG_SURFACE_3_BUTTON) += surface3_button.o obj-$(CONFIG_SURFACE_3_POWER_OPREGION) += surface3_power.o +obj-$(CONFIG_SURFACE_PRO3_BUTTON) += surfacepro3_button.o diff --git a/drivers/platform/x86/surfacepro3_button.c b/drivers/platform/surface/surfacepro3_button.c similarity index 100% rename from drivers/platform/x86/surfacepro3_button.c rename to drivers/platform/surface/surfacepro3_button.c diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 8417ee0178d0..6083f8241b7d 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -870,12 +870,6 @@ config INTEL_VBTN To compile this driver as a module, choose M here: the module will be called intel_vbtn. -config SURFACE_PRO3_BUTTON - 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/4 tablet. - config MSI_LAPTOP tristate "MSI Laptop Extras" depends on ACPI diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index ffa31f57d9a2..aeff497e23a5 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -81,9 +81,6 @@ obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o obj-$(CONFIG_INTEL_VBTN) += intel-vbtn.o -# Microsoft -obj-$(CONFIG_SURFACE_PRO3_BUTTON) += surfacepro3_button.o - # MSI obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o obj-$(CONFIG_MSI_WMI) += msi-wmi.o