From: Jon Hunter <[email protected]> Currently the interface clocks for the two SLIMBUS peripherals are named slimbus1_fck and slimbus2_fck. Rename these clocks to be slimbus1_ick and slimbus2_ick so it is clear that these are interface clocks and not functional clocks.
Signed-off-by: Jon Hunter <[email protected]> --- arch/arm/mach-omap2/clock44xx_data.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c index eb2a345..d75ebdd 100644 --- a/arch/arm/mach-omap2/clock44xx_data.c +++ b/arch/arm/mach-omap2/clock44xx_data.c @@ -2210,8 +2210,8 @@ static struct clk slimbus1_slimbus_clk = { .recalc = &followparent_recalc, }; -static struct clk slimbus1_fck = { - .name = "slimbus1_fck", +static struct clk slimbus1_ick = { + .name = "slimbus1_ick", .ops = &clkops_omap2_dflt, .enable_reg = OMAP4430_CM1_ABE_SLIMBUS_CLKCTRL, .enable_bit = OMAP4430_MODULEMODE_SWCTRL, @@ -2250,8 +2250,8 @@ static struct clk slimbus2_slimbus_clk = { .recalc = &followparent_recalc, }; -static struct clk slimbus2_fck = { - .name = "slimbus2_fck", +static struct clk slimbus2_ick = { + .name = "slimbus2_ick", .ops = &clkops_omap2_dflt, .enable_reg = OMAP4430_CM_L4PER_SLIMBUS2_CLKCTRL, .enable_bit = OMAP4430_MODULEMODE_SWCTRL, @@ -3272,11 +3272,11 @@ static struct omap_clk omap44xx_clks[] = { CLK(NULL, "slimbus1_fclk_0", &slimbus1_fclk_0, CK_443X), CLK(NULL, "slimbus1_fclk_2", &slimbus1_fclk_2, CK_443X), CLK(NULL, "slimbus1_slimbus_clk", &slimbus1_slimbus_clk, CK_443X), - CLK(NULL, "slimbus1_fck", &slimbus1_fck, CK_443X), + CLK(NULL, "slimbus1_ick", &slimbus1_ick, CK_443X), CLK(NULL, "slimbus2_fclk_1", &slimbus2_fclk_1, CK_443X), CLK(NULL, "slimbus2_fclk_0", &slimbus2_fclk_0, CK_443X), CLK(NULL, "slimbus2_slimbus_clk", &slimbus2_slimbus_clk, CK_443X), - CLK(NULL, "slimbus2_fck", &slimbus2_fck, CK_443X), + CLK(NULL, "slimbus2_ick", &slimbus2_ick, CK_443X), CLK(NULL, "smartreflex_core_fck", &smartreflex_core_fck, CK_443X), CLK(NULL, "smartreflex_iva_fck", &smartreflex_iva_fck, CK_443X), CLK(NULL, "smartreflex_mpu_fck", &smartreflex_mpu_fck, CK_443X), -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
