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=-20.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 7FAC1C4338F for ; Thu, 19 Aug 2021 09:29:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 60E0C61100 for ; Thu, 19 Aug 2021 09:29:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237216AbhHSJaM (ORCPT ); Thu, 19 Aug 2021 05:30:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:24786 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237526AbhHSJaM (ORCPT ); Thu, 19 Aug 2021 05:30:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629365374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=f+zm4Agz83gN++c6BAm7lqBB7TbF6xYzg3VELgKEpHo=; b=JUcoKpkTE05s5c4i0/qYUENn5Qj5mZTqJW+k0eVBwmuWqc7Vs+zDf7sigYLwoX/BjVOGcs ig5Azi5EW4Km+7o8tfPzFuRmhct2/j5tmcket+I68EpH/1u/KUQdAgVqVIIHHdDvKsXpPJ e4Nm++ZRUhtaEvH7BjiDoUITSZKKbbA= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-252-Agy9rQIQOqWMe2_JjfKEAg-1; Thu, 19 Aug 2021 05:29:33 -0400 X-MC-Unique: Agy9rQIQOqWMe2_JjfKEAg-1 Received: by mail-ej1-f70.google.com with SMTP id k12-20020a170906680cb02905aeccdbd1efso2009334ejr.9 for ; Thu, 19 Aug 2021 02:29:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=f+zm4Agz83gN++c6BAm7lqBB7TbF6xYzg3VELgKEpHo=; b=hYvstAiUI3orJFt42YFWyiAcrf4x9lqha6JYn07canD0zYPKYRXfBjELPEctoxEtA6 jHzc42Is9EJeSt9K1YoWAjv0UreJiABXhu9UAtwB65TlnJDhjuPJeosBG+wfG/776CMf NR3RhuUt9cFmmTiLB2+vwykhkKipSvYnXSSuFSAlN5TvxhmDYJSx/3p0pCGRBjfBKiKW /xajiD/TkaAPv/BfM4eDMSOpMxwCIGMXk36EVc/fo0kb0TONNGLlqvNtAIjWvFR2BLG9 YA5hED2XbDr6fjPyVR34cFWt/uyvcb7AdiFu02iSDA5ArcUv54b5ZsALD7Xe75OL/0Es xfQQ== X-Gm-Message-State: AOAM530SKy+6URXyGT6AycclcJq93guRXlKbsm983SC9vBxVrM6rrlo4 R42b8vWaFTlIgBvuWF8JbEN0KeHhnpWDiIRmeUuEOC0y0chJSSc67ITO2VMOHD9UpKiAWmr/ozs hNA2B0V6/Eaw4k38ClXn7WhgQhtHEsNt9x2vPWAleRRJAvEV9HNlJJHhRUHnbBtgFpLam0NPcvD SpfjgGBi2pAw== X-Received: by 2002:a05:6402:35c9:: with SMTP id z9mr15339180edc.249.1629365371719; Thu, 19 Aug 2021 02:29:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyfmq56c+VmPRS1YwYoFqrKw3LNseox11TEdcU1cjo4/HuBQLmoQYMSHJ+m/5xKMKL8hBe27w== X-Received: by 2002:a05:6402:35c9:: with SMTP id z9mr15339169edc.249.1629365371571; Thu, 19 Aug 2021 02:29:31 -0700 (PDT) Received: from x1.localdomain (2001-1c00-0c1e-bf00-1054-9d19-e0f0-8214.cable.dynamic.v6.ziggo.nl. [2001:1c00:c1e:bf00:1054:9d19:e0f0:8214]) by smtp.gmail.com with ESMTPSA id sa21sm1000669ejb.108.2021.08.19.02.29.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 19 Aug 2021 02:29:31 -0700 (PDT) Subject: Re: [PATCH v3 20/20] platform/x86: intel-wmi-thunderbolt: Move to intel sub-directory To: Kate Hsuan , Alex Hung , Mark Gross , Srinivas Pandruvada , AceLan Kao , Jithu Joseph , Maurice Ma , Sujith Thomas , Rajneesh Bhardwaj , Zha Qipeng , Mika Westerberg , "David E . Box" , linux-kernel@vger.kernel.org, Dell.Client.Kernel@dell.com Cc: platform-driver-x86@vger.kernel.org References: <20210819033001.20136-1-hpa@redhat.com> <20210819033001.20136-21-hpa@redhat.com> From: Hans de Goede Message-ID: Date: Thu, 19 Aug 2021 11:29:30 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210819033001.20136-21-hpa@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Hi, On 8/19/21 5:30 AM, Kate Hsuan wrote: > Move intel-wmi-thunderbolt to intel sub-directory to improve > readability. > > Signed-off-by: Kate Hsuan > --- > drivers/platform/x86/Kconfig | 12 ------------ > drivers/platform/x86/Makefile | 2 -- > drivers/platform/x86/intel/Makefile | 1 + > drivers/platform/x86/intel/wmi/Kconfig | 12 ++++++++++++ > drivers/platform/x86/intel/wmi/Makefile | 2 ++ > .../wmi/thunderbolt.c} | 0 > 6 files changed, 15 insertions(+), 14 deletions(-) > rename drivers/platform/x86/{intel-wmi-thunderbolt.c => intel/wmi/thunderbolt.c} (100%) > > diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig > index 611930985b1d..adecdc0d4748 100644 > --- a/drivers/platform/x86/Kconfig > +++ b/drivers/platform/x86/Kconfig > @@ -77,18 +77,6 @@ config UV_SYSFS > To compile this driver as a module, choose M here: the module will > be called uv_sysfs. > > -config INTEL_WMI_THUNDERBOLT > - tristate "Intel WMI thunderbolt force power driver" > - depends on ACPI_WMI > - help > - Say Y here if you want to be able to use the WMI interface on select > - systems to force the power control of Intel Thunderbolt controllers. > - This is useful for updating the firmware when devices are not plugged > - into the controller. > - > - To compile this driver as a module, choose M here: the module will > - be called intel-wmi-thunderbolt. > - > config MXM_WMI > tristate "WMI support for MXM Laptop Graphics" > depends on ACPI_WMI > diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile > index 0a6dca068d5a..56cff979428b 100644 > --- a/drivers/platform/x86/Makefile > +++ b/drivers/platform/x86/Makefile > @@ -10,8 +10,6 @@ obj-$(CONFIG_WMI_BMOF) += wmi-bmof.o > > # WMI drivers > obj-$(CONFIG_HUAWEI_WMI) += huawei-wmi.o > - > -obj-$(CONFIG_INTEL_WMI_THUNDERBOLT) += intel-wmi-thunderbolt.o > obj-$(CONFIG_MXM_WMI) += mxm-wmi.o > obj-$(CONFIG_PEAQ_WMI) += peaq-wmi.o > obj-$(CONFIG_XIAOMI_WMI) += xiaomi-wmi.o > diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile > index 0b27be3b9334..2c1bab610499 100644 > --- a/drivers/platform/x86/intel/Makefile > +++ b/drivers/platform/x86/intel/Makefile > @@ -50,3 +50,4 @@ obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += speed_select_if/ > > #WMI drivers > obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE) += wmi/ > +obj-$(CONFIG_INTEL_WMI_THUNDERBOLT) += wmi/ Here we have the issue of sending "make" twice into the same subdir again. I've fixed this by adding a CONFIG_INTEL_WMI, similar to how I fixed the same issue for the atomisp2 drivers. I have made these changes while merging the series there is no need for a new version. Regards, Hans > diff --git a/drivers/platform/x86/intel/wmi/Kconfig b/drivers/platform/x86/intel/wmi/Kconfig > index fc70728e0f1f..0d65fc90f5b1 100644 > --- a/drivers/platform/x86/intel/wmi/Kconfig > +++ b/drivers/platform/x86/intel/wmi/Kconfig > @@ -12,3 +12,15 @@ config INTEL_WMI_SBL_FW_UPDATE > > To compile this driver as a module, choose M here: the module will > be called intel-wmi-sbl-fw-update. > + > +config INTEL_WMI_THUNDERBOLT > + tristate "Intel WMI thunderbolt force power driver" > + depends on ACPI_WMI > + help > + Say Y here if you want to be able to use the WMI interface on select > + systems to force the power control of Intel Thunderbolt controllers. > + This is useful for updating the firmware when devices are not plugged > + into the controller. > + > + To compile this driver as a module, choose M here: the module will > + be called intel-wmi-thunderbolt. > diff --git a/drivers/platform/x86/intel/wmi/Makefile b/drivers/platform/x86/intel/wmi/Makefile > index bf1f118b6839..c2d56d25dea0 100644 > --- a/drivers/platform/x86/intel/wmi/Makefile > +++ b/drivers/platform/x86/intel/wmi/Makefile > @@ -5,3 +5,5 @@ > > intel-wmi-sbl-fw-update-y := sbl-fw-update.o > obj-$(CONFIG_INTEL_WMI_SBL_FW_UPDATE) += intel-wmi-sbl-fw-update.o > +intel-wmi-thunderbolt-y := thunderbolt.o > +obj-$(CONFIG_INTEL_WMI_THUNDERBOLT) += intel-wmi-thunderbolt.o > diff --git a/drivers/platform/x86/intel-wmi-thunderbolt.c b/drivers/platform/x86/intel/wmi/thunderbolt.c > similarity index 100% > rename from drivers/platform/x86/intel-wmi-thunderbolt.c > rename to drivers/platform/x86/intel/wmi/thunderbolt.c >