]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
ARM: tegra12: clock: Add clock for entropy
authorShravani Dingari <shravanid@nvidia.com>
Mon, 27 May 2013 09:57:33 +0000 (15:27 +0530)
committerDan Willemsen <dwillemsen@nvidia.com>
Sat, 14 Sep 2013 20:25:57 +0000 (13:25 -0700)
Added Entropy clock required for Ring Oscillators
used by SE DRBG operation

Bug 1271895

Change-Id: Ic49617e0c43656764f31fae2394e707372ddd531
Signed-off-by: Shravani Dingari <shravanid@nvidia.com>
Reviewed-on: http://git-master/r/231134
Reviewed-by: Venu Byravarasu <vbyravarasu@nvidia.com>
arch/arm/mach-tegra/tegra12_clocks.c

index b5af035e3b345105a48a4904831ab58c7c7e9290..4436df4f38a69b2f8c1f3fe1046c42e4dc400564 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * arch/arm/mach-tegra/tegra12_clocks.c
  *
- * Copyright (C) 2011-2013 NVIDIA Corporation
+ * Copyright (C) 2011-2013 NVIDIA Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -6431,6 +6431,12 @@ static struct clk_mux_sel mux_pllp_pllc_pllm[] = {
        { 0, 0},
 };
 
+static struct clk_mux_sel mux_pllp_clkm1[] = {
+       { .input = &tegra_pll_p, .value = 0},
+       { .input = &tegra_clk_m, .value = 1},
+       { 0, 0},
+};
+
 static struct clk_mux_sel mux_pllp_clkm[] = {
        { .input = &tegra_pll_p, .value = 0},
        { .input = &tegra_clk_m, .value = 3},
@@ -6812,6 +6818,7 @@ struct clk tegra_list_clks[] = {
        PERIPH_CLK("cile",      "vi",                   "cile",  146,   0x61c,  102000000, mux_pllp_pllc_clkm,          MUX | DIV_U71),
        PERIPH_CLK("dsialp",    "tegradc.0",            "dsialp", 147,  0x620,  156000000, mux_pllp_pllc_clkm,          MUX | DIV_U71),
        PERIPH_CLK("dsiblp",    "tegradc.1",            "dsiblp", 148,  0x624,  156000000, mux_pllp_pllc_clkm,          MUX | DIV_U71),
+       PERIPH_CLK("entropy",   "entropy",              NULL, 149,      0x628,  102000000, mux_pllp_clkm1,              MUX | DIV_U71),
 
        PERIPH_CLK("tsensor",   "tegra-tsensor",        NULL,   100,    0x3b8,  216000000, mux_pllp_pllc_clkm_clk32,    MUX | DIV_U71 | PERIPH_ON_APB),
        PERIPH_CLK("actmon",    "actmon",               NULL,   119,    0x3e8,  216000000, mux_pllp_pllc_clk32_clkm,    MUX | DIV_U71),