diff options
| author | Victor Ryabukhin <vryabukhin@nvidia.com> | 2011-12-19 18:13:45 +0900 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2011-12-21 15:07:09 +0530 |
| commit | e21e0cddefc0e2132f3e8cac0a3d49539272fa47 (patch) | |
| tree | caa65df9d66fcef60074fd3b2ff885a64c9f58d3 | |
| parent | 84999d5fd590dc0af9c3f84f1af50d1f757f7d8a (diff) | |
ARM: Tegra: Rename clk_dev2 to cdev2
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>
| -rw-r--r-- | arch/arm/mach-tegra/board-aruba.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-whistler.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/tegra2_clocks.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/board-aruba.c b/arch/arm/mach-tegra/board-aruba.c index 90d022b1535b..dec2efc022aa 100644 --- a/arch/arm/mach-tegra/board-aruba.c +++ b/arch/arm/mach-tegra/board-aruba.c @@ -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 diff --git a/arch/arm/mach-tegra/board-whistler.c b/arch/arm/mach-tegra/board-whistler.c index 9a7fd69eb4b2..e396c184be97 100644 --- a/arch/arm/mach-tegra/board-whistler.c +++ b/arch/arm/mach-tegra/board-whistler.c @@ -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[] = { diff --git a/arch/arm/mach-tegra/tegra2_clocks.c b/arch/arm/mach-tegra/tegra2_clocks.c index 4fd892cc5dc6..3457d951f6c7 100644 --- a/arch/arm/mach-tegra/tegra2_clocks.c +++ b/arch/arm/mach-tegra/tegra2_clocks.c @@ -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); |