diff options
author | Bryan Wu <pengw@nvidia.com> | 2014-04-16 15:35:20 -0700 |
---|---|---|
committer | Mandar Padmawar <mpadmawar@nvidia.com> | 2014-07-16 06:28:05 -0700 |
commit | 2f9a881cd19cf7263ed07b327b2c5a2aa4c970eb (patch) | |
tree | e7eb7326596cdc2d667236fa0cd4ed03bdf00ac8 | |
parent | 184d4c3601421f9dfbc2d0314e802009a6b17629 (diff) |
sound: tegra: ahub: add clock settings for T124
Several additional audio clocks need to be initialized before
accessing any audio register, otherwise system will just hard hang.
Probably fastboot bootloader initialize these clocks, which actually
should be handled in driver. We found this issue for U-Boot bringup.
Bug 1482099
Change-Id: Ia7a7c0115bc92a4e98e6f337cf8efc7b2f7a72a0
Signed-off-by: Bryan Wu <pengw@nvidia.com>
Signed-off-by: Prabhu Kuttiyam <pkuttiyam@nvidia.com>
Reviewed-on: http://git-master/r/408429
(cherry picked from commit 2929886db14e9d2ac0e75b282126397970fbf9c9)
Reviewed-on: http://git-master/r/427929
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Winnie Hsu <whsu@nvidia.com>
Reviewed-by: Aleksandr Frid <afrid@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Karan Jhavar <kjhavar@nvidia.com>
-rw-r--r-- | arch/arm/mach-tegra/tegra12_clocks.c | 10 | ||||
-rw-r--r-- | sound/soc/tegra/tegra30_ahub.c | 14 |
2 files changed, 24 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/tegra12_clocks.c b/arch/arm/mach-tegra/tegra12_clocks.c index bfd2cc5d7574..b96c2a91216a 100644 --- a/arch/arm/mach-tegra/tegra12_clocks.c +++ b/arch/arm/mach-tegra/tegra12_clocks.c @@ -8670,6 +8670,16 @@ struct clk_duplicate tegra_clk_duplicates[] = { CLK_DUPLICATE("dam2", NULL, "dam2"), CLK_DUPLICATE("spdif_in", NULL, "spdif_in"), CLK_DUPLICATE("mclk", NULL, "default_mclk"), + CLK_DUPLICATE("amx", NULL, "amx"), + CLK_DUPLICATE("amx1", NULL, "amx1"), + CLK_DUPLICATE("adx", NULL, "adx"), + CLK_DUPLICATE("adx1", NULL, "adx1"), + CLK_DUPLICATE("afc0", NULL, "afc0"), + CLK_DUPLICATE("afc1", NULL, "afc1"), + CLK_DUPLICATE("afc2", NULL, "afc2"), + CLK_DUPLICATE("afc3", NULL, "afc3"), + CLK_DUPLICATE("afc4", NULL, "afc4"), + CLK_DUPLICATE("afc5", NULL, "afc5"), CLK_DUPLICATE("amx", "tegra124-amx.0", NULL), CLK_DUPLICATE("amx1", "tegra124-amx.1", NULL), CLK_DUPLICATE("adx", "tegra124-adx.0", NULL), diff --git a/sound/soc/tegra/tegra30_ahub.c b/sound/soc/tegra/tegra30_ahub.c index dadacb636b64..98995bc58351 100644 --- a/sound/soc/tegra/tegra30_ahub.c +++ b/sound/soc/tegra/tegra30_ahub.c @@ -618,6 +618,20 @@ static const char * const configlink_clocks[] = { #ifndef CONFIG_ARCH_TEGRA_14x_SOC "spdif_in", #endif +#if defined(CONFIG_ARCH_TEGRA_11x_SOC) || defined(CONFIG_ARCH_TEGRA_12x_SOC) + "amx", + "adx", +#endif +#ifdef CONFIG_ARCH_TEGRA_12x_SOC + "amx1", + "adx1", + "afc0", + "afc1", + "afc2", + "afc3", + "afc4", + "afc5", +#endif }; struct of_dev_auxdata ahub_auxdata[] = { |