]> rtime.felk.cvut.cz Git - hercules2020/nv-tegra/linux-4.4.git/commitdiff
clk: tegra: ispb shares mux/div with isp
authorPeter De Schrijver <pdeschrijver@nvidia.com>
Thu, 17 Nov 2016 10:41:29 +0000 (12:41 +0200)
committermobile promotions <svcmobile_promotions@nvidia.com>
Tue, 29 Nov 2016 09:18:30 +0000 (01:18 -0800)
Model this by making ispb a child of isp.

Bug 1798951

Change-Id: I025fab97c46cd476628491cf84fff4e7bb4a4576
Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Reviewed-on: http://git-master/r/1255521
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Jon Mayo <jmayo@nvidia.com>
Reviewed-by: Wenjia Zhou <wenjiaz@nvidia.com>
Reviewed-by: Frank Chen <frankc@nvidia.com>
Tested-by: Frank Chen <frankc@nvidia.com>
Reviewed-by: Jihoon Bang <jbang@nvidia.com>
drivers/clk/tegra/clk-tegra-periph.c

index 46aa2027e572be021411ff97e167d7492a227ef2..c004839904ed6c09bc13925939e74152eb04e4e3 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2012-2016, 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,
@@ -848,7 +848,7 @@ static struct tegra_periph_init_data gate_clks[] = {
        GATE("xusb_dev", "xusb_dev_src", 95, 0, tegra_clk_xusb_dev, 0),
        GATE("emc", "emc_mux", 57, 0, tegra_clk_emc, CLK_IGNORE_UNUSED),
        GATE("sata_cold", "clk_m", 129, TEGRA_PERIPH_ON_APB, tegra_clk_sata_cold, 0),
-       GATE("ispb", "clk_m", 3, 0, tegra_clk_ispb, 0),
+       GATE("ispb", "isp", 3, 0, tegra_clk_ispb, 0),
        GATE("vim2_clk", "clk_m", 11, 0, tegra_clk_vim2_clk, 0),
        GATE("pcie", "clk_m", 70, 0, tegra_clk_pcie, 0),
        GATE("dpaux", "clk_m", 181, 0, tegra_clk_dpaux, 0),