From: Jeetesh Burman Date: Thu, 18 Jun 2015 05:49:03 +0000 (+0530) Subject: Revert "mmc: sdhci: tegra: update T2T and Tap hole for VCM30T124" X-Git-Tag: tegra-l4t-r21.4~12 X-Git-Url: https://rtime.felk.cvut.cz/gitweb/sojka/nv-tegra/linux-3.10.git/commitdiff_plain/f4b7cea52cbb840d56154ab41772964773a728f1 Revert "mmc: sdhci: tegra: update T2T and Tap hole for VCM30T124" This reverts commit 28c9354b7cbade8813e0e5dbe9937300219fbeb9. Signed-off-by: Jeetesh Burman Change-Id: I4a809d75523513c939fa17a6dbeebee292aec77b Reviewed-on: http://git-master/r/759472 GVS: Gerrit_Virtual_Submit Reviewed-by: Winnie Hsu --- diff --git a/arch/arm/mach-tegra/tegra12_clocks.c b/arch/arm/mach-tegra/tegra12_clocks.c index 27571cc881b..bb738a86b51 100644 --- a/arch/arm/mach-tegra/tegra12_clocks.c +++ b/arch/arm/mach-tegra/tegra12_clocks.c @@ -9032,13 +9032,6 @@ 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 diff --git a/arch/arm/mach-tegra/tegra12_speedo.c b/arch/arm/mach-tegra/tegra12_speedo.c index 70eed60b97a..0faeb54bcf5 100644 --- a/arch/arm/mach-tegra/tegra12_speedo.c +++ b/arch/arm/mach-tegra/tegra12_speedo.c @@ -367,12 +367,6 @@ 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, }; diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index 9c2d1c1508e..18243806212 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -311,15 +311,6 @@ struct tuning_t2t_coeffs t11x_tuning_coeffs[] = { 82, 180096, 238, 444285), }; -struct tuning_t2t_coeffs t12x_automotive_tuning_coeffs[] = { - SET_TUNING_COEFFS("sdhci-tegra.3", 1150, 950, 29, 130687, - 29, 130687, 29, 130687), - SET_TUNING_COEFFS("sdhci-tegra.2", 1150, 950, 37, 148855, - 36, 148855, 37, 148855), - SET_TUNING_COEFFS("sdhci-tegra.0", 1150, 950, 38, 149783, - 38, 149783, 38, 149783), -}; - struct tuning_t2t_coeffs t12x_tuning_coeffs[] = { SET_TUNING_COEFFS("sdhci-tegra.3", 1150, 950, 27, 118295, 27, 118295, 48, 188148), @@ -381,17 +372,6 @@ struct tap_hole_coeffs t11x_tap_hole_coeffs[] = { 221722, 354, 109880), }; -struct tap_hole_coeffs t12x_automotive_tap_hole_coeffs[] = { - SET_TAP_HOLE_COEFFS("sdhci-tegra.3", 198000, 9259, 107053, 9259, - 107053, 9259, 107053), - SET_TAP_HOLE_COEFFS("sdhci-tegra.3", 189000, 9846, 114635, 9846, - 114635, 9846, 114635), - SET_TAP_HOLE_COEFFS("sdhci-tegra.2", 204000, 2956, 27274, 2956, - 27274, 2956, 27274), - SET_TAP_HOLE_COEFFS("sdhci-tegra.0", 204000, 5781, 67417, 5781, - 67417, 5781, 67417), -}; - struct tap_hole_coeffs t12x_tap_hole_coeffs[] = { SET_TAP_HOLE_COEFFS("sdhci-tegra.3", 200000, 1037, 106934, 1037, 106934, 558, 74315),