From patchwork Mon Dec 6 06:34:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai-Heng Feng X-Patchwork-Id: 1563831 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=ttrLcgCX; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4J6twz4XY2z9sRR for ; Mon, 6 Dec 2021 17:36:03 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mu7bM-000882-Jc; Mon, 06 Dec 2021 06:35:52 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mu7bK-00086B-W1 for kernel-team@lists.ubuntu.com; Mon, 06 Dec 2021 06:35:51 +0000 Received: from localhost.localdomain (unknown [10.101.196.174]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id 006F3404AB for ; Mon, 6 Dec 2021 06:35:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638772550; bh=yY6iJHXgfmsGkpY8K5k5p78SNTkLPfiNcU/1qKQqUeM=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ttrLcgCXP9I7O4XVlTrRfG7alIaj8ELvE+Q8ps3HOk7/x6VCsiKJ6zTj/FbZRwxA9 bfoM9UthrpjVcyNImOEHbaB/YbCm7ApXiTyEyiF0pLYHXQ5fNOLYsvr4K0J0Ppe2D2 ntDa4Us5+0MNNPu86oAHpuYOYJCQOkP06LItK77isdKJf+9JBCVj0a3NjD023jeI/6 KnhD/ggdsXehxCiOUMGh51neHk8Zj2h4hECekT8xeFFOX+Vs+2iH3Q5veIsarY+N56 G5WnofPGHdTwll4W8DXb1DHPWkUkxcbaWbm9fPmUxxwrwgVbp04rVYly6n6TXmFDIa 4YNHDgPDwJB3Q== From: Kai-Heng Feng To: kernel-team@lists.ubuntu.com Subject: [OEM-5.14] [PATCH 3/4] platform/x86: Rename wmaa-backlight-wmi to nvidia-wmi-ec-backlight Date: Mon, 6 Dec 2021 14:34:54 +0800 Message-Id: <20211206063457.1522003-5-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211206063457.1522003-1-kai.heng.feng@canonical.com> References: <20211206063457.1522003-1-kai.heng.feng@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Daniel Dadap BugLink: https://bugs.launchpad.net/bugs/1953286 Rename the wmaa-backlight-wmi driver and associated KConfig option to remove the remaining references to the "WMAA" ACPI handle which was used in the previous name. The driver has already been updated to remove internal references to "WMAA". As part of the renaming, the components in the name have been rearranged to reflect the standard vendor_wmi_feature pattern. Signed-off-by: Daniel Dadap Link: https://lore.kernel.org/r/20210927202359.13684-2-ddadap@nvidia.com Signed-off-by: Hans de Goede (backported from commit ca16d33bd86246bf91d089c8ba78b9b214574b12) Signed-off-by: Kai-Heng Feng --- MAINTAINERS | 12 ++++++------ drivers/platform/x86/Kconfig | 15 +++++++-------- drivers/platform/x86/Makefile | 2 +- ...-backlight-wmi.c => nvidia-wmi-ec-backlight.c} | 0 4 files changed, 14 insertions(+), 15 deletions(-) rename drivers/platform/x86/{wmaa-backlight-wmi.c => nvidia-wmi-ec-backlight.c} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 9d22d199d61a1..28464aac5adbb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13291,6 +13291,12 @@ S: Maintained F: drivers/video/fbdev/nvidia/ F: drivers/video/fbdev/riva/ +NVIDIA WMI EC BACKLIGHT DRIVER +M: Daniel Dadap +L: platform-driver-x86@vger.kernel.org +S: Supported +F: drivers/platform/x86/nvidia-wmi-ec-backlight.c + NVM EXPRESS DRIVER M: Keith Busch M: Jens Axboe @@ -20037,12 +20043,6 @@ L: linux-wireless@vger.kernel.org S: Odd fixes F: drivers/net/wireless/wl3501* -WMAA BACKLIGHT DRIVER -M: Daniel Dadap -L: platform-driver-x86@vger.kernel.org -S: Supported -F: drivers/platform/x86/wmaa-backlight-wmi.c - WOLFSON MICROELECTRONICS DRIVERS L: patches@opensource.cirrus.com S: Supported diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 516b812a4fd79..952f224b5fc5e 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -113,21 +113,20 @@ config PEAQ_WMI help Say Y here if you want to support WMI-based hotkeys on PEAQ 2-in-1s. -config WMAA_BACKLIGHT_WMI - tristate "ACPI WMAA Backlight Driver" +config NVIDIA_WMI_EC_BACKLIGHT + tristate "EC Backlight Driver for Hybrid Graphics Notebook Systems" depends on ACPI_WMI depends on BACKLIGHT_CLASS_DEVICE help - This driver provides a sysfs backlight interface for notebook - systems which expose the WMAA ACPI method and an associated WMI - wrapper to drive LCD backlight levels through the Embedded Controller - (EC). + This driver provides a sysfs backlight interface for notebook systems + which are equipped with NVIDIA hybrid graphics and drive LCD backlight + levels through the Embedded Controller (EC). Say Y or M here if you want to control the backlight on a notebook - system with an EC-driven backlight using the ACPI WMAA method. + system with an EC-driven backlight. If you choose to compile this driver as a module the module will be - called wmaa-backlight-wmi. + called nvidia-wmi-ec-backlight. config XIAOMI_WMI tristate "Xiaomi WMI key driver" diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index 109c1714237dd..802c203b7619b 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -13,8 +13,8 @@ obj-$(CONFIG_HUAWEI_WMI) += huawei-wmi.o obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE) += intel-wmi-sbl-fw-update.o obj-$(CONFIG_INTEL_WMI_THUNDERBOLT) += intel-wmi-thunderbolt.o obj-$(CONFIG_MXM_WMI) += mxm-wmi.o +obj-$(CONFIG_NVIDIA_WMI_EC_BACKLIGHT) += nvidia-wmi-ec-backlight.o obj-$(CONFIG_PEAQ_WMI) += peaq-wmi.o -obj-$(CONFIG_WMAA_BACKLIGHT_WMI) += wmaa-backlight-wmi.o obj-$(CONFIG_XIAOMI_WMI) += xiaomi-wmi.o obj-$(CONFIG_GIGABYTE_WMI) += gigabyte-wmi.o diff --git a/drivers/platform/x86/wmaa-backlight-wmi.c b/drivers/platform/x86/nvidia-wmi-ec-backlight.c similarity index 100% rename from drivers/platform/x86/wmaa-backlight-wmi.c rename to drivers/platform/x86/nvidia-wmi-ec-backlight.c