summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorSeshagir.H <sholi@nvidia.com>2014-05-22 13:35:02 +0530
committerMatthew Pedro <mapedro@nvidia.com>2015-05-04 13:44:41 -0700
commit28c9354b7cbade8813e0e5dbe9937300219fbeb9 (patch)
treed8293233fe6188425bce048476aa59ca8a6dd98c /arch
parent8eadba170693964dc30b1e6ab0a80df012858bc0 (diff)
mmc: sdhci: tegra: update T2T and Tap hole for VCM30T124
bug 200007291 Change-Id: Ia1d8d4c8ea67a30c61e4178863e2f6f1bcb13753 Signed-off-by: Seshagir.H <sholi@nvidia.com> Reviewed-on: http://git-master/r/413049 (cherry picked from commit 7564df85908c98b8fd6e5835cb02262091057d4e) Reviewed-on: http://git-master/r/725517 GVS: Gerrit_Virtual_Submit Reviewed-by: Jeetesh Burman <jburman@nvidia.com> Tested-by: Jeetesh Burman <jburman@nvidia.com> Reviewed-by: Naveen Kumar Arepalli <naveenk@nvidia.com> Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-tegra/tegra12_clocks.c7
-rw-r--r--arch/arm/mach-tegra/tegra12_speedo.c6
2 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/tegra12_clocks.c b/arch/arm/mach-tegra/tegra12_clocks.c
index bb738a86b51a..27571cc881b9 100644
--- a/arch/arm/mach-tegra/tegra12_clocks.c
+++ b/arch/arm/mach-tegra/tegra12_clocks.c
@@ -9033,6 +9033,13 @@ void tegra_edp_throttle_cpu_now(u8 factor)
bool tegra_clk_is_parent_allowed(struct clk *c, struct clk *p)
{
/*
+ * Ideally, this function should be a look-up table for permissions
+ * based on SKU. For now, allowing all combinations for Automotive SKU.
+ */
+ if (tegra_is_soc_automotive_speedo())
+ return true;
+
+ /*
* Most of the Tegra12 multimedia and peripheral muxes include pll_c2
* and pll_c3 as possible inputs. However, per clock policy these plls
* are allowed to be used only by handful devices aggregated on cbus.
diff --git a/arch/arm/mach-tegra/tegra12_speedo.c b/arch/arm/mach-tegra/tegra12_speedo.c
index 0faeb54bcf59..70eed60b97a9 100644
--- a/arch/arm/mach-tegra/tegra12_speedo.c
+++ b/arch/arm/mach-tegra/tegra12_speedo.c
@@ -367,6 +367,12 @@ static int get_enable_app_profiles(char *val, const struct kernel_param *kp)
return param_get_uint(val, kp);
}
+bool tegra_is_soc_automotive_speedo(void)
+{
+ return (tegra_soc_speedo_id() == 2);
+}
+EXPORT_SYMBOL(tegra_is_soc_automotive_speedo);
+
static struct kernel_param_ops tegra_profiles_ops = {
.get = get_enable_app_profiles,
};