From patchwork Wed Apr 3 16:54:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 13616500 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7103C1514D2; Wed, 3 Apr 2024 17:03:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712163791; cv=none; b=ahSVsZbk9dgm0laHB1GGtoi1g2ACTlBWMCj0FWTKKk+bFCQ6vPQ066saLk/J7wBMjMR9TBLorcbIiFSzpUNwVbAajOgNMwgBS2mLKPzNyK1RQH6F1fjArqW4XBbzYymB4NjVud7BDqQc3wEP+ufVT22R89UaeszBV01gpcm6HZ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712163791; c=relaxed/simple; bh=85DPr1M713nmUHHni9kf5oNPao5iIopZ0TF1O8A9FAM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uA2QDGqkIp0RNmMgjE1uTpSgZl0521FQDc+IsqRu3fC18WOUbImhfviI27k6TkHie63+GB+g7H4Mn18xkYTzhVkVkT6BvVxnyT/aK/AnNoBH63APTSFiV63TFUBzRP+Ws/64RGNH66Swh6zOCZCeAevOGxSfhe5ZUQ+K6xbS2us= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=ST3bhbqQ; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="ST3bhbqQ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712163790; x=1743699790; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=85DPr1M713nmUHHni9kf5oNPao5iIopZ0TF1O8A9FAM=; b=ST3bhbqQDsL+voOVfcuaZuFKSEuRhsCq6r4vWyY4rDD/tbxymdyjBLsG Db8pTPlzZhl8ZwMIDKoiL7kFzwefBvGqkNw9M7EAPbxBVU+buIrwxWqxj R9e1VHfZI5dpeFaw6JEn6qfWnFnaddkdbkp3LxwNc8JHUGNIabv8dh8Bi LTFnP6nOc7bRU9bAAAOkagHSRpZJ2DdWDoCYgBD9zlnZlUsBbCXMwr4c6 Y7KboLzI88jltAmB/AoVaO250khwhKUsWI3VY8iMpUh3CdnPrzLJZPb8k a/o/iS7JCSqe4N+llMs9tajPIUoI1E7QjWwmhUieOHFQLpIAlV1ieJadZ g==; X-CSE-ConnectionGUID: Pz9hPN2jT+e8BuEMO1r87w== X-CSE-MsgGUID: NrW6AjtRR923fIwZd2mQfA== X-IronPort-AV: E=McAfee;i="6600,9927,11033"; a="18861490" X-IronPort-AV: E=Sophos;i="6.07,177,1708416000"; d="scan'208";a="18861490" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Apr 2024 10:03:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,11033"; a="937085334" X-IronPort-AV: E=Sophos;i="6.07,177,1708416000"; d="scan'208";a="937085334" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 03 Apr 2024 10:03:06 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id F2051F4; Wed, 3 Apr 2024 20:03:04 +0300 (EEST) From: Andy Shevchenko To: Zhang Rui , Andy Shevchenko , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Cc: "Rafael J. Wysocki" , Len Brown Subject: [PATCH v1 1/4] ACPI: x86: Introduce a Makefile Date: Wed, 3 Apr 2024 19:54:35 +0300 Message-ID: <20240403170302.1073841-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20240403170302.1073841-1-andriy.shevchenko@linux.intel.com> References: <20240403170302.1073841-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 There will be more modules coming here, so, introduce a separate Makefile and include it in parent one via obj-$(CONFIG_X86). Signed-off-by: Andy Shevchenko --- drivers/acpi/Makefile | 4 +--- drivers/acpi/x86/Makefile | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 drivers/acpi/x86/Makefile diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index d69d5444acdb..0db88aab309f 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -56,9 +56,6 @@ acpi-y += evged.o acpi-y += sysfs.o acpi-y += property.o acpi-$(CONFIG_X86) += acpi_cmos_rtc.o -acpi-$(CONFIG_X86) += x86/apple.o -acpi-$(CONFIG_X86) += x86/utils.o -acpi-$(CONFIG_X86) += x86/s2idle.o acpi-$(CONFIG_DEBUG_FS) += debugfs.o acpi-y += acpi_lpat.o acpi-$(CONFIG_ACPI_FPDT) += acpi_fpdt.o @@ -133,3 +130,4 @@ obj-$(CONFIG_ARM64) += arm64/ obj-$(CONFIG_ACPI_VIOT) += viot.o obj-$(CONFIG_RISCV) += riscv/ +obj-$(CONFIG_X86) += x86/ diff --git a/drivers/acpi/x86/Makefile b/drivers/acpi/x86/Makefile new file mode 100644 index 000000000000..bd17dd2c2c5b --- /dev/null +++ b/drivers/acpi/x86/Makefile @@ -0,0 +1,4 @@ +obj-$(CONFIG_ACPI) += acpi-x86.o +acpi-x86-y += apple.o +acpi-x86-y += s2idle.o +acpi-x86-y += utils.o From patchwork Wed Apr 3 16:54:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 13616499 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 20486152500; Wed, 3 Apr 2024 17:03:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712163791; cv=none; b=hUdgnIAWAZQtKPoywgEvamVSnr0nk8d1N0bn4zmCGpi/uoNQ2a2qY38wZeDaealBPJOAjPMfl+OWwZiBvmglm4+O9L5FxWJ33gl38o+xo8pFKvRw4VqU34wdnkDxrfpQ/fJ8exbB0XBzFVbNCIudou+AHCQ3RFu2zPHT0OJTQug= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712163791; c=relaxed/simple; bh=MhZT0gDEz6dvyjIkYHf74rwRRynWUz9nECCDuK5y9/Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Lm8xtviHdHuRLaMy50koN8D6gbvn2zdUH8bu1acKDK+3i8S8Dt+z8p0p1vmMUjDZkwl8c92PFbfQdzRURPb72EmzMbqq8l/KJDIz0m4D5duj6Cps2/2mTZQiqkLk348yZYKy+EqrS7K6wwp5JTmF6f3BXngX31oHyeLFXHTxTsI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=HNmvHER6; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="HNmvHER6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712163790; x=1743699790; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=MhZT0gDEz6dvyjIkYHf74rwRRynWUz9nECCDuK5y9/Y=; b=HNmvHER6ltHOXpYzUl81nxq2eOax/AWkCcFwZjcZfOrUKaqhf3u0vRZC tGF5sTPHZ3GBMn05JFb3FdAf25aAaGzwifTv0T7eFyf129XOBuw4UfTmu RDObHIVncsUma1VVPKoU5QFVEPcTpLYtpUoDwd4pidHSHpE3WVgSvFGze kJ83OpXqZY5WZI8SCMc8o9YF0d1ngRq37Qk3czfdM0LkmidsgWAe+O40I gTqUmjwUl91qkDajPXRC5qttozctwC/GMq0OhnnRGRPTkq0he9TvlnMgN n67eqyAH9FdGl3bZnpRvUW/K1N3EjbKAFcVVGPK+oIvRLbp7MxdJ8oBEb g==; X-CSE-ConnectionGUID: o5wAKWnZTEyUg9rydM4NPw== X-CSE-MsgGUID: MEWzRE76QI6J3VCcdKQVDA== X-IronPort-AV: E=McAfee;i="6600,9927,11033"; a="18861488" X-IronPort-AV: E=Sophos;i="6.07,177,1708416000"; d="scan'208";a="18861488" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Apr 2024 10:03:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,11033"; a="937085330" X-IronPort-AV: E=Sophos;i="6.07,177,1708416000"; d="scan'208";a="937085330" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 03 Apr 2024 10:03:06 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 0970D57D; Wed, 3 Apr 2024 20:03:05 +0300 (EEST) From: Andy Shevchenko To: Zhang Rui , Andy Shevchenko , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Cc: "Rafael J. Wysocki" , Len Brown Subject: [PATCH v1 2/4] ACPI: x86: Move acpi_cmos_rtc to x86 folder Date: Wed, 3 Apr 2024 19:54:36 +0300 Message-ID: <20240403170302.1073841-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20240403170302.1073841-1-andriy.shevchenko@linux.intel.com> References: <20240403170302.1073841-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 acpi_cmos_rtc is built solely for x86, move it to the respective folder. Signed-off-by: Andy Shevchenko --- drivers/acpi/Makefile | 1 - drivers/acpi/x86/Makefile | 1 + drivers/acpi/{acpi_cmos_rtc.c => x86/cmos_rtc.c} | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename drivers/acpi/{acpi_cmos_rtc.c => x86/cmos_rtc.c} (98%) diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 0db88aab309f..413c18e2bf61 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -55,7 +55,6 @@ acpi-y += event.o acpi-y += evged.o acpi-y += sysfs.o acpi-y += property.o -acpi-$(CONFIG_X86) += acpi_cmos_rtc.o acpi-$(CONFIG_DEBUG_FS) += debugfs.o acpi-y += acpi_lpat.o acpi-$(CONFIG_ACPI_FPDT) += acpi_fpdt.o diff --git a/drivers/acpi/x86/Makefile b/drivers/acpi/x86/Makefile index bd17dd2c2c5b..b97b1bcf8404 100644 --- a/drivers/acpi/x86/Makefile +++ b/drivers/acpi/x86/Makefile @@ -1,4 +1,5 @@ obj-$(CONFIG_ACPI) += acpi-x86.o acpi-x86-y += apple.o +acpi-x86-y += cmos_rtc.o acpi-x86-y += s2idle.o acpi-x86-y += utils.o diff --git a/drivers/acpi/acpi_cmos_rtc.c b/drivers/acpi/x86/cmos_rtc.c similarity index 98% rename from drivers/acpi/acpi_cmos_rtc.c rename to drivers/acpi/x86/cmos_rtc.c index 9b55d1593d16..51643ff6fe5f 100644 --- a/drivers/acpi/acpi_cmos_rtc.c +++ b/drivers/acpi/x86/cmos_rtc.c @@ -15,7 +15,7 @@ #include #include -#include "internal.h" +#include "../internal.h" static const struct acpi_device_id acpi_cmos_rtc_ids[] = { { "PNP0B00" }, From patchwork Wed Apr 3 16:54:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 13616501 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C00E4152E11; Wed, 3 Apr 2024 17:03:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712163793; cv=none; b=rt6PcsqRPl0rWJrdmmVBP2gv80Vc+vzkaqWmsO/HTPEox5LomGVtS2rgChBUpvILOlTzk8jGVAdj2nHC2UaVCkRWOSNEeK0dUw4HE0buqT3qw5AbGbPNaN6BsVfuIzxLNDq5MuSNj3ncwXdsNbfcvws/WY0CSAqVrpagvLK7CDI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712163793; c=relaxed/simple; bh=VEomS2m+Bw/DPtcNvn269fWrjlZB0hREQwVjQOn0ITk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PimLyEHL67szEqNtiJC7i6FNZpphHLOgtNtzwEsEb3xLhAq/Q2L4meDYrACbcg4y7/of9cZAwyJoVgm54A6nzALH8eKR0Xg/LRbkG62ZjbSkfyqa7xB+bu8c6nyn6dAP21bBIkGKlY9zm+S5P0hNO0yXFxaRd+PfxCqVgd9pePQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=GKUZ9a85; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="GKUZ9a85" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712163792; x=1743699792; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=VEomS2m+Bw/DPtcNvn269fWrjlZB0hREQwVjQOn0ITk=; b=GKUZ9a85OfZBONoz2lezCfAgwIkuH8f7vG5NRFBB7XWCr1mTdBs0XppH wGBkUfg7Dq9kdD49u54k3dH/YFD3+V8cyX3wuUgQ7U0InfAz4CenCdnXB ZaUyhCLkVrFbYQjrgt3a94pDm9ZMN/Rb2vjAG0yFizFWGyh5n0cV0nntJ 4vBFROO54VJvwULxJCDeuaTXW1RqHzsG3NFxTkSb3uLCODRKZ/QZdYY4B bxgx46DgN9iButh7fFrA3/xJ7Sus9VG1DS58QHjasEJiQrA2g+cXIClGt EjHUcH4IPgft6Vo5V5hLrqyoQJdamow/YqTnsiTZKeMeQ/6D839foyXdx w==; X-CSE-ConnectionGUID: N8KqgzMpTASsA+x2AJULPQ== X-CSE-MsgGUID: szju7E1MQwOf3a17C7mIaA== X-IronPort-AV: E=McAfee;i="6600,9927,11033"; a="18861492" X-IronPort-AV: E=Sophos;i="6.07,177,1708416000"; d="scan'208";a="18861492" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Apr 2024 10:03:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,11033"; a="937085336" X-IronPort-AV: E=Sophos;i="6.07,177,1708416000"; d="scan'208";a="937085336" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 03 Apr 2024 10:03:06 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 15B61670; Wed, 3 Apr 2024 20:03:05 +0300 (EEST) From: Andy Shevchenko To: Zhang Rui , Andy Shevchenko , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Cc: "Rafael J. Wysocki" , Len Brown Subject: [PATCH v1 3/4] ACPI: x86: Move blacklist to x86 folder Date: Wed, 3 Apr 2024 19:54:37 +0300 Message-ID: <20240403170302.1073841-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20240403170302.1073841-1-andriy.shevchenko@linux.intel.com> References: <20240403170302.1073841-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 blacklist is built solely for x86, move it to the respective folder. Signed-off-by: Andy Shevchenko --- drivers/acpi/Makefile | 1 - drivers/acpi/x86/Makefile | 2 ++ drivers/acpi/{ => x86}/blacklist.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) rename drivers/acpi/{ => x86}/blacklist.c (99%) diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 413c18e2bf61..6f4187a34f41 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -14,7 +14,6 @@ tables.o: $(src)/../../include/$(CONFIG_ACPI_CUSTOM_DSDT_FILE) ; endif obj-$(CONFIG_ACPI) += tables.o -obj-$(CONFIG_X86) += blacklist.o # # ACPI Core Subsystem (Interpreter) diff --git a/drivers/acpi/x86/Makefile b/drivers/acpi/x86/Makefile index b97b1bcf8404..1f3c5fa84f9e 100644 --- a/drivers/acpi/x86/Makefile +++ b/drivers/acpi/x86/Makefile @@ -3,3 +3,5 @@ acpi-x86-y += apple.o acpi-x86-y += cmos_rtc.o acpi-x86-y += s2idle.o acpi-x86-y += utils.o + +obj-$(CONFIG_X86) += blacklist.o diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/x86/blacklist.c similarity index 99% rename from drivers/acpi/blacklist.c rename to drivers/acpi/x86/blacklist.c index a558d24fb788..55214d0a12b1 100644 --- a/drivers/acpi/blacklist.c +++ b/drivers/acpi/x86/blacklist.c @@ -17,7 +17,7 @@ #include #include -#include "internal.h" +#include "../internal.h" #ifdef CONFIG_DMI static const struct dmi_system_id acpi_rev_dmi_table[] __initconst; From patchwork Wed Apr 3 16:54:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 13616502 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 02722152E1A; Wed, 3 Apr 2024 17:03:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712163794; cv=none; b=TuGe2S7+y4NRxH/Xlp3JMiLyCX/7uyqFixgfJVGi3tb/ArlWSNbs0WGpJVZTPDBYHfNDtg0b+yi7v8+UY6prvtXdEAcwqR2IFe+RZOI10K3p2ycHvVlOW0oJEI4QnYkx5WuevJBpUTyKIMq6ROryu6x1VgD5FeRpoL7eiCN2XPk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712163794; c=relaxed/simple; bh=JG8SKbMJF+yqnv0lRb2lHU2ZQzLtD4bWRdMO6yuf/7o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KdgDlyt0o0uC27qcFYn/46DIoOdtDgFODtel+5ebh/OQNQMdd2VW0gT/+NwwbZbi056AeAIaWF7olByRAcFeU3rLdynigRFVM3aWHObsIvwPBhxASeCXZ2TrhbwydDzujJwfdp/kXil3f5sCVX4CvIUqVvFv4XBNID0SMfobfTU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=lIClcxmU; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="lIClcxmU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712163792; x=1743699792; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JG8SKbMJF+yqnv0lRb2lHU2ZQzLtD4bWRdMO6yuf/7o=; b=lIClcxmUWyvLRyPFv4fDn29Q2AoJWkehORw4jpIoAqdD4Y5tFRT3gcoJ ep7YBeLqHcoG62vzCtRpMeKlb3/ZEaW/q9euDTDHl6R9mkI0qkwz3SKj9 DXbkSckwUHpq6ul3mAnW9NL4S2ozgxSNSCXN0dU92dp/k/IcEngA+rf/B R3DY48hx3qBKrbBnAvPXKMHX3Q0v3wm0y2WsO9VjysdkptpY78jtLRzvi Vc2QtMtYeqStt/22eCZQkyNq8iUQs7z/2kVvg8Ui5lF5Uwg3BxPnmMIsD awf3+GhCpYWKBOiu76KmNW2PeR+h4uR7+meoh7awVVF0QXOmWJZtFz3WO Q==; X-CSE-ConnectionGUID: 01Hl3xy1SIyKFGs0GVKpPA== X-CSE-MsgGUID: AtLICwNNT7WeXxnUZBmbgA== X-IronPort-AV: E=McAfee;i="6600,9927,11033"; a="18861495" X-IronPort-AV: E=Sophos;i="6.07,177,1708416000"; d="scan'208";a="18861495" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Apr 2024 10:03:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,11033"; a="937085332" X-IronPort-AV: E=Sophos;i="6.07,177,1708416000"; d="scan'208";a="937085332" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 03 Apr 2024 10:03:06 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 214946F5; Wed, 3 Apr 2024 20:03:05 +0300 (EEST) From: Andy Shevchenko To: Zhang Rui , Andy Shevchenko , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org Cc: "Rafael J. Wysocki" , Len Brown Subject: [PATCH v1 4/4] ACPI: x86: Move LPSS to x86 folder Date: Wed, 3 Apr 2024 19:54:38 +0300 Message-ID: <20240403170302.1073841-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20240403170302.1073841-1-andriy.shevchenko@linux.intel.com> References: <20240403170302.1073841-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 LPSS is built solely for x86, move it to the respective folder. Signed-off-by: Andy Shevchenko --- drivers/acpi/Makefile | 1 - drivers/acpi/x86/Makefile | 1 + drivers/acpi/{acpi_lpss.c => x86/lpss.c} | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename drivers/acpi/{acpi_lpss.c => x86/lpss.c} (99%) diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 6f4187a34f41..39ea5cfa8326 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -45,7 +45,6 @@ acpi-y += ec.o acpi-$(CONFIG_ACPI_DOCK) += dock.o acpi-$(CONFIG_PCI) += pci_root.o pci_link.o pci_irq.o obj-$(CONFIG_ACPI_MCFG) += pci_mcfg.o -acpi-$(CONFIG_PCI) += acpi_lpss.o acpi-y += acpi_apd.o acpi-y += acpi_platform.o acpi-y += acpi_pnp.o diff --git a/drivers/acpi/x86/Makefile b/drivers/acpi/x86/Makefile index 1f3c5fa84f9e..63c99509ed9d 100644 --- a/drivers/acpi/x86/Makefile +++ b/drivers/acpi/x86/Makefile @@ -1,6 +1,7 @@ obj-$(CONFIG_ACPI) += acpi-x86.o acpi-x86-y += apple.o acpi-x86-y += cmos_rtc.o +acpi-x86-$(CONFIG_PCI) += lpss.o acpi-x86-y += s2idle.o acpi-x86-y += utils.o diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/x86/lpss.c similarity index 99% rename from drivers/acpi/acpi_lpss.c rename to drivers/acpi/x86/lpss.c index a3d2d94be5c0..148e29c2c526 100644 --- a/drivers/acpi/acpi_lpss.c +++ b/drivers/acpi/x86/lpss.c @@ -25,7 +25,7 @@ #include #include -#include "internal.h" +#include "../internal.h" #ifdef CONFIG_X86_INTEL_LPSS