msm: clock: Use device names to distinguish between USB clocks
Drivers should now use their device names to distinguish between
clocks of the same type rather than the clock name. Clock names
are updated to match the new naming convention.
CRs-Fixed: 327559
Change-Id: I78757806589e037a0655a63e7ee20c935214c99d
Signed-off-by: Manu Gautam <mgautam@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-8064.c b/arch/arm/mach-msm/board-8064.c
index f14381d..9f66e5d 100644
--- a/arch/arm/mach-msm/board-8064.c
+++ b/arch/arm/mach-msm/board-8064.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
+/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -215,7 +215,6 @@
.mode = USB_PERIPHERAL,
.otg_control = OTG_PHY_CONTROL,
.phy_type = SNPS_28NM_INTEGRATED_PHY,
- .pclk_src_name = "dfab_usb_hs_clk",
};
#define TABLA_INTERRUPT_BASE (NR_MSM_IRQS + NR_GPIO_IRQS + NR_PM8921_IRQS)
diff --git a/arch/arm/mach-msm/board-8930.c b/arch/arm/mach-msm/board-8930.c
index fa548aa..53f8621 100644
--- a/arch/arm/mach-msm/board-8930.c
+++ b/arch/arm/mach-msm/board-8930.c
@@ -785,7 +785,6 @@
.mode = USB_OTG,
.otg_control = OTG_PMIC_CONTROL,
.phy_type = SNPS_28NM_INTEGRATED_PHY,
- .pclk_src_name = "dfab_usb_hs_clk",
.pmic_id_irq = PM8038_USB_ID_IN_IRQ(PM8038_IRQ_BASE),
.power_budget = 750,
};
diff --git a/arch/arm/mach-msm/board-8960.c b/arch/arm/mach-msm/board-8960.c
index 109ab9c..15a3829 100644
--- a/arch/arm/mach-msm/board-8960.c
+++ b/arch/arm/mach-msm/board-8960.c
@@ -890,7 +890,6 @@
.mode = USB_OTG,
.otg_control = OTG_PMIC_CONTROL,
.phy_type = SNPS_28NM_INTEGRATED_PHY,
- .pclk_src_name = "dfab_usb_hs_clk",
.pmic_id_irq = PM8921_USB_ID_IN_IRQ(PM8921_IRQ_BASE),
.power_budget = 750,
};
diff --git a/arch/arm/mach-msm/board-9615.c b/arch/arm/mach-msm/board-9615.c
index c404045..93e8fdf 100644
--- a/arch/arm/mach-msm/board-9615.c
+++ b/arch/arm/mach-msm/board-9615.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
+/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -337,7 +337,6 @@
.mode = USB_OTG,
.otg_control = OTG_PHY_CONTROL,
.phy_type = SNPS_28NM_INTEGRATED_PHY,
- .pclk_src_name = "dfab_usb_hs_clk",
.vbus_power = msm_hsusb_vbus_power,
.disable_reset_on_disconnect = true,
};
diff --git a/arch/arm/mach-msm/board-msm7x27.c b/arch/arm/mach-msm/board-msm7x27.c
index 53ea8c1..e84417c 100644
--- a/arch/arm/mach-msm/board-msm7x27.c
+++ b/arch/arm/mach-msm/board-msm7x27.c
@@ -242,7 +242,6 @@
#endif
.ldo_init = msm_hsusb_ldo_init,
.pclk_required_during_lpm = 1,
- .pclk_src_name = "ebi1_usb_clk",
};
#ifdef CONFIG_USB_GADGET
diff --git a/arch/arm/mach-msm/board-msm7x27a.c b/arch/arm/mach-msm/board-msm7x27a.c
index 389b071..9a6f1e1 100644
--- a/arch/arm/mach-msm/board-msm7x27a.c
+++ b/arch/arm/mach-msm/board-msm7x27a.c
@@ -342,7 +342,6 @@
.vbus_power = msm_hsusb_vbus_power,
#endif
.rpc_connect = hsusb_rpc_connect,
- .core_clk = 1,
.pemp_level = PRE_EMPHASIS_WITH_20_PERCENT,
.cdr_autoreset = CDR_AUTO_RESET_DISABLE,
.drv_ampl = HS_DRV_AMPLITUDE_DEFAULT,
diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c
index 883404f..a3f9ccd 100644
--- a/arch/arm/mach-msm/board-msm7x30.c
+++ b/arch/arm/mach-msm/board-msm7x30.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2011, Code Aurora Forum. All rights reserved.
+/* Copyright (c) 2009-2012, Code Aurora Forum. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -3214,7 +3214,6 @@
#else
.vbus_power = msm_hsusb_vbus_power,
#endif
- .core_clk = 1,
.pemp_level = PRE_EMPHASIS_WITH_20_PERCENT,
.cdr_autoreset = CDR_AUTO_RESET_DISABLE,
.drv_ampl = HS_DRV_AMPLITUDE_DEFAULT,
diff --git a/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c
index b5a06bd..11b70ee 100644
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@ -1435,7 +1435,6 @@
* usb pclk as dayatona fabric clock will be
* used instead
*/
- .pclk_src_name = "dfab_usb_hs_clk",
.pemp_level = PRE_EMPHASIS_WITH_20_PERCENT,
.cdr_autoreset = CDR_AUTO_RESET_DISABLE,
.se1_gating = SE1_GATING_DISABLE,
diff --git a/arch/arm/mach-msm/board-qrd7627a.c b/arch/arm/mach-msm/board-qrd7627a.c
index 08ec05e..8a7fe5b 100644
--- a/arch/arm/mach-msm/board-qrd7627a.c
+++ b/arch/arm/mach-msm/board-qrd7627a.c
@@ -395,7 +395,6 @@
.vbus_power = msm_hsusb_vbus_power,
#endif
.rpc_connect = hsusb_rpc_connect,
- .core_clk = 1,
.pemp_level = PRE_EMPHASIS_WITH_20_PERCENT,
.cdr_autoreset = CDR_AUTO_RESET_DISABLE,
.drv_ampl = HS_DRV_AMPLITUDE_DEFAULT,
diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c
index 10432a0..5a77333 100644
--- a/arch/arm/mach-msm/board-qsd8x50.c
+++ b/arch/arm/mach-msm/board-qsd8x50.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2011, Code Aurora Forum. All rights reserved.
+/* Copyright (c) 2008-2012, Code Aurora Forum. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -1767,7 +1767,6 @@
.phy_can_powercollapse = 1,
.ldo_init = msm_hsusb_ldo_init,
.ldo_enable = msm_hsusb_ldo_enable,
- .pclk_src_name = "ebi1_usb_clk",
};
static struct msm_hsusb_gadget_platform_data msm_gadget_pdata;
diff --git a/arch/arm/mach-msm/clock-7x30.c b/arch/arm/mach-msm/clock-7x30.c
index e716b25..9170842 100644
--- a/arch/arm/mach-msm/clock-7x30.c
+++ b/arch/arm/mach-msm/clock-7x30.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2011, Code Aurora Forum. All rights reserved.
+/* Copyright (c) 2009-2012, Code Aurora Forum. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -2754,7 +2754,7 @@
{ CLK_LOOKUP("ecodec_clk", ecodec_clk.c, NULL) },
{ CLK_LOOKUP("core_clk", gp_clk.c, NULL) },
{ CLK_LOOKUP("core_clk", uart3_clk.c, "msm_serial.2") },
- { CLK_LOOKUP("usb_phy_clk", usb_phy_clk.c, NULL) },
+ { CLK_LOOKUP("phy_clk", usb_phy_clk.c, "msm_otg") },
/* Voters */
{ CLK_LOOKUP("ebi1_dtv_clk", ebi_dtv_clk.c, NULL) },
@@ -2836,12 +2836,12 @@
OWN(ROW1, 29, "core_clk", sdc4_clk, "msm_sdcc.4"),
OWN(ROW1, 29, "iface_clk", sdc4_p_clk, "msm_sdcc.4"),
OWN(ROW1, 0, "core_clk", uart2_clk, "msm_serial.1"),
- OWN(ROW1, 2, "usb_hs2_clk", usb_hs2_clk, NULL),
- OWN(ROW1, 2, "usb_hs2_core_clk", usb_hs2_core_clk, NULL),
- OWN(ROW1, 2, "usb_hs2_pclk", usb_hs2_p_clk, NULL),
- OWN(ROW1, 4, "usb_hs3_clk", usb_hs3_clk, NULL),
- OWN(ROW1, 4, "usb_hs3_core_clk", usb_hs3_core_clk, NULL),
- OWN(ROW1, 4, "usb_hs3_pclk", usb_hs3_p_clk, NULL),
+ OWN(ROW1, 2, "alt_core_clk", usb_hs2_clk, "msm_hsusb_host.0"),
+ OWN(ROW1, 2, "core_clk", usb_hs2_core_clk, "msm_hsusb_host.0"),
+ OWN(ROW1, 2, "iface_clk", usb_hs2_p_clk, "msm_hsusb_host.0"),
+ OWN(ROW1, 4, "alt_core_clk", usb_hs3_clk, NULL),
+ OWN(ROW1, 4, "core_clk", usb_hs3_core_clk, NULL),
+ OWN(ROW1, 4, "iface_clk", usb_hs3_p_clk, NULL),
OWN(ROW2, 3, "core_clk", qup_i2c_clk, "qup_i2c.4"),
OWN(ROW2, 1, "core_clk", spi_clk, "spi_qsd.0"),
@@ -2849,9 +2849,9 @@
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"),
- OWN(ROW2, 11, "usb_hs_clk", usb_hs_clk, NULL),
- OWN(ROW2, 11, "usb_hs_core_clk", usb_hs_core_clk, NULL),
- OWN(ROW2, 11, "usb_hs_pclk", usb_hs_p_clk, NULL),
+ OWN(ROW2, 11, "alt_core_clk", usb_hs_clk, "msm_otg"),
+ OWN(ROW2, 11, "core_clk", usb_hs_core_clk, "msm_otg"),
+ OWN(ROW2, 11, "iface_clk", usb_hs_p_clk, "msm_otg"),
OWN(APPS3, 6, "cam_m_clk", cam_m_clk, NULL),
OWN(APPS3, 6, "camif_pad_pclk", camif_pad_p_clk, NULL),
diff --git a/arch/arm/mach-msm/clock-8960.c b/arch/arm/mach-msm/clock-8960.c
index 95c93ad..8152ff2 100644
--- a/arch/arm/mach-msm/clock-8960.c
+++ b/arch/arm/mach-msm/clock-8960.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2011, Code Aurora Forum. All rights reserved.
+/* Copyright (c) 2009-2012, Code Aurora Forum. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -5208,12 +5208,12 @@
CLK_LOOKUP("core_clk", sdc4_clk.c, "msm_sdcc.4"),
CLK_LOOKUP("ref_clk", tsif_ref_clk.c, NULL),
CLK_LOOKUP("core_clk", tssc_clk.c, NULL),
- CLK_LOOKUP("usb_hs_clk", usb_hs1_xcvr_clk.c, NULL),
- CLK_LOOKUP("core_clk", usb_hs3_xcvr_clk.c, "msm_ehci_host.0"),
- CLK_LOOKUP("core_clk", usb_hs4_xcvr_clk.c, "msm_ehci_host.1"),
- CLK_LOOKUP("usb_fs_src_clk", usb_fs1_src_clk.c, NULL),
- CLK_LOOKUP("usb_fs_clk", usb_fs1_xcvr_clk.c, NULL),
- CLK_LOOKUP("usb_fs_sys_clk", usb_fs1_sys_clk.c, NULL),
+ CLK_LOOKUP("alt_core_clk", usb_hs1_xcvr_clk.c, "msm_otg"),
+ CLK_LOOKUP("alt_core_clk", usb_hs3_xcvr_clk.c, "msm_ehci_host.0"),
+ CLK_LOOKUP("alt_core_clk", usb_hs4_xcvr_clk.c, "msm_ehci_host.1"),
+ CLK_LOOKUP("src_clk", usb_fs1_src_clk.c, NULL),
+ CLK_LOOKUP("alt_core_clk", usb_fs1_xcvr_clk.c, NULL),
+ CLK_LOOKUP("sys_clk", usb_fs1_sys_clk.c, NULL),
CLK_LOOKUP("iface_clk", ce1_p_clk.c, NULL),
CLK_LOOKUP("core_clk", ce1_core_clk.c, NULL),
CLK_LOOKUP("ref_clk", sata_phy_ref_clk.c, NULL),
@@ -5233,8 +5233,8 @@
CLK_LOOKUP("iface_clk", gsbi6_p_clk.c, NULL),
CLK_LOOKUP("iface_clk", gsbi7_p_clk.c, NULL),
CLK_LOOKUP("iface_clk", tsif_p_clk.c, NULL),
- CLK_LOOKUP("usb_fs_pclk", usb_fs1_p_clk.c, NULL),
- CLK_LOOKUP("usb_hs_pclk", usb_hs1_p_clk.c, NULL),
+ CLK_LOOKUP("iface_clk", usb_fs1_p_clk.c, NULL),
+ CLK_LOOKUP("iface_clk", usb_hs1_p_clk.c, "msm_otg"),
CLK_LOOKUP("iface_clk", usb_hs3_p_clk.c, "msm_ehci_host.0"),
CLK_LOOKUP("iface_clk", usb_hs4_p_clk.c, "msm_ehci_host.1"),
CLK_LOOKUP("iface_clk", sdc1_p_clk.c, "msm_sdcc.1"),
@@ -5371,20 +5371,20 @@
CLK_LOOKUP("core_clk", vcodec_axi_b_clk.c, NULL),
CLK_LOOKUP("core_clk", gfx3d_axi_clk.c, NULL),
CLK_DUMMY("dfab_dsps_clk", DFAB_DSPS_CLK, NULL, 0),
- CLK_DUMMY("dfab_usb_hs_clk", DFAB_USB_HS_CLK, NULL, 0),
- CLK_DUMMY("bus_clk", DFAB_USB_HS3_CLK, "msm_ehci_host.0", 0),
- CLK_DUMMY("bus_clk", DFAB_USB_HS4_CLK, "msm_ehci_host.1", 0),
+ CLK_DUMMY("core_clk", DFAB_USB_HS_CLK, "msm_otg", 0),
+ CLK_DUMMY("core_clk", DFAB_USB_HS3_CLK, "msm_ehci_host.0", 0),
+ CLK_DUMMY("core_clk", DFAB_USB_HS4_CLK, "msm_ehci_host.1", 0),
CLK_DUMMY("bus_clk", DFAB_SDC1_CLK, NULL, 0),
CLK_DUMMY("bus_clk", DFAB_SDC2_CLK, NULL, 0),
CLK_DUMMY("bus_clk", DFAB_SDC3_CLK, NULL, 0),
CLK_DUMMY("bus_clk", DFAB_SDC4_CLK, NULL, 0),
CLK_DUMMY("dfab_clk", DFAB_CLK, NULL, 0),
CLK_DUMMY("bus_clk", DFAB_SCM_CLK, "scm", 0),
- CLK_LOOKUP("usb_hsic_xcvr_fs_clk", usb_hsic_xcvr_fs_clk.c, NULL),
- CLK_LOOKUP("usb_hsic_hsic_clk", usb_hsic_hsic_clk.c, NULL),
- CLK_LOOKUP("usb_hsic_hsio_cal_clk", usb_hsic_hsio_cal_clk.c, NULL),
- CLK_LOOKUP("usb_hsic_system_clk", usb_hsic_system_clk.c, NULL),
- CLK_LOOKUP("usb_hsic_p_clk", usb_hsic_p_clk.c, NULL),
+ CLK_LOOKUP("alt_core_clk", usb_hsic_xcvr_fs_clk.c, "msm_hsic_host"),
+ CLK_LOOKUP("phy_clk", usb_hsic_hsic_clk.c, "msm_hsic_host"),
+ CLK_LOOKUP("cal_clk", usb_hsic_hsio_cal_clk.c, "msm_hsic_host"),
+ CLK_LOOKUP("core_clk", usb_hsic_system_clk.c, "msm_hsic_host"),
+ CLK_LOOKUP("iface_clk", usb_hsic_p_clk.c, "msm_hsic_host"),
CLK_LOOKUP("mem_clk", ebi1_adm_clk.c, "msm_dmov"),
@@ -5458,14 +5458,14 @@
CLK_LOOKUP("slimbus_xo_src_clk", slimbus_xo_src_clk.c, NULL),
CLK_LOOKUP("ref_clk", tsif_ref_clk.c, NULL),
CLK_LOOKUP("core_clk", tssc_clk.c, NULL),
- CLK_LOOKUP("usb_hs_clk", usb_hs1_xcvr_clk.c, NULL),
- CLK_LOOKUP("usb_phy_clk", usb_phy0_clk.c, NULL),
- CLK_LOOKUP("usb_fs_clk", usb_fs1_xcvr_clk.c, NULL),
- CLK_LOOKUP("usb_fs_sys_clk", usb_fs1_sys_clk.c, NULL),
- CLK_LOOKUP("usb_fs_src_clk", usb_fs1_src_clk.c, NULL),
- CLK_LOOKUP("usb_fs_clk", usb_fs2_xcvr_clk.c, NULL),
- 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("alt_core_clk", usb_hs1_xcvr_clk.c, "msm_otg"),
+ CLK_LOOKUP("phy_clk", usb_phy0_clk.c, "msm_otg"),
+ CLK_LOOKUP("alt_core_clk", usb_fs1_xcvr_clk.c, NULL),
+ CLK_LOOKUP("sys_clk", usb_fs1_sys_clk.c, NULL),
+ CLK_LOOKUP("src_clk", usb_fs1_src_clk.c, NULL),
+ CLK_LOOKUP("alt_core_clk", usb_fs2_xcvr_clk.c, NULL),
+ CLK_LOOKUP("sys_clk", usb_fs2_sys_clk.c, NULL),
+ CLK_LOOKUP("src_clk", usb_fs2_src_clk.c, NULL),
CLK_LOOKUP("iface_clk", ce1_p_clk.c, "qce.0"),
CLK_LOOKUP("iface_clk", ce1_p_clk.c, "qcrypto.0"),
CLK_LOOKUP("core_clk", ce1_core_clk.c, "qce.0"),
@@ -5484,9 +5484,9 @@
CLK_LOOKUP("iface_clk", gsbi11_p_clk.c, NULL),
CLK_LOOKUP("iface_clk", gsbi12_p_clk.c, "qup_i2c.12"),
CLK_LOOKUP("iface_clk", 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),
- CLK_LOOKUP("usb_hs_pclk", usb_hs1_p_clk.c, NULL),
+ CLK_LOOKUP("iface_clk", usb_fs1_p_clk.c, NULL),
+ CLK_LOOKUP("iface_clk", usb_fs2_p_clk.c, NULL),
+ CLK_LOOKUP("iface_clk", usb_hs1_p_clk.c, "msm_otg"),
CLK_LOOKUP("iface_clk", sdc1_p_clk.c, "msm_sdcc.1"),
CLK_LOOKUP("iface_clk", sdc2_p_clk.c, "msm_sdcc.2"),
CLK_LOOKUP("iface_clk", sdc3_p_clk.c, "msm_sdcc.3"),
@@ -5624,7 +5624,7 @@
CLK_LOOKUP("core_clk", gfx2d0_clk.c, "msm_iommu.10"),
CLK_LOOKUP("core_clk", gfx2d1_clk.c, "msm_iommu.11"),
CLK_LOOKUP("dfab_dsps_clk", dfab_dsps_clk.c, NULL),
- CLK_LOOKUP("dfab_usb_hs_clk", dfab_usb_hs_clk.c, NULL),
+ CLK_LOOKUP("core_clk", dfab_usb_hs_clk.c, "msm_otg"),
CLK_LOOKUP("bus_clk", dfab_sdc1_clk.c, "msm_sdcc.1"),
CLK_LOOKUP("bus_clk", dfab_sdc2_clk.c, "msm_sdcc.2"),
CLK_LOOKUP("bus_clk", dfab_sdc3_clk.c, "msm_sdcc.3"),
@@ -5653,11 +5653,11 @@
CLK_LOOKUP("csi_rdi2_clk", csi_rdi2_clk.c, "msm_ispif.0"),
CLK_LOOKUP("csi_phy_clk", csi2_phy_clk.c, NULL),
CLK_LOOKUP("csi2phy_timer_clk", csi2phy_timer_clk.c, NULL),
- CLK_LOOKUP("usb_hsic_xcvr_fs_clk", usb_hsic_xcvr_fs_clk.c, NULL),
- CLK_LOOKUP("usb_hsic_hsic_clk", usb_hsic_hsic_clk.c, NULL),
- CLK_LOOKUP("usb_hsic_hsio_cal_clk", usb_hsic_hsio_cal_clk.c, NULL),
- CLK_LOOKUP("usb_hsic_system_clk", usb_hsic_system_clk.c, NULL),
- CLK_LOOKUP("usb_hsic_p_clk", usb_hsic_p_clk.c, NULL),
+ CLK_LOOKUP("alt_core_clk", usb_hsic_xcvr_fs_clk.c, "msm_hsic_host"),
+ CLK_LOOKUP("phy_clk", usb_hsic_hsic_clk.c, "msm_hsic_host"),
+ CLK_LOOKUP("cal_clk", usb_hsic_hsio_cal_clk.c, "msm_hsic_host"),
+ CLK_LOOKUP("core_clk", usb_hsic_system_clk.c, "msm_hsic_host"),
+ CLK_LOOKUP("iface_clk", usb_hsic_p_clk.c, "msm_hsic_host"),
};
/* Add v2 clocks dynamically at runtime */
diff --git a/arch/arm/mach-msm/clock-8x60.c b/arch/arm/mach-msm/clock-8x60.c
index 9da8bb4..d61547fa 100644
--- a/arch/arm/mach-msm/clock-8x60.c
+++ b/arch/arm/mach-msm/clock-8x60.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2011, Code Aurora Forum. All rights reserved.
+/* Copyright (c) 2009-2012, Code Aurora Forum. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -3635,14 +3635,14 @@
CLK_LOOKUP("ref_clk", tsif_ref_clk.c, "msm_tsif.0"),
CLK_LOOKUP("ref_clk", tsif_ref_clk.c, "msm_tsif.1"),
CLK_LOOKUP("core_clk", tssc_clk.c, NULL),
- CLK_LOOKUP("usb_hs_clk", usb_hs1_xcvr_clk.c, NULL),
- CLK_LOOKUP("usb_phy_clk", usb_phy0_clk.c, NULL),
- CLK_LOOKUP("usb_fs_clk", usb_fs1_xcvr_clk.c, NULL),
- CLK_LOOKUP("usb_fs_sys_clk", usb_fs1_sys_clk.c, NULL),
- CLK_LOOKUP("usb_fs_src_clk", usb_fs1_src_clk.c, NULL),
- CLK_LOOKUP("usb_fs_clk", usb_fs2_xcvr_clk.c, NULL),
- 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("alt_core_clk", usb_hs1_xcvr_clk.c, "msm_otg"),
+ CLK_LOOKUP("phy_clk", usb_phy0_clk.c, "msm_otg"),
+ CLK_LOOKUP("alt_core_clk", usb_fs1_xcvr_clk.c, NULL),
+ CLK_LOOKUP("sys_clk", usb_fs1_sys_clk.c, NULL),
+ CLK_LOOKUP("src_clk", usb_fs1_src_clk.c, NULL),
+ CLK_LOOKUP("alt_core_clk", usb_fs2_xcvr_clk.c, NULL),
+ CLK_LOOKUP("sys_clk", usb_fs2_sys_clk.c, NULL),
+ CLK_LOOKUP("src_clk", usb_fs2_src_clk.c, NULL),
CLK_LOOKUP("core_clk", ce2_p_clk.c, "qce.0"),
CLK_LOOKUP("core_clk", ce2_p_clk.c, "qcrypto.0"),
CLK_LOOKUP("iface_clk", gsbi1_p_clk.c, "spi_qsd.0"),
@@ -3664,9 +3664,9 @@
CLK_LOOKUP("ppss_pclk", ppss_p_clk.c, NULL),
CLK_LOOKUP("iface_clk", tsif_p_clk.c, "msm_tsif.0"),
CLK_LOOKUP("iface_clk", tsif_p_clk.c, "msm_tsif.1"),
- CLK_LOOKUP("usb_fs_pclk", usb_fs1_p_clk.c, NULL),
- CLK_LOOKUP("usb_fs_pclk", usb_fs2_p_clk.c, NULL),
- CLK_LOOKUP("usb_hs_pclk", usb_hs1_p_clk.c, NULL),
+ CLK_LOOKUP("iface_clk", usb_fs1_p_clk.c, NULL),
+ CLK_LOOKUP("iface_clk", usb_fs2_p_clk.c, NULL),
+ CLK_LOOKUP("iface_clk", usb_hs1_p_clk.c, "msm_otg"),
CLK_LOOKUP("iface_clk", sdc1_p_clk.c, "msm_sdcc.1"),
CLK_LOOKUP("iface_clk", sdc2_p_clk.c, "msm_sdcc.2"),
CLK_LOOKUP("iface_clk", sdc3_p_clk.c, "msm_sdcc.3"),
@@ -3788,7 +3788,7 @@
CLK_LOOKUP("core_clk", gfx2d1_clk.c, "msm_iommu.11"),
CLK_LOOKUP("dfab_dsps_clk", dfab_dsps_clk.c, NULL),
- CLK_LOOKUP("dfab_usb_hs_clk", dfab_usb_hs_clk.c, NULL),
+ CLK_LOOKUP("core_clk", dfab_usb_hs_clk.c, "msm_otg"),
CLK_LOOKUP("bus_clk", dfab_sdc1_clk.c, "msm_sdcc.1"),
CLK_LOOKUP("bus_clk", dfab_sdc2_clk.c, "msm_sdcc.2"),
CLK_LOOKUP("bus_clk", dfab_sdc3_clk.c, "msm_sdcc.3"),
diff --git a/arch/arm/mach-msm/clock-9615.c b/arch/arm/mach-msm/clock-9615.c
index a6f5607..76219ab 100644
--- a/arch/arm/mach-msm/clock-9615.c
+++ b/arch/arm/mach-msm/clock-9615.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2011, Code Aurora Forum. All rights reserved.
+/* Copyright (c) 2009-2012, Code Aurora Forum. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -1670,14 +1670,14 @@
CLK_LOOKUP("iface_clk", gsbi4_p_clk.c, "msm_serial_hsl.0"),
CLK_LOOKUP("iface_clk", gsbi5_p_clk.c, "qup_i2c.0"),
- CLK_LOOKUP("usb_hs_pclk", usb_hs1_p_clk.c, NULL),
- CLK_LOOKUP("usb_hs_system_clk", usb_hs1_sys_clk.c, NULL),
- CLK_LOOKUP("usb_hs_clk", usb_hs1_xcvr_clk.c, NULL),
- CLK_LOOKUP("usb_hsic_xcvr_clk", usb_hsic_xcvr_clk.c, NULL),
- CLK_LOOKUP("usb_hsic_hsio_cal_clk", usb_hsic_hsio_cal_clk.c, NULL),
- CLK_LOOKUP("usb_hsic_sys_clk", usb_hsic_sys_clk.c, NULL),
- CLK_LOOKUP("usb_hsic_p_clk", usb_hsic_p_clk.c, NULL),
- CLK_LOOKUP("usb_hsic_clk", usb_hsic_clk.c, NULL),
+ CLK_LOOKUP("iface_clk", usb_hs1_p_clk.c, "msm_otg"),
+ CLK_LOOKUP("core_clk", usb_hs1_sys_clk.c, "msm_otg"),
+ CLK_LOOKUP("alt_core_clk", usb_hs1_xcvr_clk.c, "msm_otg"),
+ CLK_LOOKUP("alt_core_clk", usb_hsic_xcvr_clk.c, "msm_hsic_host"),
+ CLK_LOOKUP("cal_clk", usb_hsic_hsio_cal_clk.c, "msm_hsic_host"),
+ CLK_LOOKUP("core_clk", usb_hsic_sys_clk.c, "msm_hsic_host"),
+ CLK_LOOKUP("iface_clk", usb_hsic_p_clk.c, "msm_hsic_host"),
+ CLK_LOOKUP("phy_clk", usb_hsic_clk.c, "msm_hsic_host"),
CLK_LOOKUP("iface_clk", sdc1_p_clk.c, "msm_sdcc.1"),
CLK_LOOKUP("iface_clk", sdc2_p_clk.c, "msm_sdcc.2"),
@@ -1702,7 +1702,7 @@
CLK_LOOKUP("sps_slimbus_clk", sps_slimbus_clk.c, NULL),
CLK_LOOKUP("audio_slimbus_clk", audio_slimbus_clk.c, NULL),
- CLK_LOOKUP("dfab_usb_hs_clk", dfab_usb_hs_clk.c, NULL),
+ CLK_LOOKUP("core_clk", dfab_usb_hs_clk.c, "msm_otg"),
CLK_LOOKUP("bus_clk", dfab_sdc1_clk.c, "msm_sdcc.1"),
CLK_LOOKUP("bus_clk", dfab_sdc2_clk.c, "msm_sdcc.2"),
CLK_LOOKUP("dfab_clk", dfab_sps_clk.c, "msm_sps"),
diff --git a/arch/arm/mach-msm/clock-pcom-lookup.c b/arch/arm/mach-msm/clock-pcom-lookup.c
index dd31bd7..7a3f49e 100644
--- a/arch/arm/mach-msm/clock-pcom-lookup.c
+++ b/arch/arm/mach-msm/clock-pcom-lookup.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
+/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -178,9 +178,13 @@
CLK_LOOKUP("core_clk", uart3_clk.c, "msm_serial.2"),
CLK_LOOKUP("core_clk", uart1dm_clk.c, "msm_serial_hs.0"),
CLK_LOOKUP("core_clk", uart2dm_clk.c, "msm_serial_hs.1"),
- CLK_LOOKUP("usb_hs_clk", usb_hs_clk.c, "msm_otg"),
- CLK_LOOKUP("usb_hs_pclk", usb_hs_p_clk.c, "msm_otg"),
- CLK_LOOKUP("usb_otg_clk", usb_otg_clk.c, NULL),
+ CLK_LOOKUP("alt_core_clk", usb_hs_clk.c, "msm_otg"),
+ CLK_LOOKUP("iface_clk", usb_hs_p_clk.c, "msm_otg"),
+ CLK_LOOKUP("alt_core_clk", usb_hs_clk.c, "msm_hsusb_otg"),
+ CLK_LOOKUP("iface_clk", usb_hs_p_clk.c, "msm_hsusb_otg"),
+ CLK_LOOKUP("alt_core_clk", usb_hs_clk.c, "msm_hsusb_peripheral"),
+ CLK_LOOKUP("iface_clk", usb_hs_p_clk.c, "msm_hsusb_peripheral"),
+ CLK_LOOKUP("alt_core_clk", usb_otg_clk.c, NULL),
CLK_LOOKUP("vdc_clk", vdc_clk.c, NULL),
CLK_LOOKUP("vfe_clk", vfe_clk.c, NULL),
CLK_LOOKUP("vfe_mdc_clk", vfe_mdc_clk.c, NULL),
@@ -230,10 +234,10 @@
CLK_LOOKUP("core_clk", uart2_clk.c, "msm_serial.1"),
CLK_LOOKUP("core_clk", uart1dm_clk.c, "msm_serial_hs.0"),
CLK_LOOKUP("core_clk", uart2dm_clk.c, "msm_serial_hs.1"),
- CLK_LOOKUP("usb_hs_clk", usb_hs_clk.c, NULL),
- CLK_LOOKUP("usb_hs_pclk", usb_hs_p_clk.c, NULL),
- CLK_LOOKUP("usb_otg_clk", usb_otg_clk.c, NULL),
- CLK_LOOKUP("usb_phy_clk", usb_phy_clk.c, NULL),
+ CLK_LOOKUP("alt_core_clk", usb_hs_clk.c, "msm_otg"),
+ CLK_LOOKUP("iface_clk", usb_hs_p_clk.c, "msm_otg"),
+ CLK_LOOKUP("alt_core_clk", usb_otg_clk.c, NULL),
+ CLK_LOOKUP("phy_clk", usb_phy_clk.c, "msm_otg"),
CLK_LOOKUP("vdc_clk", vdc_clk.c, NULL),
CLK_LOOKUP("core_clk", vdc_clk.c, "footswitch-pcom.7"),
CLK_LOOKUP("vfe_clk", vfe_clk.c, NULL),
@@ -244,7 +248,7 @@
CLK_LOOKUP("bus_clk", ebi_grp_3d_clk.c, "kgsl-3d0.0"),
CLK_LOOKUP("ebi1_lcdc_clk", ebi_lcdc_clk.c, NULL),
CLK_LOOKUP("ebi1_mddi_clk", ebi_mddi_clk.c, NULL),
- CLK_LOOKUP("ebi1_usb_clk", ebi_usb_clk.c, NULL),
+ CLK_LOOKUP("core_clk", ebi_usb_clk.c, "msm_otg"),
CLK_LOOKUP("ebi1_vfe_clk", ebi_vfe_clk.c, NULL),
CLK_LOOKUP("mem_clk", ebi_adm_clk.c, "msm_dmov"),
};
@@ -312,11 +316,11 @@
CLK_LOOKUP("core_clk", uart2_clk.c, "msm_serial.1"),
CLK_LOOKUP("core_clk", uart1dm_clk.c, "msm_serial_hs.0"),
CLK_LOOKUP("core_clk", uart2dm_clk.c, "msm_serial_hsl.0"),
- CLK_LOOKUP("usb_hs_core_clk", usb_hs_core_clk.c, NULL),
- CLK_LOOKUP("usb_hs2_clk", usb_hs2_clk.c, NULL),
- CLK_LOOKUP("usb_hs_clk", usb_hs_clk.c, NULL),
- CLK_LOOKUP("usb_hs_pclk", usb_hs_p_clk.c, NULL),
- CLK_LOOKUP("usb_phy_clk", usb_phy_clk.c, NULL),
+ CLK_LOOKUP("core_clk", usb_hs_core_clk.c, "msm_otg"),
+ CLK_LOOKUP("alt_core_clk", usb_hs_clk.c, "msm_otg"),
+ CLK_LOOKUP("iface_clk", usb_hs_p_clk.c, "msm_otg"),
+ CLK_LOOKUP("phy_clk", usb_phy_clk.c, "msm_otg"),
+ CLK_LOOKUP("alt_core_clk", usb_hs2_clk.c, "msm_hsusb_host.0"),
CLK_LOOKUP("vdc_clk", vdc_clk.c, NULL),
CLK_LOOKUP("core_clk", vdc_clk.c, "footswitch-pcom.7"),
CLK_LOOKUP("vfe_clk", vfe_clk.c, NULL),
@@ -327,7 +331,6 @@
CLK_LOOKUP("bus_clk", ebi_grp_3d_clk.c, "kgsl-3d0.0"),
CLK_LOOKUP("ebi1_lcdc_clk", ebi_lcdc_clk.c, NULL),
CLK_LOOKUP("ebi1_mddi_clk", ebi_mddi_clk.c, NULL),
- CLK_LOOKUP("ebi1_usb_clk", ebi_usb_clk.c, NULL),
CLK_LOOKUP("ebi1_vfe_clk", ebi_vfe_clk.c, NULL),
CLK_LOOKUP("mem_clk", ebi_adm_clk.c, "msm_dmov"),
};
@@ -378,18 +381,18 @@
CLK_LOOKUP("core_clk", uart3_clk.c, "msm_serial.2"),
CLK_LOOKUP("core_clk", uart1dm_clk.c, "msm_serial_hs.0"),
CLK_LOOKUP("core_clk", uart2dm_clk.c, "msm_serial_hs.1"),
- CLK_LOOKUP("usb_hs_clk", usb_hs_clk.c, NULL),
- CLK_LOOKUP("usb_hs_pclk", usb_hs_p_clk.c, NULL),
- CLK_LOOKUP("usb_otg_clk", usb_otg_clk.c, NULL),
+ CLK_LOOKUP("alt_core_clk", usb_hs_clk.c, "msm_otg"),
+ CLK_LOOKUP("iface_clk", usb_hs_p_clk.c, "msm_otg"),
+ CLK_LOOKUP("alt_core_clk", usb_otg_clk.c, NULL),
CLK_LOOKUP("vdc_clk", vdc_clk.c, NULL),
CLK_LOOKUP("vfe_clk", vfe_clk.c, NULL),
CLK_LOOKUP("vfe_mdc_clk", vfe_mdc_clk.c, NULL),
CLK_LOOKUP("vfe_axi_clk", vfe_axi_clk.c, NULL),
- CLK_LOOKUP("usb_hs2_clk", usb_hs2_clk.c, NULL),
- CLK_LOOKUP("usb_hs2_pclk", usb_hs2_p_clk.c, NULL),
- CLK_LOOKUP("usb_hs3_clk", usb_hs3_clk.c, NULL),
- CLK_LOOKUP("usb_hs3_pclk", usb_hs3_p_clk.c, NULL),
- CLK_LOOKUP("usb_phy_clk", usb_phy_clk.c, NULL),
+ CLK_LOOKUP("alt_core_clk", usb_hs2_clk.c, "msm_hsusb_host.0"),
+ CLK_LOOKUP("iface_clk", usb_hs2_p_clk.c, "msm_hsusb_host.0"),
+ CLK_LOOKUP("alt_core_clk", usb_hs3_clk.c, NULL),
+ CLK_LOOKUP("iface_clk", usb_hs3_p_clk.c, NULL),
+ CLK_LOOKUP("phy_clk", usb_phy_clk.c, "msm_otg"),
CLK_LOOKUP("ebi1_acpu_clk", ebi_acpu_clk.c, NULL),
CLK_LOOKUP("bus_clk", ebi_grp_3d_clk.c, "kgsl-3d0.0"),
@@ -397,7 +400,8 @@
CLK_LOOKUP("ebi1_lcdc_clk", ebi_lcdc_clk.c, NULL),
CLK_LOOKUP("ebi1_mddi_clk", ebi_mddi_clk.c, NULL),
CLK_LOOKUP("ebi1_tv_clk", ebi_tv_clk.c, NULL),
- CLK_LOOKUP("ebi1_usb_clk", ebi_usb_clk.c, NULL),
+ CLK_LOOKUP("core_clk", ebi_usb_clk.c, "msm_otg"),
+ CLK_LOOKUP("core_clk", ebi_usb_clk.c, "msm_hsusb_host.0"),
CLK_LOOKUP("ebi1_vfe_clk", ebi_vfe_clk.c, NULL),
CLK_LOOKUP("mem_clk", ebi_adm_clk.c, "msm_dmov"),
diff --git a/arch/arm/mach-msm/devices-8064.c b/arch/arm/mach-msm/devices-8064.c
index b0f4c9f..12a00e6 100644
--- a/arch/arm/mach-msm/devices-8064.c
+++ b/arch/arm/mach-msm/devices-8064.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
+/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -779,13 +779,13 @@
CLK_DUMMY("core_clk", SDC4_CLK, NULL, OFF),
CLK_DUMMY("ref_clk", TSIF_REF_CLK, NULL, OFF),
CLK_DUMMY("core_clk", TSSC_CLK, NULL, OFF),
- CLK_DUMMY("usb_hs_clk", USB_HS1_XCVR_CLK, NULL, OFF),
- CLK_DUMMY("usb_hs_clk", USB_HS3_XCVR_CLK, NULL, OFF),
- CLK_DUMMY("usb_hs_clk", USB_HS4_XCVR_CLK, NULL, OFF),
- CLK_DUMMY("usb_phy_clk", USB_PHY0_CLK, NULL, OFF),
- CLK_DUMMY("usb_fs_src_clk", USB_FS1_SRC_CLK, NULL, OFF),
- CLK_DUMMY("usb_fs_clk", USB_FS1_XCVR_CLK, NULL, OFF),
- CLK_DUMMY("usb_fs_sys_clk", USB_FS1_SYS_CLK, NULL, OFF),
+ CLK_DUMMY("alt_core_clk", USB_HS1_XCVR_CLK, NULL, OFF),
+ CLK_DUMMY("alt_core_clk", USB_HS3_XCVR_CLK, NULL, OFF),
+ CLK_DUMMY("alt_core_clk", USB_HS4_XCVR_CLK, NULL, OFF),
+ CLK_DUMMY("phy_clk", USB_PHY0_CLK, NULL, OFF),
+ CLK_DUMMY("src_clk", USB_FS1_SRC_CLK, NULL, OFF),
+ CLK_DUMMY("alt_core_clk", USB_FS1_XCVR_CLK, NULL, OFF),
+ CLK_DUMMY("sys_clk", USB_FS1_SYS_CLK, NULL, OFF),
CLK_DUMMY("core_clk", CE2_CLK, NULL, OFF),
CLK_DUMMY("core_clk", CE1_CORE_CLK, NULL, OFF),
CLK_DUMMY("core_clk", CE3_CORE_CLK, NULL, OFF),
@@ -803,10 +803,10 @@
CLK_DUMMY("iface_clk", GSBI6_P_CLK, NULL, OFF),
CLK_DUMMY("iface_clk", GSBI7_P_CLK, NULL, OFF),
CLK_DUMMY("iface_clk", TSIF_P_CLK, NULL, OFF),
- CLK_DUMMY("usb_fs_pclk", USB_FS1_P_CLK, NULL, OFF),
- CLK_DUMMY("usb_hs_pclk", USB_HS1_P_CLK, NULL, OFF),
- CLK_DUMMY("usb_hs_pclk", USB_HS3_P_CLK, NULL, OFF),
- CLK_DUMMY("usb_hs_pclk", USB_HS4_P_CLK, NULL, OFF),
+ CLK_DUMMY("iface_clk", USB_FS1_P_CLK, NULL, OFF),
+ CLK_DUMMY("iface_clk", USB_HS1_P_CLK, NULL, OFF),
+ CLK_DUMMY("iface_clk", USB_HS3_P_CLK, NULL, OFF),
+ CLK_DUMMY("iface_clk", USB_HS4_P_CLK, NULL, OFF),
CLK_DUMMY("iface_clk", SDC1_P_CLK, NULL, OFF),
CLK_DUMMY("iface_clk", SDC2_P_CLK, NULL, OFF),
CLK_DUMMY("iface_clk", SDC3_P_CLK, NULL, OFF),
@@ -900,7 +900,7 @@
CLK_DUMMY("audio_slimbus_clk", AUDIO_SLIMBUS_CLK, NULL, OFF),
CLK_DUMMY("dfab_dsps_clk", DFAB_DSPS_CLK, NULL, 0),
- CLK_DUMMY("dfab_usb_hs_clk", DFAB_USB_HS_CLK, NULL, 0),
+ CLK_DUMMY("core_clk", DFAB_USB_HS_CLK, NULL, 0),
CLK_DUMMY("bus_clk", DFAB_SDC1_CLK, NULL, 0),
CLK_DUMMY("bus_clk", DFAB_SDC2_CLK, NULL, 0),
CLK_DUMMY("bus_clk", DFAB_SDC3_CLK, NULL, 0),
diff --git a/arch/arm/mach-msm/devices-8960.c b/arch/arm/mach-msm/devices-8960.c
index e14d4c0..7f92bbe 100644
--- a/arch/arm/mach-msm/devices-8960.c
+++ b/arch/arm/mach-msm/devices-8960.c
@@ -1865,14 +1865,14 @@
CLK_DUMMY("core_clk", SDC5_CLK, NULL, OFF),
CLK_DUMMY("core_clk", TSIF_REF_CLK, NULL, OFF),
CLK_DUMMY("core_clk", TSSC_CLK, NULL, OFF),
- CLK_DUMMY("usb_hs_clk", USB_HS1_XCVR_CLK, NULL, OFF),
- CLK_DUMMY("usb_phy_clk", USB_PHY0_CLK, NULL, OFF),
- CLK_DUMMY("usb_fs_src_clk", USB_FS1_SRC_CLK, NULL, OFF),
- CLK_DUMMY("usb_fs_clk", USB_FS1_XCVR_CLK, NULL, OFF),
- CLK_DUMMY("usb_fs_sys_clk", USB_FS1_SYS_CLK, NULL, OFF),
- CLK_DUMMY("usb_fs_src_clk", USB_FS2_SRC_CLK, NULL, OFF),
- CLK_DUMMY("usb_fs_clk", USB_FS2_XCVR_CLK, NULL, OFF),
- CLK_DUMMY("usb_fs_sys_clk", USB_FS2_SYS_CLK, NULL, OFF),
+ CLK_DUMMY("alt_core_clk", USB_HS1_XCVR_CLK, NULL, OFF),
+ CLK_DUMMY("phy_clk", USB_PHY0_CLK, NULL, OFF),
+ CLK_DUMMY("src_clk", USB_FS1_SRC_CLK, NULL, OFF),
+ CLK_DUMMY("alt_core_clk", USB_FS1_XCVR_CLK, NULL, OFF),
+ CLK_DUMMY("sys_clk", USB_FS1_SYS_CLK, NULL, OFF),
+ CLK_DUMMY("src_clk", USB_FS2_SRC_CLK, NULL, OFF),
+ CLK_DUMMY("alt_core_clk", USB_FS2_XCVR_CLK, NULL, OFF),
+ CLK_DUMMY("sys_clk", USB_FS2_SYS_CLK, NULL, OFF),
CLK_DUMMY("iface_clk", CE2_CLK, "qce.0", OFF),
CLK_DUMMY("core_clk", CE1_CORE_CLK, "qce.0", OFF),
CLK_DUMMY("iface_clk", GSBI1_P_CLK, "spi_qsd.0", OFF),
@@ -1890,9 +1890,9 @@
CLK_DUMMY("iface_clk", GSBI12_P_CLK, NULL, OFF),
CLK_DUMMY("iface_clk", GSBI12_P_CLK, NULL, OFF),
CLK_DUMMY("iface_clk", TSIF_P_CLK, NULL, OFF),
- CLK_DUMMY("usb_fs_pclk", USB_FS1_P_CLK, NULL, OFF),
- CLK_DUMMY("usb_fs_pclk", USB_FS2_P_CLK, NULL, OFF),
- CLK_DUMMY("usb_hs_pclk", USB_HS1_P_CLK, NULL, OFF),
+ CLK_DUMMY("iface_clk", USB_FS1_P_CLK, NULL, OFF),
+ CLK_DUMMY("iface_clk", USB_FS2_P_CLK, NULL, OFF),
+ CLK_DUMMY("iface_clk", USB_HS1_P_CLK, NULL, OFF),
CLK_DUMMY("iface_clk", SDC1_P_CLK, NULL, OFF),
CLK_DUMMY("iface_clk", SDC2_P_CLK, NULL, OFF),
CLK_DUMMY("iface_clk", SDC3_P_CLK, NULL, OFF),
@@ -1988,7 +1988,7 @@
CLK_DUMMY("core_clk", GFX2D1_CLK, NULL, 0),
CLK_DUMMY("dfab_dsps_clk", DFAB_DSPS_CLK, NULL, 0),
- CLK_DUMMY("dfab_usb_hs_clk", DFAB_USB_HS_CLK, NULL, 0),
+ CLK_DUMMY("core_clk", DFAB_USB_HS_CLK, "msm_otg", NULL),
CLK_DUMMY("bus_clk", DFAB_SDC1_CLK, "msm_sdcc.1", 0),
CLK_DUMMY("bus_clk", DFAB_SDC2_CLK, "msm_sdcc.2", 0),
CLK_DUMMY("bus_clk", DFAB_SDC3_CLK, "msm_sdcc.3", 0),
diff --git a/arch/arm/mach-msm/devices-msm7x25.c b/arch/arm/mach-msm/devices-msm7x25.c
index 71b57b4..2be7d5e 100644
--- a/arch/arm/mach-msm/devices-msm7x25.c
+++ b/arch/arm/mach-msm/devices-msm7x25.c
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2008 Google, Inc.
- * Copyright (c) 2008-2011, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2008-2012, Code Aurora Forum. All rights reserved.
*
* This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and
@@ -968,9 +968,11 @@
CLK_LOOKUP("core_clk", uart3_clk.c, "msm_serial.2"),
CLK_LOOKUP("core_clk", uart1dm_clk.c, "msm_serial_hs.0"),
CLK_LOOKUP("core_clk", uart2dm_clk.c, "msm_serial_hs.1"),
- CLK_LOOKUP("usb_hs_clk", usb_hs_clk.c, NULL),
- CLK_LOOKUP("usb_hs_pclk", usb_hs_p_clk.c, NULL),
- CLK_LOOKUP("usb_otg_clk", usb_otg_clk.c, NULL),
+ CLK_LOOKUP("alt_core_clk", usb_hs_clk.c, "msm_otg"),
+ CLK_LOOKUP("iface_clk", usb_hs_p_clk.c, "msm_otg"),
+ CLK_LOOKUP("alt_core_clk", usb_hs_clk.c, "msm_hsusb_peripheral"),
+ CLK_LOOKUP("iface_clk", usb_hs_p_clk.c, "msm_hsusb_peripheral"),
+ CLK_LOOKUP("alt_core_clk", usb_otg_clk.c, NULL),
CLK_LOOKUP("vdc_clk", vdc_clk.c, NULL),
CLK_LOOKUP("vfe_clk", vfe_clk.c, NULL),
CLK_LOOKUP("vfe_mdc_clk", vfe_mdc_clk.c, NULL),
diff --git a/arch/arm/mach-msm/include/mach/msm72k_otg.h b/arch/arm/mach-msm/include/mach/msm72k_otg.h
index 4509dad..e928278 100644
--- a/arch/arm/mach-msm/include/mach/msm72k_otg.h
+++ b/arch/arm/mach-msm/include/mach/msm72k_otg.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2011, Code Aurora Forum. All rights reserved.
+/* Copyright (c) 2009-2012, Code Aurora Forum. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -113,12 +113,9 @@
struct otg_transceiver otg;
/* usb clocks */
- struct clk *hs_clk;
- struct clk *hs_pclk;
- struct clk *hs_cclk;
-
- /* pclk source for voting */
- struct clk *pclk_src;
+ struct clk *alt_core_clk;
+ struct clk *iface_clk;
+ struct clk *core_clk;
/* clk regime has created dummy clock id for phy so
* that generic clk_reset api can be used to reset phy
@@ -163,21 +160,6 @@
#endif
};
-static inline int pclk_requires_voting(struct otg_transceiver *xceiv)
-{
- struct msm_otg *dev;
-
- if (!xceiv)
- return 0;
-
- dev = container_of(xceiv, struct msm_otg, otg);
-
- if (dev->pdata->pclk_src_name)
- return 1;
- else
- return 0;
-}
-
static inline int can_phy_power_collapse(struct msm_otg *dev)
{
if (!dev || !dev->pdata)
diff --git a/arch/arm/mach-msm/include/mach/msm_hsusb.h b/arch/arm/mach-msm/include/mach/msm_hsusb.h
index 3e8ab55..8dd761c 100644
--- a/arch/arm/mach-msm/include/mach/msm_hsusb.h
+++ b/arch/arm/mach-msm/include/mach/msm_hsusb.h
@@ -1,7 +1,7 @@
/* linux/include/mach/hsusb.h
*
* Copyright (C) 2008 Google, Inc.
- * Copyright (c) 2009-2011, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2009-2012, Code Aurora Forum. All rights reserved.
* Author: Brian Swetland <swetland@google.com>
*
* This software is licensed under the terms of the GNU General Public
@@ -126,7 +126,6 @@
struct msm_otg_platform_data {
int (*rpc_connect)(int);
int (*phy_reset)(void __iomem *);
- unsigned int core_clk;
int pmic_vbus_irq;
int pmic_id_irq;
/* if usb link is in sps there is no need for
@@ -148,7 +147,6 @@
* now being disabled because of H/w issues
*/
int pclk_is_hw_gated;
- char *pclk_src_name;
int (*ldo_init) (int init);
int (*ldo_enable) (int enable);