DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "msm: clock-8x60: Map ppss_p_clk to the msm_dsps device" into msm-3.0

Browse Source
This commit is contained in:
Linux Build Service Account
2012-04-24 01:47:50 -07:00
committed by QuIC Gerrit Code Review
parent 3bc3652896 5bb16ca568
commit eeab8591b8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-msm/clock-8x60.c
View File

@@ -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, ""),

2
arch/arm/mach-msm/devices-msm8x60.c
View File

@@ -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 */
},
{