From patchwork Thu Jun 17 18:30:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 12329203 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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 B45B4C48BE5 for ; Thu, 17 Jun 2021 18:30:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9AF81610A5 for ; Thu, 17 Jun 2021 18:30:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232649AbhFQSdA (ORCPT ); Thu, 17 Jun 2021 14:33:00 -0400 Received: from mga17.intel.com ([192.55.52.151]:17452 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231674AbhFQSc7 (ORCPT ); Thu, 17 Jun 2021 14:32:59 -0400 IronPort-SDR: IczcYC352r3TbDe9ZLQbb1S4Yu48ih4Exu4BkZDcVCuiO8lEP62fUyGnzL1WWsOFpMGq7VRM5J OEmImWZvtglw== X-IronPort-AV: E=McAfee;i="6200,9189,10018"; a="186807543" X-IronPort-AV: E=Sophos;i="5.83,281,1616482800"; d="scan'208";a="186807543" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jun 2021 11:30:50 -0700 IronPort-SDR: TXyR17xtMuYpevbI812ZGnup2NQnwPfVlmTWsubnPrV+hPTMzyBGx1YaOzJeoGvdoQJv3WMpmU daMJF/KsuNSA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,281,1616482800"; d="scan'208";a="452870205" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga008.fm.intel.com with ESMTP; 17 Jun 2021 11:30:48 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id DC075262; Thu, 17 Jun 2021 21:31:12 +0300 (EEST) From: Andy Shevchenko To: Hans de Goede , Mario Limonciello , Andy Shevchenko , Daniel Scally , Heikki Krogerus , linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org Cc: Mark Gross Subject: [PATCH v1 1/4] platform/x86: Remove "default n" entries Date: Thu, 17 Jun 2021 21:30:28 +0300 Message-Id: <20210617183031.70685-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Linus already once did that for PDx86, don't repeat our mistakes. TL;DR: 'n' *is* the default 'default'. Signed-off-by: Andy Shevchenko --- drivers/platform/x86/Kconfig | 1 - drivers/platform/x86/dell/Kconfig | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 4fd792f2a10a..ccb827b57f1f 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -1092,7 +1092,6 @@ config TOUCHSCREEN_DMI config FW_ATTR_CLASS tristate - default n config INTEL_IMR bool "Intel Isolated Memory Region support" diff --git a/drivers/platform/x86/dell/Kconfig b/drivers/platform/x86/dell/Kconfig index 9b0a4d080f43..9e7314d90bea 100644 --- a/drivers/platform/x86/dell/Kconfig +++ b/drivers/platform/x86/dell/Kconfig @@ -5,7 +5,6 @@ menuconfig X86_PLATFORM_DRIVERS_DELL bool "Dell X86 Platform Specific Device Drivers" - default n depends on X86_PLATFORM_DEVICES help Say Y here to get to see options for device drivers for various From patchwork Thu Jun 17 18:30:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 12329207 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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 4CCD7C49EA3 for ; Thu, 17 Jun 2021 18:30:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 34AAF613AA for ; Thu, 17 Jun 2021 18:30:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233176AbhFQSdC (ORCPT ); Thu, 17 Jun 2021 14:33:02 -0400 Received: from mga17.intel.com ([192.55.52.151]:17452 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233149AbhFQSdB (ORCPT ); Thu, 17 Jun 2021 14:33:01 -0400 IronPort-SDR: YtJaaXpDXaAJyClg4CZ0Y4PqYQQbBMAsJ5+J0pVK5cqCa9SD8cayNIAG3SSV8cWbocLLNQl30/ qgxigTCgqDwQ== X-IronPort-AV: E=McAfee;i="6200,9189,10018"; a="186807546" X-IronPort-AV: E=Sophos;i="5.83,281,1616482800"; d="scan'208";a="186807546" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jun 2021 11:30:50 -0700 IronPort-SDR: +iXi/ZHyLbdkBYnEeZSRtHbHRTYwrStw7bsae02tiWsGPX1UQpp4azQtasjbBEMZwe5uC/9pcy b+6Rmb36iluw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,281,1616482800"; d="scan'208";a="479549183" Received: from black.fi.intel.com ([10.237.72.28]) by FMSMGA003.fm.intel.com with ESMTP; 17 Jun 2021 11:30:48 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id E4C2423A; Thu, 17 Jun 2021 21:31:12 +0300 (EEST) From: Andy Shevchenko To: Hans de Goede , Mario Limonciello , Andy Shevchenko , Daniel Scally , Heikki Krogerus , linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org Cc: Mark Gross Subject: [PATCH v1 2/4] platform/x86: intel_skl_int3472: Fix dependencies (drop CLKDEV_LOOKUP) Date: Thu, 17 Jun 2021 21:30:29 +0300 Message-Id: <20210617183031.70685-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210617183031.70685-1-andriy.shevchenko@linux.intel.com> References: <20210617183031.70685-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Besides the fact that COMMON_CLK selects CLKDEV_LOOKUP, the latter is going to be removed from clock framework. Signed-off-by: Andy Shevchenko Reviewed-by: Daniel Scally --- drivers/platform/x86/intel-int3472/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/platform/x86/intel-int3472/Kconfig b/drivers/platform/x86/intel-int3472/Kconfig index c112878e833b..62e5d4cf9ee5 100644 --- a/drivers/platform/x86/intel-int3472/Kconfig +++ b/drivers/platform/x86/intel-int3472/Kconfig @@ -1,7 +1,7 @@ config INTEL_SKL_INT3472 tristate "Intel SkyLake ACPI INT3472 Driver" depends on ACPI - depends on COMMON_CLK && CLKDEV_LOOKUP + depends on COMMON_CLK depends on I2C depends on GPIOLIB depends on REGULATOR From patchwork Thu Jun 17 18:30:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 12329205 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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 6D254C2B9F4 for ; Thu, 17 Jun 2021 18:30:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4AE30613AA for ; Thu, 17 Jun 2021 18:30:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232067AbhFQSdA (ORCPT ); Thu, 17 Jun 2021 14:33:00 -0400 Received: from mga07.intel.com ([134.134.136.100]:1024 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231855AbhFQSc7 (ORCPT ); Thu, 17 Jun 2021 14:32:59 -0400 IronPort-SDR: CLFKu7rKeamioiCk02DPO8ZS/WO446B148MgfH7anT0RwsCZ1rsuqk/y8HM8so5yZC4v+xNBdj f/u37cG5Mh5w== X-IronPort-AV: E=McAfee;i="6200,9189,10018"; a="270276451" X-IronPort-AV: E=Sophos;i="5.83,281,1616482800"; d="scan'208";a="270276451" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jun 2021 11:30:50 -0700 IronPort-SDR: UAD3dpxy3ynjzkVl+rCLz2MRDeqmkl9L0N6ldsAT4oJwiEbdpkm72tP481kD20pas68Eq3wpD5 4sgU4la/8yjQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,281,1616482800"; d="scan'208";a="421957911" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 17 Jun 2021 11:30:48 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id EE8882DA; Thu, 17 Jun 2021 21:31:12 +0300 (EEST) From: Andy Shevchenko To: Hans de Goede , Mario Limonciello , Andy Shevchenko , Daniel Scally , Heikki Krogerus , linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org Cc: Mark Gross Subject: [PATCH v1 3/4] platform/x86: intel_skl_int3472: Move to intel/ subfolder Date: Thu, 17 Jun 2021 21:30:30 +0300 Message-Id: <20210617183031.70685-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210617183031.70685-1-andriy.shevchenko@linux.intel.com> References: <20210617183031.70685-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Start collecting Intel x86 related drivers in its own subfolder. Move intel_skl_int3472 first. Signed-off-by: Andy Shevchenko --- drivers/platform/x86/Kconfig | 4 ++-- drivers/platform/x86/Makefile | 3 ++- drivers/platform/x86/intel/Kconfig | 21 +++++++++++++++++++ drivers/platform/x86/intel/Makefile | 7 +++++++ .../{intel-int3472 => intel/int3472}/Kconfig | 0 .../{intel-int3472 => intel/int3472}/Makefile | 0 .../intel_skl_int3472_clk_and_regulator.c | 0 .../int3472}/intel_skl_int3472_common.c | 0 .../int3472}/intel_skl_int3472_common.h | 0 .../int3472}/intel_skl_int3472_discrete.c | 0 .../int3472}/intel_skl_int3472_tps68470.c | 0 11 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 drivers/platform/x86/intel/Kconfig create mode 100644 drivers/platform/x86/intel/Makefile rename drivers/platform/x86/{intel-int3472 => intel/int3472}/Kconfig (100%) rename drivers/platform/x86/{intel-int3472 => intel/int3472}/Makefile (100%) rename drivers/platform/x86/{intel-int3472 => intel/int3472}/intel_skl_int3472_clk_and_regulator.c (100%) rename drivers/platform/x86/{intel-int3472 => intel/int3472}/intel_skl_int3472_common.c (100%) rename drivers/platform/x86/{intel-int3472 => intel/int3472}/intel_skl_int3472_common.h (100%) rename drivers/platform/x86/{intel-int3472 => intel/int3472}/intel_skl_int3472_discrete.c (100%) rename drivers/platform/x86/{intel-int3472 => intel/int3472}/intel_skl_int3472_tps68470.c (100%) diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index ccb827b57f1f..79d095c0ab61 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -651,6 +651,8 @@ config THINKPAD_LMI To compile this driver as a module, choose M here: the module will be called think-lmi. +source "drivers/platform/x86/intel/Kconfig" + config INTEL_ATOMISP2_LED tristate "Intel AtomISP2 camera LED driver" depends on GPIOLIB && LEDS_GPIO @@ -709,8 +711,6 @@ config INTEL_CHT_INT33FE device and CONFIG_TYPEC_FUSB302=m and CONFIG_BATTERY_MAX17042=m for Type-C device. -source "drivers/platform/x86/intel-int3472/Kconfig" - config INTEL_HID_EVENT tristate "INTEL HID Event" depends on ACPI diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index a1f64613af71..e03b59ce3f9f 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -66,6 +66,8 @@ obj-$(CONFIG_THINKPAD_ACPI) += thinkpad_acpi.o obj-$(CONFIG_THINKPAD_LMI) += think-lmi.o # Intel +obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL) += intel/ + obj-$(CONFIG_INTEL_ATOMISP2_LED) += intel_atomisp2_led.o obj-$(CONFIG_INTEL_ATOMISP2_PM) += intel_atomisp2_pm.o obj-$(CONFIG_INTEL_CHT_INT33FE) += intel_cht_int33fe.o @@ -76,7 +78,6 @@ obj-$(CONFIG_INTEL_HID_EVENT) += intel-hid.o obj-$(CONFIG_INTEL_INT0002_VGPIO) += intel_int0002_vgpio.o obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o -obj-$(CONFIG_INTEL_SKL_INT3472) += intel-int3472/ obj-$(CONFIG_INTEL_VBTN) += intel-vbtn.o # MSI diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig new file mode 100644 index 000000000000..33f2dab03d3d --- /dev/null +++ b/drivers/platform/x86/intel/Kconfig @@ -0,0 +1,21 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# Intel x86 Platform Specific Drivers +# + +menuconfig X86_PLATFORM_DRIVERS_INTEL + bool "Intel x86 Platform Specific Device Drivers" + default y + help + Say Y here to get to see options for device drivers for + various Intel x86 platforms, including vendor-specific + drivers. This option alone does not add any kernel code. + + If you say N, all options in this submenu will be skipped + and disabled. + +if X86_PLATFORM_DRIVERS_INTEL + +source "drivers/platform/x86/intel/int3472/Kconfig" + +endif # X86_PLATFORM_DRIVERS_INTEL diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile new file mode 100644 index 000000000000..3ac795d810f1 --- /dev/null +++ b/drivers/platform/x86/intel/Makefile @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile for drivers/platform/x86/intel +# Intel x86 Platform-Specific Drivers +# + +obj-$(CONFIG_INTEL_SKL_INT3472) += int3472/ diff --git a/drivers/platform/x86/intel-int3472/Kconfig b/drivers/platform/x86/intel/int3472/Kconfig similarity index 100% rename from drivers/platform/x86/intel-int3472/Kconfig rename to drivers/platform/x86/intel/int3472/Kconfig diff --git a/drivers/platform/x86/intel-int3472/Makefile b/drivers/platform/x86/intel/int3472/Makefile similarity index 100% rename from drivers/platform/x86/intel-int3472/Makefile rename to drivers/platform/x86/intel/int3472/Makefile diff --git a/drivers/platform/x86/intel-int3472/intel_skl_int3472_clk_and_regulator.c b/drivers/platform/x86/intel/int3472/intel_skl_int3472_clk_and_regulator.c similarity index 100% rename from drivers/platform/x86/intel-int3472/intel_skl_int3472_clk_and_regulator.c rename to drivers/platform/x86/intel/int3472/intel_skl_int3472_clk_and_regulator.c diff --git a/drivers/platform/x86/intel-int3472/intel_skl_int3472_common.c b/drivers/platform/x86/intel/int3472/intel_skl_int3472_common.c similarity index 100% rename from drivers/platform/x86/intel-int3472/intel_skl_int3472_common.c rename to drivers/platform/x86/intel/int3472/intel_skl_int3472_common.c diff --git a/drivers/platform/x86/intel-int3472/intel_skl_int3472_common.h b/drivers/platform/x86/intel/int3472/intel_skl_int3472_common.h similarity index 100% rename from drivers/platform/x86/intel-int3472/intel_skl_int3472_common.h rename to drivers/platform/x86/intel/int3472/intel_skl_int3472_common.h diff --git a/drivers/platform/x86/intel-int3472/intel_skl_int3472_discrete.c b/drivers/platform/x86/intel/int3472/intel_skl_int3472_discrete.c similarity index 100% rename from drivers/platform/x86/intel-int3472/intel_skl_int3472_discrete.c rename to drivers/platform/x86/intel/int3472/intel_skl_int3472_discrete.c diff --git a/drivers/platform/x86/intel-int3472/intel_skl_int3472_tps68470.c b/drivers/platform/x86/intel/int3472/intel_skl_int3472_tps68470.c similarity index 100% rename from drivers/platform/x86/intel-int3472/intel_skl_int3472_tps68470.c rename to drivers/platform/x86/intel/int3472/intel_skl_int3472_tps68470.c From patchwork Thu Jun 17 18:30:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 12329209 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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 0B50DC49361 for ; Thu, 17 Jun 2021 18:30:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DCB17610A5 for ; Thu, 17 Jun 2021 18:30:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232971AbhFQSdA (ORCPT ); Thu, 17 Jun 2021 14:33:00 -0400 Received: from mga06.intel.com ([134.134.136.31]:41916 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232046AbhFQSdA (ORCPT ); Thu, 17 Jun 2021 14:33:00 -0400 IronPort-SDR: 1+8jNpWjqZw7/1nktWeQ02rieYU7V2VW+MPdfcIX61CwomdUmpNd5NkH75es0HIT9UFe9Z2o5r dNQzjxL1Koyw== X-IronPort-AV: E=McAfee;i="6200,9189,10018"; a="267575194" X-IronPort-AV: E=Sophos;i="5.83,281,1616482800"; d="scan'208";a="267575194" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jun 2021 11:30:51 -0700 IronPort-SDR: /A6QnV/C6ydYqXLbvM73szmHefaiTET/74wsxacq2VOhMtJKAHVvb5JI+hSfjmcHwaYsZbVE0V HITqWwft7eUw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,281,1616482800"; d="scan'208";a="485381105" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga001.jf.intel.com with ESMTP; 17 Jun 2021 11:30:48 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 03BFB431; Thu, 17 Jun 2021 21:31:12 +0300 (EEST) From: Andy Shevchenko To: Hans de Goede , Mario Limonciello , Andy Shevchenko , Daniel Scally , Heikki Krogerus , linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org Cc: Mark Gross Subject: [PATCH v1 4/4] platform/x86: intel_cht_int33fe: Move to its own subfolder Date: Thu, 17 Jun 2021 21:30:31 +0300 Message-Id: <20210617183031.70685-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210617183031.70685-1-andriy.shevchenko@linux.intel.com> References: <20210617183031.70685-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Since we have started collecting Intel x86 specific drivers in its own folder, Move intel_cht_int33fe to own subfolder there. Signed-off-by: Andy Shevchenko --- drivers/platform/x86/Kconfig | 24 ------------------ drivers/platform/x86/Makefile | 4 --- drivers/platform/x86/intel/Kconfig | 1 + drivers/platform/x86/intel/Makefile | 1 + drivers/platform/x86/intel/int33fe/Kconfig | 25 +++++++++++++++++++ drivers/platform/x86/intel/int33fe/Makefile | 5 ++++ .../int33fe}/intel_cht_int33fe_common.c | 0 .../int33fe}/intel_cht_int33fe_common.h | 0 .../int33fe}/intel_cht_int33fe_microb.c | 0 .../int33fe}/intel_cht_int33fe_typec.c | 0 10 files changed, 32 insertions(+), 28 deletions(-) create mode 100644 drivers/platform/x86/intel/int33fe/Kconfig create mode 100644 drivers/platform/x86/intel/int33fe/Makefile rename drivers/platform/x86/{ => intel/int33fe}/intel_cht_int33fe_common.c (100%) rename drivers/platform/x86/{ => intel/int33fe}/intel_cht_int33fe_common.h (100%) rename drivers/platform/x86/{ => intel/int33fe}/intel_cht_int33fe_microb.c (100%) rename drivers/platform/x86/{ => intel/int33fe}/intel_cht_int33fe_typec.c (100%) diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 79d095c0ab61..7d385c3b2239 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -687,30 +687,6 @@ config INTEL_ATOMISP2_PM To compile this driver as a module, choose M here: the module will be called intel_atomisp2_pm. -config INTEL_CHT_INT33FE - tristate "Intel Cherry Trail ACPI INT33FE Driver" - depends on X86 && ACPI && I2C && REGULATOR - depends on CHARGER_BQ24190=y || (CHARGER_BQ24190=m && m) - depends on USB_ROLES_INTEL_XHCI=y || (USB_ROLES_INTEL_XHCI=m && m) - depends on TYPEC_MUX_PI3USB30532=y || (TYPEC_MUX_PI3USB30532=m && m) - help - This driver add support for the INT33FE ACPI device found on - some Intel Cherry Trail devices. - - There are two kinds of INT33FE ACPI device possible: for hardware - with USB Type-C and Micro-B connectors. This driver supports both. - - The INT33FE ACPI device has a CRS table with I2cSerialBusV2 - resources for Fuel Gauge Controller and (in the Type-C variant) - FUSB302 USB Type-C Controller and PI3USB30532 USB switch. - This driver instantiates i2c-clients for these, so that standard - i2c drivers for these chips can bind to the them. - - If you enable this driver it is advised to also select - CONFIG_BATTERY_BQ27XXX=m or CONFIG_BATTERY_BQ27XXX_I2C=m for Micro-B - device and CONFIG_TYPEC_FUSB302=m and CONFIG_BATTERY_MAX17042=m - for Type-C device. - config INTEL_HID_EVENT tristate "INTEL HID Event" depends on ACPI diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index e03b59ce3f9f..7ee369aab10d 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -70,10 +70,6 @@ obj-$(CONFIG_X86_PLATFORM_DRIVERS_INTEL) += intel/ obj-$(CONFIG_INTEL_ATOMISP2_LED) += intel_atomisp2_led.o obj-$(CONFIG_INTEL_ATOMISP2_PM) += intel_atomisp2_pm.o -obj-$(CONFIG_INTEL_CHT_INT33FE) += intel_cht_int33fe.o -intel_cht_int33fe-objs := intel_cht_int33fe_common.o \ - intel_cht_int33fe_typec.o \ - intel_cht_int33fe_microb.o obj-$(CONFIG_INTEL_HID_EVENT) += intel-hid.o obj-$(CONFIG_INTEL_INT0002_VGPIO) += intel_int0002_vgpio.o obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig index 33f2dab03d3d..f2eef337eb98 100644 --- a/drivers/platform/x86/intel/Kconfig +++ b/drivers/platform/x86/intel/Kconfig @@ -16,6 +16,7 @@ menuconfig X86_PLATFORM_DRIVERS_INTEL if X86_PLATFORM_DRIVERS_INTEL +source "drivers/platform/x86/intel/int33fe/Kconfig" source "drivers/platform/x86/intel/int3472/Kconfig" endif # X86_PLATFORM_DRIVERS_INTEL diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile index 3ac795d810f1..0653055942d5 100644 --- a/drivers/platform/x86/intel/Makefile +++ b/drivers/platform/x86/intel/Makefile @@ -4,4 +4,5 @@ # Intel x86 Platform-Specific Drivers # +obj-$(CONFIG_INTEL_CHT_INT33FE) += int33fe/ obj-$(CONFIG_INTEL_SKL_INT3472) += int3472/ diff --git a/drivers/platform/x86/intel/int33fe/Kconfig b/drivers/platform/x86/intel/int33fe/Kconfig new file mode 100644 index 000000000000..c7efb461d97d --- /dev/null +++ b/drivers/platform/x86/intel/int33fe/Kconfig @@ -0,0 +1,25 @@ +# SPDX-License-Identifier: GPL-2.0-only +config INTEL_CHT_INT33FE + tristate "Intel Cherry Trail ACPI INT33FE Driver" + depends on X86 && ACPI && I2C && REGULATOR + depends on CHARGER_BQ24190=y || (CHARGER_BQ24190=m && m) + depends on USB_ROLES_INTEL_XHCI=y || (USB_ROLES_INTEL_XHCI=m && m) + depends on TYPEC_MUX_PI3USB30532=y || (TYPEC_MUX_PI3USB30532=m && m) + help + This driver add support for the INT33FE ACPI device found on + some Intel Cherry Trail devices. + + There are two kinds of INT33FE ACPI device possible: for hardware + with USB Type-C and Micro-B connectors. This driver supports both. + + The INT33FE ACPI device has a CRS table with I2cSerialBusV2 + resources for Fuel Gauge Controller and (in the Type-C variant) + FUSB302 USB Type-C Controller and PI3USB30532 USB switch. + This driver instantiates i2c-clients for these, so that standard + i2c drivers for these chips can bind to the them. + + If you enable this driver it is advised to also select + CONFIG_BATTERY_BQ27XXX=m or CONFIG_BATTERY_BQ27XXX_I2C=m for Micro-B + device and CONFIG_TYPEC_FUSB302=m and CONFIG_BATTERY_MAX17042=m + for Type-C device. + diff --git a/drivers/platform/x86/intel/int33fe/Makefile b/drivers/platform/x86/intel/int33fe/Makefile new file mode 100644 index 000000000000..cc11183ce179 --- /dev/null +++ b/drivers/platform/x86/intel/int33fe/Makefile @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_INTEL_CHT_INT33FE) += intel_cht_int33fe.o +intel_cht_int33fe-objs := intel_cht_int33fe_common.o \ + intel_cht_int33fe_typec.o \ + intel_cht_int33fe_microb.o diff --git a/drivers/platform/x86/intel_cht_int33fe_common.c b/drivers/platform/x86/intel/int33fe/intel_cht_int33fe_common.c similarity index 100% rename from drivers/platform/x86/intel_cht_int33fe_common.c rename to drivers/platform/x86/intel/int33fe/intel_cht_int33fe_common.c diff --git a/drivers/platform/x86/intel_cht_int33fe_common.h b/drivers/platform/x86/intel/int33fe/intel_cht_int33fe_common.h similarity index 100% rename from drivers/platform/x86/intel_cht_int33fe_common.h rename to drivers/platform/x86/intel/int33fe/intel_cht_int33fe_common.h diff --git a/drivers/platform/x86/intel_cht_int33fe_microb.c b/drivers/platform/x86/intel/int33fe/intel_cht_int33fe_microb.c similarity index 100% rename from drivers/platform/x86/intel_cht_int33fe_microb.c rename to drivers/platform/x86/intel/int33fe/intel_cht_int33fe_microb.c diff --git a/drivers/platform/x86/intel_cht_int33fe_typec.c b/drivers/platform/x86/intel/int33fe/intel_cht_int33fe_typec.c similarity index 100% rename from drivers/platform/x86/intel_cht_int33fe_typec.c rename to drivers/platform/x86/intel/int33fe/intel_cht_int33fe_typec.c