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

msm: clock: Rename all I2C/SPI clocks to 'core_clk' or "iface_clk"

Browse Source 
Drivers should now use their device names to distinguish between
clocks of the same type rather than the clock name.

Signed-off-by: Matt Wagantall <mattw@codeaurora.org>

Conflicts:

	arch/arm/mach-msm/board-qrdc.c
	arch/arm/mach-msm/board-qt8660.c
This commit is contained in:
Matt Wagantall
2011-08-17 15:44:58 -07:00
committed by Bryan Huntsman
parent 33dbc0052a
commit ac294855f6
16 changed files with 76 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-msm/board-apq8064.c
View File

@@ -188,8 +188,6 @@ static struct msm_ssbi_platform_data apq8064_ssbi_pm8821_pdata __devinitdata = {
static struct msm_i2c_platform_data apq8064_i2c_qup_gsbi4_pdata = {
.clk_freq = 100000,
.src_clk_rate = 24000000,
.clk = "gsbi_qup_clk",
.pclk = "gsbi_pclk",
};
static void __init apq8064_i2c_init(void)

4
arch/arm/mach-msm/board-msm7x27a.c
View File

@@ -1024,15 +1024,11 @@ static void gsbi_qup_i2c_gpio_config(int adap_id, int config_type)
static struct msm_i2c_platform_data msm_gsbi0_qup_i2c_pdata = {
.clk_freq = 100000,
.clk = "gsbi_qup_clk",
.pclk = "gsbi_qup_pclk",
.msm_i2c_config_gpio = gsbi_qup_i2c_gpio_config,
};
static struct msm_i2c_platform_data msm_gsbi1_qup_i2c_pdata = {
.clk_freq = 100000,
.clk = "gsbi_qup_clk",
.pclk = "gsbi_qup_pclk",
.msm_i2c_config_gpio = gsbi_qup_i2c_gpio_config,
};

1
arch/arm/mach-msm/board-msm7x30.c
View File

@@ -5491,7 +5491,6 @@ static void __init msm_device_i2c_2_init(void)
static struct msm_i2c_platform_data qup_i2c_pdata = {
.clk_freq = 384000,
.pclk = "camif_pad_pclk",
.msm_i2c_config_gpio = qup_i2c_gpio_config,
};

8
arch/arm/mach-msm/board-msm8960.c
View File

@@ -2615,32 +2615,24 @@ static void gsbi_qup_i2c_gpio_config(int adap_id, int config_type)
static struct msm_i2c_platform_data msm8960_i2c_qup_gsbi4_pdata = {
.clk_freq = 100000,
.src_clk_rate = 24000000,
.clk = "gsbi_qup_clk",
.pclk = "gsbi_pclk",
.msm_i2c_config_gpio = gsbi_qup_i2c_gpio_config,
};
static struct msm_i2c_platform_data msm8960_i2c_qup_gsbi3_pdata = {
.clk_freq = 100000,
.src_clk_rate = 24000000,
.clk = "gsbi_qup_clk",
.pclk = "gsbi_pclk",
.msm_i2c_config_gpio = gsbi_qup_i2c_gpio_config,
};
static struct msm_i2c_platform_data msm8960_i2c_qup_gsbi10_pdata = {
.clk_freq = 100000,
.src_clk_rate = 24000000,
.clk = "gsbi_qup_clk",
.pclk = "gsbi_pclk",
.msm_i2c_config_gpio = gsbi_qup_i2c_gpio_config,
};
static struct msm_i2c_platform_data msm8960_i2c_qup_gsbi12_pdata = {
.clk_freq = 100000,
.src_clk_rate = 24000000,
.clk = "gsbi_qup_clk",
.pclk = "gsbi_pclk",
.msm_i2c_config_gpio = gsbi_qup_i2c_gpio_config,
};

12
arch/arm/mach-msm/board-msm8x60.c
View File

@@ -2420,48 +2420,36 @@ static void gsbi_qup_i2c_gpio_config(int adap_id, int config_type)
static struct msm_i2c_platform_data msm_gsbi3_qup_i2c_pdata = {
.clk_freq = 384000,
.src_clk_rate = 24000000,
.clk = "gsbi_qup_clk",
.pclk = "gsbi_pclk",
.msm_i2c_config_gpio = gsbi_qup_i2c_gpio_config,
};
static struct msm_i2c_platform_data msm_gsbi4_qup_i2c_pdata = {
.clk_freq = 100000,
.src_clk_rate = 24000000,
.clk = "gsbi_qup_clk",
.pclk = "gsbi_pclk",
.msm_i2c_config_gpio = gsbi_qup_i2c_gpio_config,
};
static struct msm_i2c_platform_data msm_gsbi7_qup_i2c_pdata = {
.clk_freq = 100000,
.src_clk_rate = 24000000,
.clk = "gsbi_qup_clk",
.pclk = "gsbi_pclk",
.msm_i2c_config_gpio = gsbi_qup_i2c_gpio_config,
};
static struct msm_i2c_platform_data msm_gsbi8_qup_i2c_pdata = {
.clk_freq = 100000,
.src_clk_rate = 24000000,
.clk = "gsbi_qup_clk",
.pclk = "gsbi_pclk",
.msm_i2c_config_gpio = gsbi_qup_i2c_gpio_config,
};
static struct msm_i2c_platform_data msm_gsbi9_qup_i2c_pdata = {
.clk_freq = 100000,
.src_clk_rate = 24000000,
.clk = "gsbi_qup_clk",
.pclk = "gsbi_pclk",
.msm_i2c_config_gpio = gsbi_qup_i2c_gpio_config,
};
static struct msm_i2c_platform_data msm_gsbi12_qup_i2c_pdata = {
.clk_freq = 100000,
.src_clk_rate = 24000000,
.clk = "gsbi_qup_clk",
.pclk = "gsbi_pclk",
.use_gsbi_shared_mode = 1,
.msm_i2c_config_gpio = gsbi_qup_i2c_gpio_config,
};

11
arch/arm/mach-msm/clock-7x30.c
View File

@@ -2800,8 +2800,8 @@ static struct clk_local_ownership {
OWN(ROW1, 7, "emdh_clk", emdh_clk, "msm_mddi.1"),
OWN(ROW1, 7, "emdh_pclk", emdh_p_clk, "msm_mddi.1"),
OWN(ROW1, 11, "i2c_clk", i2c_clk, "msm_i2c.0"),
OWN(ROW1, 12, "i2c_clk", i2c_2_clk, "msm_i2c.2"),
OWN(ROW1, 11, "core_clk", i2c_clk, "msm_i2c.0"),
OWN(ROW1, 12, "core_clk", i2c_2_clk, "msm_i2c.2"),
OWN(ROW1, 17, "mdc_clk", mdc_clk, NULL),
OWN(ROW1, 19, "mddi_clk", pmdh_clk, NULL),
OWN(ROW1, 19, "mddi_pclk", pmdh_p_clk, NULL),
@@ -2821,9 +2821,9 @@ static struct clk_local_ownership {
OWN(ROW1, 4, "usb_hs3_core_clk", usb_hs3_core_clk, NULL),
OWN(ROW1, 4, "usb_hs3_pclk", usb_hs3_p_clk, NULL),
OWN(ROW2, 3, "qup_clk", qup_i2c_clk, "qup_i2c.4"),
OWN(ROW2, 1, "spi_clk", spi_clk, NULL),
OWN(ROW2, 1, "spi_pclk", spi_p_clk, NULL),
OWN(ROW2, 3, "core_clk", qup_i2c_clk, "qup_i2c.4"),
OWN(ROW2, 1, "core_clk", spi_clk, "spi_qsd.0"),
OWN(ROW2, 1, "iface_clk", spi_p_clk, "spi_qsd.0"),
OWN(ROW2, 9, "core_clk", uart1_clk, "msm_serial.0"),
OWN(ROW2, 6, "core_clk", uart1dm_clk, "msm_serial_hs.0"),
OWN(ROW2, 8, "core_clk", uart2dm_clk, "msm_serial_hs.1"),
@@ -2833,6 +2833,7 @@ static struct clk_local_ownership {
OWN(APPS3, 6, "cam_m_clk", cam_m_clk, NULL),
OWN(APPS3, 6, "camif_pad_pclk", camif_pad_p_clk, NULL),
OWN(APPS3, 6, "iface_clk", camif_pad_p_clk, "qup_i2c.4"),
OWN(APPS3, 11, "csi_clk", csi0_clk, NULL),
OWN(APPS3, 11, "csi_vfe_clk", csi0_vfe_clk, NULL),
OWN(APPS3, 11, "csi_pclk", csi0_p_clk, NULL),

20
arch/arm/mach-msm/clock-8960.c
View File

@@ -4204,18 +4204,18 @@ static struct clk_lookup msm_clocks_8960_v1[] __initdata = {
CLK_LOOKUP("core_clk", gsbi10_uart_clk.c, NULL),
CLK_LOOKUP("core_clk", gsbi11_uart_clk.c, NULL),
CLK_LOOKUP("core_clk", gsbi12_uart_clk.c, NULL),
CLK_LOOKUP("spi_clk", gsbi1_qup_clk.c, "spi_qsd.0"),
CLK_LOOKUP("core_clk", gsbi1_qup_clk.c, "spi_qsd.0"),
CLK_LOOKUP("gsbi_qup_clk", gsbi2_qup_clk.c, NULL),
CLK_LOOKUP("gsbi_qup_clk", gsbi3_qup_clk.c, "qup_i2c.3"),
CLK_LOOKUP("gsbi_qup_clk", gsbi4_qup_clk.c, "qup_i2c.4"),
CLK_LOOKUP("core_clk", gsbi3_qup_clk.c, "qup_i2c.3"),
CLK_LOOKUP("core_clk", gsbi4_qup_clk.c, "qup_i2c.4"),
CLK_LOOKUP("gsbi_qup_clk", gsbi5_qup_clk.c, NULL),
CLK_LOOKUP("gsbi_qup_clk", gsbi6_qup_clk.c, NULL),
CLK_LOOKUP("gsbi_qup_clk", gsbi7_qup_clk.c, NULL),
CLK_LOOKUP("gsbi_qup_clk", gsbi8_qup_clk.c, NULL),
CLK_LOOKUP("gsbi_qup_clk", gsbi9_qup_clk.c, NULL),
CLK_LOOKUP("gsbi_qup_clk", gsbi10_qup_clk.c, "qup_i2c.10"),
CLK_LOOKUP("core_clk", gsbi10_qup_clk.c, "qup_i2c.10"),
CLK_LOOKUP("gsbi_qup_clk", gsbi11_qup_clk.c, NULL),
CLK_LOOKUP("gsbi_qup_clk", gsbi12_qup_clk.c, "qup_i2c.12"),
CLK_LOOKUP("core_clk", gsbi12_qup_clk.c, "qup_i2c.12"),
CLK_LOOKUP("pdm_clk", pdm_clk.c, NULL),
CLK_LOOKUP("pmem_clk", pmem_clk.c, NULL),
CLK_LOOKUP("prng_clk", prng_clk.c, NULL),
@@ -4238,18 +4238,18 @@ static struct clk_lookup msm_clocks_8960_v1[] __initdata = {
CLK_LOOKUP("ce_pclk", ce1_p_clk.c, NULL),
CLK_LOOKUP("ce_clk", ce1_core_clk.c, NULL),
CLK_LOOKUP("dma_bam_pclk", dma_bam_p_clk.c, NULL),
CLK_LOOKUP("spi_pclk", gsbi1_p_clk.c, "spi_qsd.0"),
CLK_LOOKUP("iface_clk", gsbi1_p_clk.c, "spi_qsd.0"),
CLK_LOOKUP("gsbi_pclk", gsbi2_p_clk.c, NULL),
CLK_LOOKUP("gsbi_pclk", gsbi3_p_clk.c, "qup_i2c.3"),
CLK_LOOKUP("gsbi_pclk", gsbi4_p_clk.c, "qup_i2c.4"),
CLK_LOOKUP("iface_clk", gsbi3_p_clk.c, "qup_i2c.3"),
CLK_LOOKUP("iface_clk", gsbi4_p_clk.c, "qup_i2c.4"),
CLK_LOOKUP("iface_clk", gsbi5_p_clk.c, "msm_serial_hsl.0"),
CLK_LOOKUP("iface_clk", gsbi6_p_clk.c, "msm_serial_hs.0"),
CLK_LOOKUP("gsbi_pclk", gsbi7_p_clk.c, NULL),
CLK_LOOKUP("gsbi_pclk", gsbi8_p_clk.c, NULL),
CLK_LOOKUP("gsbi_pclk", gsbi9_p_clk.c, NULL),
CLK_LOOKUP("gsbi_pclk", gsbi10_p_clk.c, "qup_i2c.10"),
CLK_LOOKUP("iface_clk", gsbi10_p_clk.c, "qup_i2c.10"),
CLK_LOOKUP("gsbi_pclk", gsbi11_p_clk.c, NULL),
CLK_LOOKUP("gsbi_pclk", gsbi12_p_clk.c, "qup_i2c.12"),
CLK_LOOKUP("iface_clk", gsbi12_p_clk.c, "qup_i2c.12"),
CLK_LOOKUP("tsif_pclk", tsif_p_clk.c, NULL),
CLK_LOOKUP("usb_fs_pclk", usb_fs1_p_clk.c, NULL),
CLK_LOOKUP("usb_fs_pclk", usb_fs2_p_clk.c, NULL),

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

@@ -3505,19 +3505,19 @@ static struct clk_lookup msm_clocks_8x60[] = {
CLK_LOOKUP("core_clk", gsbi10_uart_clk.c, NULL),
CLK_LOOKUP("core_clk", gsbi11_uart_clk.c, NULL),
CLK_LOOKUP("core_clk", gsbi12_uart_clk.c, "msm_serial_hsl.0"),
CLK_LOOKUP("spi_clk", gsbi1_qup_clk.c, "spi_qsd.0"),
CLK_LOOKUP("gsbi_qup_clk", gsbi2_qup_clk.c, NULL),
CLK_LOOKUP("gsbi_qup_clk", gsbi3_qup_clk.c, "qup_i2c.0"),
CLK_LOOKUP("gsbi_qup_clk", gsbi4_qup_clk.c, "qup_i2c.1"),
CLK_LOOKUP("gsbi_qup_clk", gsbi5_qup_clk.c, NULL),
CLK_LOOKUP("gsbi_qup_clk", gsbi6_qup_clk.c, NULL),
CLK_LOOKUP("gsbi_qup_clk", gsbi7_qup_clk.c, "qup_i2c.4"),
CLK_LOOKUP("gsbi_qup_clk", gsbi8_qup_clk.c, "qup_i2c.3"),
CLK_LOOKUP("gsbi_qup_clk", gsbi9_qup_clk.c, "qup_i2c.2"),
CLK_LOOKUP("spi_clk", gsbi10_qup_clk.c, "spi_qsd.1"),
CLK_LOOKUP("gsbi_qup_clk", gsbi11_qup_clk.c, NULL),
CLK_LOOKUP("core_clk", gsbi1_qup_clk.c, "spi_qsd.0"),
CLK_LOOKUP("gsbi_qup_clk", gsbi2_qup_clk.c, NULL),
CLK_LOOKUP("core_clk", gsbi3_qup_clk.c, "qup_i2c.0"),
CLK_LOOKUP("core_clk", gsbi4_qup_clk.c, "qup_i2c.1"),
CLK_LOOKUP("gsbi_qup_clk", gsbi5_qup_clk.c, NULL),
CLK_LOOKUP("gsbi_qup_clk", gsbi6_qup_clk.c, NULL),
CLK_LOOKUP("core_clk", gsbi7_qup_clk.c, "qup_i2c.4"),
CLK_LOOKUP("core_clk", gsbi8_qup_clk.c, "qup_i2c.3"),
CLK_LOOKUP("core_clk", gsbi9_qup_clk.c, "qup_i2c.2"),
CLK_LOOKUP("core_clk", gsbi10_qup_clk.c, "spi_qsd.1"),
CLK_LOOKUP("gsbi_qup_clk", gsbi11_qup_clk.c, NULL),
CLK_LOOKUP("gsbi_qup_clk", gsbi12_qup_clk.c, "msm_dsps.0"),
CLK_LOOKUP("gsbi_qup_clk", gsbi12_qup_clk.c, "qup_i2c.5"),
CLK_LOOKUP("core_clk", gsbi12_qup_clk.c, "qup_i2c.5"),
CLK_LOOKUP("pdm_clk", pdm_clk.c, NULL),
CLK_LOOKUP("pmem_clk", pmem_clk.c, NULL),
CLK_LOOKUP("prng_clk", prng_clk.c, NULL),
@@ -3537,22 +3537,22 @@ static struct clk_lookup msm_clocks_8x60[] = {
CLK_LOOKUP("usb_fs_sys_clk", usb_fs2_sys_clk.c, NULL),
CLK_LOOKUP("usb_fs_src_clk", usb_fs2_src_clk.c, NULL),
CLK_LOOKUP("ce_clk", ce2_p_clk.c, NULL),
CLK_LOOKUP("spi_pclk", gsbi1_p_clk.c, "spi_qsd.0"),
CLK_LOOKUP("iface_clk", gsbi1_p_clk.c, "spi_qsd.0"),
CLK_LOOKUP("gsbi_pclk", gsbi2_p_clk.c, NULL),
CLK_LOOKUP("iface_clk", gsbi3_p_clk.c, "msm_serial_hsl.2"),
CLK_LOOKUP("gsbi_pclk", gsbi3_p_clk.c, "qup_i2c.0"),
CLK_LOOKUP("gsbi_pclk", gsbi4_p_clk.c, "qup_i2c.1"),
CLK_LOOKUP("iface_clk", gsbi3_p_clk.c, "qup_i2c.0"),
CLK_LOOKUP("iface_clk", gsbi4_p_clk.c, "qup_i2c.1"),
CLK_LOOKUP("gsbi_pclk", gsbi5_p_clk.c, NULL),
CLK_LOOKUP("iface_clk", gsbi6_p_clk.c, "msm_serial_hs.0"),
CLK_LOOKUP("gsbi_pclk", gsbi7_p_clk.c, "qup_i2c.4"),
CLK_LOOKUP("gsbi_pclk", gsbi8_p_clk.c, "qup_i2c.3"),
CLK_LOOKUP("iface_clk", gsbi7_p_clk.c, "qup_i2c.4"),
CLK_LOOKUP("iface_clk", gsbi8_p_clk.c, "qup_i2c.3"),
CLK_LOOKUP("iface_clk", gsbi9_p_clk.c, "msm_serial_hsl.1"),
CLK_LOOKUP("gsbi_pclk", gsbi9_p_clk.c, "qup_i2c.2"),
CLK_LOOKUP("spi_pclk", gsbi10_p_clk.c, "spi_qsd.1"),
CLK_LOOKUP("iface_clk", gsbi9_p_clk.c, "qup_i2c.2"),
CLK_LOOKUP("iface_clk", gsbi10_p_clk.c, "spi_qsd.1"),
CLK_LOOKUP("gsbi_pclk", gsbi11_p_clk.c, NULL),
CLK_LOOKUP("gsbi_pclk", gsbi12_p_clk.c, "msm_dsps.0"),
CLK_LOOKUP("iface_clk", gsbi12_p_clk.c, "msm_serial_hsl.0"),
CLK_LOOKUP("gsbi_pclk", gsbi12_p_clk.c, "qup_i2c.5"),
CLK_LOOKUP("iface_clk", gsbi12_p_clk.c, "qup_i2c.5"),
CLK_LOOKUP("ppss_pclk", ppss_p_clk.c, NULL),
CLK_LOOKUP("tsif_pclk", tsif_p_clk.c, NULL),
CLK_LOOKUP("usb_fs_pclk", usb_fs1_p_clk.c, NULL),

22
arch/arm/mach-msm/clock-pcom-lookup.c
View File

@@ -150,7 +150,7 @@ static struct clk_lookup msm_clocks_7x01a[] = {
CLK_LOOKUP("emdh_clk", emdh_clk.c, NULL),
CLK_LOOKUP("gp_clk", gp_clk.c, NULL),
CLK_LOOKUP("grp_clk", grp_3d_clk.c, NULL),
CLK_LOOKUP("i2c_clk", i2c_clk.c, "msm_i2c.0"),
CLK_LOOKUP("core_clk", i2c_clk.c, "msm_i2c.0"),
CLK_LOOKUP("icodec_rx_clk", icodec_rx_clk.c, NULL),
CLK_LOOKUP("icodec_tx_clk", icodec_tx_clk.c, NULL),
CLK_LOOKUP("imem_clk", imem_clk.c, NULL),
@@ -199,7 +199,7 @@ static struct clk_lookup msm_clocks_7x27[] = {
CLK_LOOKUP("gp_clk", gp_clk.c, NULL),
CLK_LOOKUP("grp_clk", grp_3d_clk.c, NULL),
CLK_LOOKUP("grp_pclk", grp_3d_p_clk.c, NULL),
CLK_LOOKUP("i2c_clk", i2c_clk.c, "msm_i2c.0"),
CLK_LOOKUP("core_clk", i2c_clk.c, "msm_i2c.0"),
CLK_LOOKUP("icodec_rx_clk", icodec_rx_clk.c, NULL),
CLK_LOOKUP("icodec_tx_clk", icodec_tx_clk.c, NULL),
CLK_LOOKUP("imem_clk", imem_clk.c, NULL),
@@ -272,10 +272,10 @@ static struct clk_lookup msm_clocks_7x27a[] = {
CLK_LOOKUP("gp_clk", gp_clk.c, NULL),
CLK_LOOKUP("grp_clk", grp_3d_clk.c, NULL),
CLK_LOOKUP("grp_pclk", grp_3d_p_clk.c, NULL),
CLK_LOOKUP("gsbi_qup_clk", gsbi1_qup_clk.c, "qup_i2c.0"),
CLK_LOOKUP("gsbi_qup_clk", gsbi2_qup_clk.c, "qup_i2c.1"),
CLK_LOOKUP("gsbi_qup_pclk", gsbi1_qup_p_clk.c, "qup_i2c.0"),
CLK_LOOKUP("gsbi_qup_pclk", gsbi2_qup_p_clk.c, "qup_i2c.1"),
CLK_LOOKUP("core_clk", gsbi1_qup_clk.c, "qup_i2c.0"),
CLK_LOOKUP("core_clk", gsbi2_qup_clk.c, "qup_i2c.1"),
CLK_LOOKUP("iface_clk", gsbi1_qup_p_clk.c, "qup_i2c.0"),
CLK_LOOKUP("iface_clk", gsbi2_qup_p_clk.c, "qup_i2c.1"),
CLK_LOOKUP("icodec_rx_clk", icodec_rx_clk.c, NULL),
CLK_LOOKUP("icodec_tx_clk", icodec_tx_clk.c, NULL),
CLK_LOOKUP("imem_clk", imem_clk.c, NULL),
@@ -334,7 +334,7 @@ static struct clk_lookup msm_clocks_8x50[] = {
CLK_LOOKUP("emdh_clk", emdh_clk.c, NULL),
CLK_LOOKUP("gp_clk", gp_clk.c, NULL),
CLK_LOOKUP("grp_clk", grp_3d_clk.c, NULL),
CLK_LOOKUP("i2c_clk", i2c_clk.c, "msm_i2c.0"),
CLK_LOOKUP("core_clk", i2c_clk.c, "msm_i2c.0"),
CLK_LOOKUP("icodec_rx_clk", icodec_rx_clk.c, NULL),
CLK_LOOKUP("icodec_tx_clk", icodec_tx_clk.c, NULL),
CLK_LOOKUP("imem_clk", imem_clk.c, NULL),
@@ -355,8 +355,8 @@ static struct clk_lookup msm_clocks_8x50[] = {
CLK_LOOKUP("sdc_pclk", sdc3_p_clk.c, "msm_sdcc.3"),
CLK_LOOKUP("sdc_clk", sdc4_clk.c, "msm_sdcc.4"),
CLK_LOOKUP("sdc_pclk", sdc4_p_clk.c, "msm_sdcc.4"),
CLK_LOOKUP("spi_clk", spi_clk.c, NULL),
CLK_DUMMY("spi_pclk", SPI_P_CLK, "spi_qsd.0", 0),
CLK_LOOKUP("core_clk", spi_clk.c, "spi_qsd.0"),
CLK_DUMMY("iface_clk", SPI_P_CLK, "spi_qsd.0", 0),
CLK_LOOKUP("tsif_clk", tsif_clk.c, NULL),
CLK_LOOKUP("tsif_ref_clk", tsif_ref_clk.c, NULL),
CLK_LOOKUP("tv_dac_clk", tv_dac_clk.c, NULL),
@@ -391,8 +391,8 @@ static struct clk_lookup msm_clocks_8x50[] = {
CLK_LOOKUP("grp_pclk", grp_3d_p_clk.c, NULL),
CLK_LOOKUP("grp_2d_clk", grp_2d_clk.c, NULL),
CLK_LOOKUP("grp_2d_pclk", grp_2d_p_clk.c, NULL),
CLK_LOOKUP("qup_clk", gsbi_clk.c, "qup_i2c.4"),
CLK_LOOKUP("qup_pclk", gsbi_p_clk.c, "qup_i2c.4"),
CLK_LOOKUP("core_clk", gsbi_clk.c, "qup_i2c.4"),
CLK_LOOKUP("iface_clk", gsbi_p_clk.c, "qup_i2c.4"),
};
struct clock_init_data qds8x50_clock_init_data __initdata = {

8
arch/arm/mach-msm/devices-8064.c
View File

@@ -506,8 +506,8 @@ static struct clk_lookup msm_clocks_8064_dummy[] = {
CLK_DUMMY("gsbi_qup_clk", GSBI1_QUP_CLK, NULL, OFF),
CLK_DUMMY("gsbi_qup_clk", GSBI2_QUP_CLK, NULL, OFF),
CLK_DUMMY("gsbi_qup_clk", GSBI3_QUP_CLK, NULL, OFF),
CLK_DUMMY("gsbi_qup_clk", GSBI4_QUP_CLK, "qup_i2c.4", OFF),
CLK_DUMMY("spi_clk", GSBI5_QUP_CLK, "spi_qsd.0", OFF),
CLK_DUMMY("core_clk", GSBI4_QUP_CLK, "qup_i2c.4", OFF),
CLK_DUMMY("core_clk", GSBI5_QUP_CLK, "spi_qsd.0", OFF),
CLK_DUMMY("gsbi_qup_clk", GSBI6_QUP_CLK, NULL, OFF),
CLK_DUMMY("gsbi_qup_clk", GSBI7_QUP_CLK, NULL, OFF),
CLK_DUMMY("pdm_clk", PDM_CLK, NULL, OFF),
@@ -538,8 +538,8 @@ static struct clk_lookup msm_clocks_8064_dummy[] = {
CLK_DUMMY("gsbi_pclk", GSBI1_P_CLK, NULL, OFF),
CLK_DUMMY("gsbi_pclk", GSBI2_P_CLK, NULL, OFF),
CLK_DUMMY("iface_clk", GSBI3_P_CLK, "msm_serial_hsl.0", OFF),
CLK_DUMMY("gsbi_pclk", GSBI4_P_CLK, "qup_i2c.4", OFF),
CLK_DUMMY("spi_pclk", GSBI5_P_CLK, "spi_qsd.0", OFF),
CLK_DUMMY("iface_clk", GSBI4_P_CLK, "qup_i2c.4", OFF),
CLK_DUMMY("iface_clk", GSBI5_P_CLK, "spi_qsd.0", OFF),
CLK_DUMMY("iface_clk", GSBI6_P_CLK, NULL, OFF),
CLK_DUMMY("gsbi_pclk", GSBI7_P_CLK, NULL, OFF),
CLK_DUMMY("tsif_pclk", TSIF_P_CLK, NULL, OFF),

10
arch/arm/mach-msm/devices-8960.c
View File

@@ -1449,11 +1449,10 @@ static struct clk_lookup msm_clocks_8960_dummy[] = {
CLK_DUMMY("core_clk", GSBI10_UART_CLK, NULL, OFF),
CLK_DUMMY("core_clk", GSBI11_UART_CLK, NULL, OFF),
CLK_DUMMY("core_clk", GSBI12_UART_CLK, NULL, OFF),
CLK_DUMMY("spi_clk", GSBI1_QUP_CLK, "spi_qsd.0", OFF),
CLK_DUMMY("core_clk", GSBI1_QUP_CLK, "spi_qsd.0", OFF),
CLK_DUMMY("gsbi_qup_clk", GSBI2_QUP_CLK, NULL, OFF),
CLK_DUMMY("gsbi_qup_clk", GSBI3_QUP_CLK, NULL, OFF),
CLK_DUMMY("gsbi_qup_clk", GSBI4_QUP_CLK,
"qup_i2c.4", OFF),
CLK_DUMMY("core_clk", GSBI4_QUP_CLK, "qup_i2c.4", OFF),
CLK_DUMMY("gsbi_qup_clk", GSBI5_QUP_CLK, NULL, OFF),
CLK_DUMMY("gsbi_qup_clk", GSBI6_QUP_CLK, NULL, OFF),
CLK_DUMMY("gsbi_qup_clk", GSBI7_QUP_CLK, NULL, OFF),
@@ -1482,12 +1481,11 @@ static struct clk_lookup msm_clocks_8960_dummy[] = {
CLK_DUMMY("usb_fs_sys_clk", USB_FS2_SYS_CLK, NULL, OFF),
CLK_DUMMY("ce_pclk", CE2_CLK, NULL, OFF),
CLK_DUMMY("ce_clk", CE1_CORE_CLK, NULL, OFF),
CLK_DUMMY("spi_pclk", GSBI1_P_CLK, "spi_qsd.0", OFF),
CLK_DUMMY("iface_clk", GSBI1_P_CLK, "spi_qsd.0", OFF),
CLK_DUMMY("gsbi_pclk", GSBI2_P_CLK,
"msm_serial_hsl.0", OFF),
CLK_DUMMY("gsbi_pclk", GSBI3_P_CLK, NULL, OFF),
CLK_DUMMY("gsbi_pclk", GSBI4_P_CLK,
"qup_i2c.4", OFF),
CLK_DUMMY("iface_clk", GSBI4_P_CLK, "qup_i2c.4", OFF),
CLK_DUMMY("gsbi_pclk", GSBI5_P_CLK, NULL, OFF),
CLK_DUMMY("iface_clk", GSBI6_P_CLK, NULL, OFF),
CLK_DUMMY("gsbi_pclk", GSBI7_P_CLK, NULL, OFF),

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

@@ -931,7 +931,7 @@ struct clk_lookup msm_clocks_7x25[] = {
CLK_LOOKUP("ebi2_clk", ebi2_clk.c, NULL),
CLK_LOOKUP("ecodec_clk", ecodec_clk.c, NULL),
CLK_LOOKUP("gp_clk", gp_clk.c, NULL),
CLK_LOOKUP("i2c_clk", i2c_clk.c, "msm_i2c.0"),
CLK_LOOKUP("core_clk", i2c_clk.c, "msm_i2c.0"),
CLK_LOOKUP("icodec_rx_clk", icodec_rx_clk.c, NULL),
CLK_LOOKUP("icodec_tx_clk", icodec_tx_clk.c, NULL),
CLK_LOOKUP("imem_clk", imem_clk.c, NULL),

2
arch/arm/mach-msm/include/mach/board.h
View File

@@ -349,8 +349,6 @@ struct msm_i2c_platform_data {
int pri_dat;
int aux_clk;
int aux_dat;
const char *clk;
const char *pclk;
int src_clk_rate;
int use_gsbi_shared_mode;
void (*msm_i2c_config_gpio)(int iface, int config_type);

2
drivers/i2c/busses/i2c-msm.c
View File

@@ -590,7 +590,7 @@ msm_i2c_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "I2C region already claimed\n");
return -EBUSY;
}
clk = clk_get(&pdev->dev, "i2c_clk");
clk = clk_get(&pdev->dev, "core_clk");
if (IS_ERR(clk)) {
dev_err(&pdev->dev, "Could not get clock\n");
ret = PTR_ERR(clk);

37
drivers/i2c/busses/i2c-qup.c
View File

@@ -301,13 +301,11 @@ qup_i2c_pwr_mgmt(struct qup_i2c_dev *dev, unsigned int state)
dev->clk_state = state;
if (state != 0) {
clk_enable(dev->clk);
if (dev->pclk)
clk_enable(dev->pclk);
clk_enable(dev->pclk);
} else {
qup_update_state(dev, QUP_RESET_STATE);
clk_disable(dev->clk);
if (dev->pclk)
clk_disable(dev->pclk);
clk_disable(dev->pclk);
}
}
@@ -953,7 +951,6 @@ qup_i2c_probe(struct platform_device *pdev)
int ret = 0;
int i;
struct msm_i2c_platform_data *pdata;
const char *qup_apps_clk_name = "qup_clk";
gsbi_mem = NULL;
dev_dbg(&pdev->dev, "qup_i2c_probe\n");
@@ -1009,26 +1006,20 @@ qup_i2c_probe(struct platform_device *pdev)
}
}
if (pdata->clk != NULL)
qup_apps_clk_name = pdata->clk;
clk = clk_get(&pdev->dev, qup_apps_clk_name);
clk = clk_get(&pdev->dev, "core_clk");
if (IS_ERR(clk)) {
dev_err(&pdev->dev, "Could not get clock\n");
dev_err(&pdev->dev, "Could not get core_clk\n");
ret = PTR_ERR(clk);
goto err_clk_get_failed;
}
if (pdata->pclk != NULL) {
pclk = clk_get(&pdev->dev, pdata->pclk);
if (IS_ERR(pclk)) {
dev_err(&pdev->dev, "Could not get pclock\n");
ret = PTR_ERR(pclk);
clk_put(clk);
goto err_clk_get_failed;
}
} else
pclk = NULL;
pclk = clk_get(&pdev->dev, "iface_clk");
if (IS_ERR(pclk)) {
dev_err(&pdev->dev, "Could not get iface_clk\n");
ret = PTR_ERR(pclk);
clk_put(clk);
goto err_clk_get_failed;
}
/* We support frequencies upto FAST Mode(400KHz) */
if (pdata->clk_freq <= 0 ||
@@ -1175,8 +1166,7 @@ err_ioremap_failed:
err_alloc_dev_failed:
err_config_failed:
clk_put(clk);
if (pclk)
clk_put(pclk);
clk_put(pclk);
err_clk_get_failed:
if (gsbi_mem)
release_mem_region(gsbi_mem->start, resource_size(gsbi_mem));
@@ -1206,8 +1196,7 @@ qup_i2c_remove(struct platform_device *pdev)
free_irq(dev->err_irq, dev);
i2c_del_adapter(&dev->adapter);
clk_put(dev->clk);
if (dev->pclk)
clk_put(dev->pclk);
clk_put(dev->pclk);
qup_i2c_free_gpios(dev);
if (dev->gsbi)
iounmap(dev->gsbi);

12
drivers/spi/spi_qsd.c
View File

@@ -2302,16 +2302,16 @@ skip_dma_resources:
locked = 1;
dd->dev = &pdev->dev;
dd->clk = clk_get(&pdev->dev, "spi_clk");
dd->clk = clk_get(&pdev->dev, "core_clk");
if (IS_ERR(dd->clk)) {
dev_err(&pdev->dev, "%s: unable to get spi_clk\n", __func__);
dev_err(&pdev->dev, "%s: unable to get core_clk\n", __func__);
rc = PTR_ERR(dd->clk);
goto err_probe_clk_get;
}
dd->pclk = clk_get(&pdev->dev, "spi_pclk");
dd->pclk = clk_get(&pdev->dev, "iface_clk");
if (IS_ERR(dd->pclk)) {
dev_err(&pdev->dev, "%s: unable to get spi_pclk\n", __func__);
dev_err(&pdev->dev, "%s: unable to get iface_clk\n", __func__);
rc = PTR_ERR(dd->pclk);
goto err_probe_pclk_get;
}
@@ -2321,7 +2321,7 @@ skip_dma_resources:
rc = clk_enable(dd->clk);
if (rc) {
dev_err(&pdev->dev, "%s: unable to enable spi_clk\n",
dev_err(&pdev->dev, "%s: unable to enable core_clk\n",
__func__);
goto err_probe_clk_enable;
}
@@ -2329,7 +2329,7 @@ skip_dma_resources:
rc = clk_enable(dd->pclk);
if (rc) {
dev_err(&pdev->dev, "%s: unable to enable spi_pclk\n",
dev_err(&pdev->dev, "%s: unable to enable iface_clk\n",
__func__);
goto err_probe_pclk_enable;
}