aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-spear3xx
diff options
context:
space:
mode:
authorviresh kumar <viresh.kumar@st.com>2011-03-06 23:57:04 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-03-09 04:49:46 -0500
commitb5761371c30009565f88c4c60416de8a24e56f02 (patch)
tree5f5591f1df3e9c9b2bcedd569505bb2cbca840d7 /arch/arm/mach-spear3xx
parent069580b831dba8da8a0751770ee2b2d7a43faf33 (diff)
ARM: 6790/1: SPEAr: Clock Framework: Rename usbd clock and align apb_clk entry
Reviewed-by: Stanley Miao <stanley.miao@windriver.com> Signed-off-by: Deepak Sikri <deepak.sikri@st.com> Signed-off-by: shiraz hashim <shiraz.hashim@st.com> Signed-off-by: Viresh Kumar <viresh.kumar@st.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-spear3xx')
-rw-r--r--arch/arm/mach-spear3xx/clock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-spear3xx/clock.c b/arch/arm/mach-spear3xx/clock.c
index 5bfeb6f8bcc..98bc7edc95a 100644
--- a/arch/arm/mach-spear3xx/clock.c
+++ b/arch/arm/mach-spear3xx/clock.c
@@ -650,7 +650,7 @@ static struct clk pwm_clk = {
650 650
651/* array of all spear 3xx clock lookups */ 651/* array of all spear 3xx clock lookups */
652static struct clk_lookup spear_clk_lookups[] = { 652static struct clk_lookup spear_clk_lookups[] = {
653 { .con_id = "apb_pclk", .clk = &dummy_apb_pclk}, 653 { .con_id = "apb_pclk", .clk = &dummy_apb_pclk},
654 /* root clks */ 654 /* root clks */
655 { .con_id = "osc_32k_clk", .clk = &osc_32k_clk}, 655 { .con_id = "osc_32k_clk", .clk = &osc_32k_clk},
656 { .con_id = "osc_24m_clk", .clk = &osc_24m_clk}, 656 { .con_id = "osc_24m_clk", .clk = &osc_24m_clk},
@@ -674,8 +674,8 @@ static struct clk_lookup spear_clk_lookups[] = {
674 { .dev_id = "gpt1", .clk = &gpt1_clk}, 674 { .dev_id = "gpt1", .clk = &gpt1_clk},
675 { .dev_id = "gpt2", .clk = &gpt2_clk}, 675 { .dev_id = "gpt2", .clk = &gpt2_clk},
676 /* clock derived from pll3 clk */ 676 /* clock derived from pll3 clk */
677 { .dev_id = "designware_udc", .clk = &usbd_clk},
677 { .con_id = "usbh_clk", .clk = &usbh_clk}, 678 { .con_id = "usbh_clk", .clk = &usbh_clk},
678 { .dev_id = "usbd", .clk = &usbd_clk},
679 /* clock derived from ahb clk */ 679 /* clock derived from ahb clk */
680 { .con_id = "apb_clk", .clk = &apb_clk}, 680 { .con_id = "apb_clk", .clk = &apb_clk},
681 { .dev_id = "i2c_designware.0", .clk = &i2c_clk}, 681 { .dev_id = "i2c_designware.0", .clk = &i2c_clk},