From 5bb16ca568c130d817a6b6d4d91b04705b95d200 Mon Sep 17 00:00:00 2001 From: Matt Wagantall Date: Thu, 19 Apr 2012 11:34:01 -0700 Subject: [PATCH] msm: clock-8x60: Map ppss_p_clk to the msm_dsps device ppss_p_clk is used by the msm_dsps device, so mark it as such. Also change the string name of the clock to "iface_clk" to match the naming convention used for other clocks. Change-Id: I035e6832a346561a999b6ea791754feb709a3bca Signed-off-by: Matt Wagantall --- arch/arm/mach-msm/clock-8x60.c | 2 +- arch/arm/mach-msm/devices-msm8x60.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-msm/clock-8x60.c b/arch/arm/mach-msm/clock-8x60.c index 6c23c50b16e..53dbebef9a2 100644 --- a/arch/arm/mach-msm/clock-8x60.c +++ b/arch/arm/mach-msm/clock-8x60.c @@ -3576,7 +3576,7 @@ static struct clk_lookup msm_clocks_8x60[] = { CLK_LOOKUP("iface_clk", gsbi12_p_clk.c, ""), CLK_LOOKUP("iface_clk", gsbi12_p_clk.c, "msm_serial_hsl.0"), CLK_LOOKUP("iface_clk", gsbi12_p_clk.c, "qup_i2c.5"), - CLK_LOOKUP("ppss_pclk", ppss_p_clk.c, ""), + CLK_LOOKUP("iface_clk", ppss_p_clk.c, "msm_dsps"), CLK_LOOKUP("iface_clk", tsif_p_clk.c, "msm_tsif.0"), CLK_LOOKUP("iface_clk", tsif_p_clk.c, "msm_tsif.1"), CLK_LOOKUP("iface_clk", usb_fs1_p_clk.c, ""), diff --git a/arch/arm/mach-msm/devices-msm8x60.c b/arch/arm/mach-msm/devices-msm8x60.c index 608ca27a116..614f6ffc384 100644 --- a/arch/arm/mach-msm/devices-msm8x60.c +++ b/arch/arm/mach-msm/devices-msm8x60.c @@ -1591,7 +1591,7 @@ static void dsps_init1(struct msm_dsps_platform_data *data) static struct dsps_clk_info dsps_clks[] = { { - .name = "ppss_pclk", + .name = "iface_clk", .rate = 0, /* no rate just on/off */ }, {