diff options
| author | Mohit Kataria <mkataria@nvidia.com> | 2012-06-20 10:59:37 +0530 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-07-17 16:11:41 -0700 |
| commit | 6b33cd0cf0d4aea214382797c43a0e4077e4c4a7 (patch) | |
| tree | 4b5ac03b200d9a17eeb1fa0d8eb3974dc2112fbf | |
| parent | d56e0d7285cd01e28af9d65e6ca456da96eaefda (diff) | |
ARM: Tegra3: clocks: optional se.cbus
Made se.cbus optional so that se clock can be derived
from other clocks and not just from the clocks which drive cbus.
Added config option for the same.
Bug 978870
Change-Id: I7b5bf405efb58bbb53143f52d2bfe0ebcf6b8322
Signed-off-by: Mohit Kataria <mkataria@nvidia.com>
Reviewed-on: http://git-master/r/110827
(cherry picked from commit 35e9017b79a3a4b4e0b4098cd2e63ad24018d3de)
Reviewed-on: http://git-master/r/106397
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/Kconfig | 20 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/tegra3_clocks.c | 2 |
2 files changed, 22 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index e94c2f03187b..ed35a91c575c 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -1,3 +1,17 @@ +# Copyright (c) 2012, NVIDIA CORPORATION. All rights reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms and conditions of the GNU General Public License, +# version 2, as published by the Free Software Foundation. +# +# This program is distributed in the hope it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + if ARCH_TEGRA comment "NVIDIA Tegra options" @@ -410,6 +424,12 @@ config TEGRA_EMC_TO_DDR_CLOCK default "2" if ARCH_TEGRA_2x_SOC default "1" +config TEGRA_SE_ON_CBUS + bool "To Drive SE clock from cbus" + default y + help + This option enables SE clock to be derived from cbus + config TEGRA_CONVSERVATIVE_GOV_ON_EARLYSUPSEND bool "Use conservative cpu frequency governor when device enters early suspend" depends on HAS_EARLYSUSPEND && CPU_FREQ diff --git a/arch/arm/mach-tegra/tegra3_clocks.c b/arch/arm/mach-tegra/tegra3_clocks.c index d9ebb1140a9e..40030cb00e3a 100644 --- a/arch/arm/mach-tegra/tegra3_clocks.c +++ b/arch/arm/mach-tegra/tegra3_clocks.c @@ -4434,7 +4434,9 @@ struct clk tegra_list_clks[] = { SHARED_CLK("epp.cbus", "tegra_gr2d", "epp", &tegra_clk_cbus, "epp", 0, 0), SHARED_CLK("mpe.cbus", "tegra_mpe", "mpe", &tegra_clk_cbus, "mpe", 0, 0), SHARED_CLK("vde.cbus", "tegra-avp", "vde", &tegra_clk_cbus, "vde", 0, 0), +#ifdef CONFIG_TEGRA_SE_ON_CBUS SHARED_CLK("se.cbus", "tegra-se", NULL, &tegra_clk_cbus, "se", 0, 0), +#endif SHARED_CLK("cap.cbus", "cap.cbus", NULL, &tegra_clk_cbus, NULL, 0, SHARED_CEILING), SHARED_CLK("floor.cbus", "floor.cbus", NULL, &tegra_clk_cbus, NULL, 0, 0), }; |