msm: clock: Rename all I2C/SPI clocks to 'core_clk' or "iface_clk"
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
diff --git a/arch/arm/mach-msm/board-apq8064.c b/arch/arm/mach-msm/board-apq8064.c
index 49eee71..bcd4cbf 100644
--- a/arch/arm/mach-msm/board-apq8064.c
+++ b/arch/arm/mach-msm/board-apq8064.c
@@ -188,8 +188,6 @@
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)
diff --git a/arch/arm/mach-msm/board-msm7x27a.c b/arch/arm/mach-msm/board-msm7x27a.c
index f2c9243..596fdd3 100644
--- a/arch/arm/mach-msm/board-msm7x27a.c
+++ b/arch/arm/mach-msm/board-msm7x27a.c
@@ -1024,15 +1024,11 @@
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,
};
diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c
index 393504b..9d737fa 100644
--- a/arch/arm/mach-msm/board-msm7x30.c
+++ b/arch/arm/mach-msm/board-msm7x30.c
@@ -5491,7 +5491,6 @@
static struct msm_i2c_platform_data qup_i2c_pdata = {
.clk_freq = 384000,
- .pclk = "camif_pad_pclk",
.msm_i2c_config_gpio = qup_i2c_gpio_config,
};
diff --git a/arch/arm/mach-msm/board-msm8960.c b/arch/arm/mach-msm/board-msm8960.c
index 418add3..fe5454b 100644
--- a/arch/arm/mach-msm/board-msm8960.c
+++ b/arch/arm/mach-msm/board-msm8960.c
@@ -2615,32 +2615,24 @@
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,
};
diff --git a/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c
index f3e8136..045d363 100644
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@ -2420,48 +2420,36 @@
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,
};
diff --git a/arch/arm/mach-msm/clock-7x30.c b/arch/arm/mach-msm/clock-7x30.c
index e881d41..d77d7cb 100644
--- a/arch/arm/mach-msm/clock-7x30.c
+++ b/arch/arm/mach-msm/clock-7x30.c
@@ -2800,8 +2800,8 @@
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 @@
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 @@
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),
diff --git a/arch/arm/mach-msm/clock-8960.c b/arch/arm/mach-msm/clock-8960.c
index bc66c0b..56aec1e 100644
--- a/arch/arm/mach-msm/clock-8960.c
+++ b/arch/arm/mach-msm/clock-8960.c
@@ -4204,18 +4204,18 @@
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 @@
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),
diff --git a/arch/arm/mach-msm/clock-8x60.c b/arch/arm/mach-msm/clock-8x60.c
index 5e19fca..0404f8a 100644
--- a/arch/arm/mach-msm/clock-8x60.c
+++ b/arch/arm/mach-msm/clock-8x60.c
@@ -3505,19 +3505,19 @@
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 @@
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),
diff --git a/arch/arm/mach-msm/clock-pcom-lookup.c b/arch/arm/mach-msm/clock-pcom-lookup.c
index ac32db4..d3411a1 100644
--- a/arch/arm/mach-msm/clock-pcom-lookup.c
+++ b/arch/arm/mach-msm/clock-pcom-lookup.c
@@ -150,7 +150,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 = {
diff --git a/arch/arm/mach-msm/devices-8064.c b/arch/arm/mach-msm/devices-8064.c
index 8ae1f1c..7ab2ccd 100644
--- a/arch/arm/mach-msm/devices-8064.c
+++ b/arch/arm/mach-msm/devices-8064.c
@@ -506,8 +506,8 @@
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 @@
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),
diff --git a/arch/arm/mach-msm/devices-8960.c b/arch/arm/mach-msm/devices-8960.c
index a48266d..0c18466 100644
--- a/arch/arm/mach-msm/devices-8960.c
+++ b/arch/arm/mach-msm/devices-8960.c
@@ -1449,11 +1449,10 @@
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 @@
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),
diff --git a/arch/arm/mach-msm/devices-msm7x25.c b/arch/arm/mach-msm/devices-msm7x25.c
index 427c7b8..bebe497 100644
--- a/arch/arm/mach-msm/devices-msm7x25.c
+++ b/arch/arm/mach-msm/devices-msm7x25.c
@@ -931,7 +931,7 @@
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),
diff --git a/arch/arm/mach-msm/include/mach/board.h b/arch/arm/mach-msm/include/mach/board.h
index 2576d91..bd0679f 100644
--- a/arch/arm/mach-msm/include/mach/board.h
+++ b/arch/arm/mach-msm/include/mach/board.h
@@ -349,8 +349,6 @@
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);