ARM: Tegra: Rename clk_dev2 to cdev2
Victor Ryabukhin [Mon, 19 Dec 2011 09:13:45 +0000 (18:13 +0900)]
Originaly renaming was done in commit ddb7d5d80
However, some of clock names ramained unchanged.
Fixed this.

Bug 917441

Change-Id: I0bac986c0be6e66fc4ae258563091d4c7d9c45c3
Signed-off-by: Victor Ryabukhin <vryabukhin@nvidia.com>
Reviewed-on: http://git-master/r/70973
Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>

arch/arm/mach-tegra/board-aruba.c
arch/arm/mach-tegra/board-whistler.c
arch/arm/mach-tegra/tegra2_clocks.c

index 90d022b..dec2efc 100644 (file)
@@ -103,7 +103,7 @@ static struct tegra_utmip_config utmi_phy_config[] = {
 
 /* !!!FIXME!!! THESE ARE VENTANA SETTINGS */
 static struct tegra_ulpi_config ulpi_phy_config = {
-       .clk = "clk_dev2",
+       .clk = "cdev2",
 };
 
 #ifdef CONFIG_BCM4329_RFKILL
index 9a7fd69..e396c18 100644 (file)
@@ -283,7 +283,7 @@ static struct tegra_utmip_config utmi_phy_config[] = {
 
 static struct tegra_ulpi_config ulpi_phy_config = {
        .reset_gpio = TEGRA_GPIO_PG2,
-       .clk = "clk_dev2",
+       .clk = "cdev2",
 };
 
 static __initdata struct tegra_clk_init_table whistler_clk_init_table[] = {
index 4fd892c..3457d95 100644 (file)
@@ -1430,7 +1430,7 @@ static void tegra2_cdev_clk_set_parent(struct clk *c)
        int val;
 
        /* Get pinmux setting for cdev1 and cdev2 from APB_MISC register */
-       if (!strcmp(c->name, "clk_dev2"))
+       if (!strcmp(c->name, "cdev2"))
                pg = TEGRA_PINGROUP_CDEV2;
 
        val = tegra_pinmux_get_func(pg);