mirror of
git://nv-tegra.nvidia.com/linux-hwpm.git
synced 2025-12-25 02:34:23 +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
@@ -30,13 +30,11 @@
|
||||
#include <tegra_hwpm.h>
|
||||
|
||||
#include <hal/t234/t234_init.h>
|
||||
#include <hal/th500/th500_init.h>
|
||||
|
||||
#ifdef CONFIG_TEGRA_NEXT1_HWPM
|
||||
#include <tegra_hwpm_next1_init.h>
|
||||
#endif
|
||||
#ifdef CONFIG_TEGRA_NEXT2_HWPM
|
||||
#include <tegra_hwpm_next2_init.h>
|
||||
#endif
|
||||
#ifdef CONFIG_TEGRA_NEXT3_HWPM
|
||||
#include <tegra_hwpm_next3_init.h>
|
||||
#endif
|
||||
@@ -65,16 +63,20 @@ static int tegra_hwpm_init_chip_ip_structures(struct tegra_soc_hwpm *hwpm,
|
||||
break;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
#if defined(CONFIG_TEGRA_NEXT2_HWPM)
|
||||
err = tegra_hwpm_next2_init_chip_ip_structures(
|
||||
hwpm, chip_id, chip_id_rev);
|
||||
if (err == 0) {
|
||||
/* Execution is for NEXT2 chip */
|
||||
#ifdef CONFIG_TEGRA_TH500_HWPM
|
||||
case 0x50:
|
||||
switch (chip_id_rev) {
|
||||
case 0x0:
|
||||
err = th500_hwpm_init_chip_info(hwpm);
|
||||
break;
|
||||
default:
|
||||
tegra_hwpm_err(hwpm, "Chip 0x%x rev 0x%x not supported",
|
||||
chip_id, chip_id_rev);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
|
||||
default:
|
||||
#if defined(CONFIG_TEGRA_NEXT3_HWPM)
|
||||
err = tegra_hwpm_next3_init_chip_ip_structures(
|
||||
hwpm, chip_id, chip_id_rev);
|
||||
@@ -84,7 +86,7 @@ static int tegra_hwpm_init_chip_ip_structures(struct tegra_soc_hwpm *hwpm,
|
||||
}
|
||||
#endif
|
||||
|
||||
#if !defined(CONFIG_TEGRA_NEXT2_HWPM) && !defined(CONFIG_TEGRA_NEXT3_HWPM)
|
||||
#if !defined(CONFIG_TEGRA_NEXT3_HWPM)
|
||||
tegra_hwpm_err(hwpm, "Chip 0x%x not supported", chip_id);
|
||||
#endif
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user