diff options
author | Stephen Warren <swarren@nvidia.com> | 2013-11-07 12:58:21 -0500 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2013-12-11 18:45:13 -0500 |
commit | a85f06badc3cff4069f2f5112cea63cd39d99920 (patch) | |
tree | 1f8550812bcf67687068b9e7e39459658ee02a0c /drivers/clk/tegra | |
parent | 2ae77527bb1a510070d039aaa22d1ae9a5807b6f (diff) |
clk: tegra: remove bogus PCIE_XCLK
The "pcie_xclk" clock is not actually a clock at all, but rather a reset
domain. Now that the custom Tegra module reset API has been removed, we
can remove the definition of any "clocks" that existed solely to support
it.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Acked-By: Peter De Schrijver <pdeschrijver@nvidia.com>
Diffstat (limited to 'drivers/clk/tegra')
-rw-r--r-- | drivers/clk/tegra/clk-tegra20.c | 6 | ||||
-rw-r--r-- | drivers/clk/tegra/clk-tegra30.c | 7 |
2 files changed, 0 insertions, 13 deletions
diff --git a/drivers/clk/tegra/clk-tegra20.c b/drivers/clk/tegra/clk-tegra20.c index 5a6a60d9443a..dbace152b2fa 100644 --- a/drivers/clk/tegra/clk-tegra20.c +++ b/drivers/clk/tegra/clk-tegra20.c | |||
@@ -468,7 +468,6 @@ static struct tegra_devclk devclks[] __initdata = { | |||
468 | { .con_id = "isp", .dev_id = "tegra_camera", .dt_id = TEGRA20_CLK_ISP }, | 468 | { .con_id = "isp", .dev_id = "tegra_camera", .dt_id = TEGRA20_CLK_ISP }, |
469 | { .con_id = "pex", .dt_id = TEGRA20_CLK_PEX }, | 469 | { .con_id = "pex", .dt_id = TEGRA20_CLK_PEX }, |
470 | { .con_id = "afi", .dt_id = TEGRA20_CLK_AFI }, | 470 | { .con_id = "afi", .dt_id = TEGRA20_CLK_AFI }, |
471 | { .con_id = "pcie_xclk", .dt_id = TEGRA20_CLK_PCIE_XCLK }, | ||
472 | { .con_id = "cdev1", .dt_id = TEGRA20_CLK_CDEV1 }, | 471 | { .con_id = "cdev1", .dt_id = TEGRA20_CLK_CDEV1 }, |
473 | { .con_id = "cdev2", .dt_id = TEGRA20_CLK_CDEV2 }, | 472 | { .con_id = "cdev2", .dt_id = TEGRA20_CLK_CDEV2 }, |
474 | { .con_id = "clk_32k", .dt_id = TEGRA20_CLK_CLK_32K }, | 473 | { .con_id = "clk_32k", .dt_id = TEGRA20_CLK_CLK_32K }, |
@@ -834,11 +833,6 @@ static void __init tegra20_periph_clk_init(void) | |||
834 | periph_clk_enb_refcnt); | 833 | periph_clk_enb_refcnt); |
835 | clks[TEGRA20_CLK_PEX] = clk; | 834 | clks[TEGRA20_CLK_PEX] = clk; |
836 | 835 | ||
837 | /* pcie_xclk */ | ||
838 | clk = tegra_clk_register_periph_gate("pcie_xclk", "clk_m", 0, clk_base, | ||
839 | 0, 74, periph_clk_enb_refcnt); | ||
840 | clks[TEGRA20_CLK_PCIE_XCLK] = clk; | ||
841 | |||
842 | /* cdev1 */ | 836 | /* cdev1 */ |
843 | clk = clk_register_fixed_rate(NULL, "cdev1_fixed", NULL, CLK_IS_ROOT, | 837 | clk = clk_register_fixed_rate(NULL, "cdev1_fixed", NULL, CLK_IS_ROOT, |
844 | 26000000); | 838 | 26000000); |
diff --git a/drivers/clk/tegra/clk-tegra30.c b/drivers/clk/tegra/clk-tegra30.c index 2e47383418c8..8b10c38b6e3c 100644 --- a/drivers/clk/tegra/clk-tegra30.c +++ b/drivers/clk/tegra/clk-tegra30.c | |||
@@ -649,7 +649,6 @@ static struct tegra_devclk devclks[] __initdata = { | |||
649 | { .con_id = "isp", .dev_id = "tegra_camera", .dt_id = TEGRA30_CLK_ISP }, | 649 | { .con_id = "isp", .dev_id = "tegra_camera", .dt_id = TEGRA30_CLK_ISP }, |
650 | { .con_id = "pcie", .dev_id = "tegra-pcie", .dt_id = TEGRA30_CLK_PCIE }, | 650 | { .con_id = "pcie", .dev_id = "tegra-pcie", .dt_id = TEGRA30_CLK_PCIE }, |
651 | { .con_id = "afi", .dev_id = "tegra-pcie", .dt_id = TEGRA30_CLK_AFI }, | 651 | { .con_id = "afi", .dev_id = "tegra-pcie", .dt_id = TEGRA30_CLK_AFI }, |
652 | { .con_id = "pciex", .dev_id = "tegra-pcie", .dt_id = TEGRA30_CLK_PCIEX }, | ||
653 | { .con_id = "fuse", .dt_id = TEGRA30_CLK_FUSE }, | 652 | { .con_id = "fuse", .dt_id = TEGRA30_CLK_FUSE }, |
654 | { .con_id = "fuse_burn", .dev_id = "fuse-tegra", .dt_id = TEGRA30_CLK_FUSE_BURN }, | 653 | { .con_id = "fuse_burn", .dev_id = "fuse-tegra", .dt_id = TEGRA30_CLK_FUSE_BURN }, |
655 | { .con_id = "apbif", .dev_id = "tegra30-ahub", .dt_id = TEGRA30_CLK_APBIF }, | 654 | { .con_id = "apbif", .dev_id = "tegra30-ahub", .dt_id = TEGRA30_CLK_APBIF }, |
@@ -1150,11 +1149,6 @@ static void __init tegra30_periph_clk_init(void) | |||
1150 | periph_clk_enb_refcnt); | 1149 | periph_clk_enb_refcnt); |
1151 | clks[TEGRA30_CLK_AFI] = clk; | 1150 | clks[TEGRA30_CLK_AFI] = clk; |
1152 | 1151 | ||
1153 | /* pciex */ | ||
1154 | clk = tegra_clk_register_periph_gate("pciex", "pll_e", 0, clk_base, 0, | ||
1155 | 74, periph_clk_enb_refcnt); | ||
1156 | clks[TEGRA30_CLK_PCIEX] = clk; | ||
1157 | |||
1158 | /* emc */ | 1152 | /* emc */ |
1159 | clk = clk_register_mux(NULL, "emc_mux", mux_pllmcp_clkm, | 1153 | clk = clk_register_mux(NULL, "emc_mux", mux_pllmcp_clkm, |
1160 | ARRAY_SIZE(mux_pllmcp_clkm), | 1154 | ARRAY_SIZE(mux_pllmcp_clkm), |
@@ -1395,7 +1389,6 @@ static struct tegra_clk_duplicate tegra_clk_duplicates[] = { | |||
1395 | TEGRA_CLK_DUPLICATE(TEGRA30_CLK_BSEA, "nvavp", "bsea"), | 1389 | TEGRA_CLK_DUPLICATE(TEGRA30_CLK_BSEA, "nvavp", "bsea"), |
1396 | TEGRA_CLK_DUPLICATE(TEGRA30_CLK_CML1, "tegra_sata_cml", NULL), | 1390 | TEGRA_CLK_DUPLICATE(TEGRA30_CLK_CML1, "tegra_sata_cml", NULL), |
1397 | TEGRA_CLK_DUPLICATE(TEGRA30_CLK_CML0, "tegra_pcie", "cml"), | 1391 | TEGRA_CLK_DUPLICATE(TEGRA30_CLK_CML0, "tegra_pcie", "cml"), |
1398 | TEGRA_CLK_DUPLICATE(TEGRA30_CLK_PCIEX, "tegra_pcie", "pciex"), | ||
1399 | TEGRA_CLK_DUPLICATE(TEGRA30_CLK_VCP, "nvavp", "vcp"), | 1392 | TEGRA_CLK_DUPLICATE(TEGRA30_CLK_VCP, "nvavp", "vcp"), |
1400 | TEGRA_CLK_DUPLICATE(TEGRA30_CLK_CLK_MAX, NULL, NULL), /* MUST be the last entry */ | 1393 | TEGRA_CLK_DUPLICATE(TEGRA30_CLK_CLK_MAX, NULL, NULL), /* MUST be the last entry */ |
1401 | }; | 1394 | }; |