mirror of
git://nv-tegra.nvidia.com/linux-hwpm.git
synced 2025-12-24 10:13:00 +03:00
tegra: hwpm: th500: Merge hwpm-th500 files in hwpm
This patch carefully merges approved TH500 files from kernel/hwpm-next into this public repo. Bug 4266701 Signed-off-by: Vishal Aslot <vaslot@nvidia.com> Change-Id: Ia869b75e1652c214e32c53f0edb3d4bf709d72f4 Reviewed-on: https://git-master.nvidia.com/r/c/linux-hwpm/+/2972033 Reviewed-by: Vasuki Shankar <vasukis@nvidia.com> Reviewed-by: Seema Khowala <seemaj@nvidia.com> GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
committed by
mobile promotions
parent
54ce334474
commit
c630042921
@@ -32,20 +32,18 @@
|
||||
#include <tegra_hwpm_clk_rst.h>
|
||||
#include <os/linux/debugfs.h>
|
||||
#include <os/linux/driver.h>
|
||||
#if defined(CONFIG_TEGRA_NEXT2_HWPM)
|
||||
#include <os/linux/next2_hwpm_acpi.h>
|
||||
#endif
|
||||
#include <os/linux/acpi.h>
|
||||
|
||||
static const struct of_device_id tegra_soc_hwpm_of_match[] = {
|
||||
{
|
||||
.compatible = "nvidia,t234-soc-hwpm",
|
||||
},
|
||||
{
|
||||
.compatible = "nvidia,th500-soc-hwpm",
|
||||
},
|
||||
#ifdef CONFIG_TEGRA_NEXT1_HWPM
|
||||
#include <os/linux/next1_driver.h>
|
||||
#endif
|
||||
#ifdef CONFIG_TEGRA_NEXT2_HWPM
|
||||
#include <os/linux/next2_driver.h>
|
||||
#endif
|
||||
#ifdef CONFIG_TEGRA_NEXT3_HWPM
|
||||
#include <os/linux/next3_driver.h>
|
||||
#endif
|
||||
@@ -262,7 +260,7 @@ static struct platform_driver tegra_soc_hwpm_pdrv = {
|
||||
.driver = {
|
||||
.name = TEGRA_SOC_HWPM_MODULE_NAME,
|
||||
.of_match_table = of_match_ptr(tegra_soc_hwpm_of_match),
|
||||
#if defined(CONFIG_TEGRA_NEXT2_HWPM) && defined(CONFIG_ACPI)
|
||||
#if defined(CONFIG_ACPI)
|
||||
.acpi_match_table = ACPI_PTR(tegra_hwpm_acpi_match),
|
||||
#endif
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user