diff options
author | viresh kumar <viresh.kumar@st.com> | 2011-03-06 23:57:04 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-09 04:49:46 -0500 |
commit | b5761371c30009565f88c4c60416de8a24e56f02 (patch) | |
tree | 5f5591f1df3e9c9b2bcedd569505bb2cbca840d7 /arch/arm/mach-spear6xx | |
parent | 069580b831dba8da8a0751770ee2b2d7a43faf33 (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-spear6xx')
-rw-r--r-- | arch/arm/mach-spear6xx/clock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-spear6xx/clock.c b/arch/arm/mach-spear6xx/clock.c index 4f351b49c14d..88b748b5be80 100644 --- a/arch/arm/mach-spear6xx/clock.c +++ b/arch/arm/mach-spear6xx/clock.c | |||
@@ -622,7 +622,7 @@ static struct clk dummy_apb_pclk; | |||
622 | 622 | ||
623 | /* array of all spear 6xx clock lookups */ | 623 | /* array of all spear 6xx clock lookups */ |
624 | static struct clk_lookup spear_clk_lookups[] = { | 624 | static struct clk_lookup spear_clk_lookups[] = { |
625 | { .con_id = "apb_pclk", .clk = &dummy_apb_pclk}, | 625 | { .con_id = "apb_pclk", .clk = &dummy_apb_pclk}, |
626 | /* root clks */ | 626 | /* root clks */ |
627 | { .con_id = "osc_32k_clk", .clk = &osc_32k_clk}, | 627 | { .con_id = "osc_32k_clk", .clk = &osc_32k_clk}, |
628 | { .con_id = "osc_30m_clk", .clk = &osc_30m_clk}, | 628 | { .con_id = "osc_30m_clk", .clk = &osc_30m_clk}, |
@@ -650,9 +650,9 @@ static struct clk_lookup spear_clk_lookups[] = { | |||
650 | { .dev_id = "gpt2", .clk = &gpt2_clk}, | 650 | { .dev_id = "gpt2", .clk = &gpt2_clk}, |
651 | { .dev_id = "gpt3", .clk = &gpt3_clk}, | 651 | { .dev_id = "gpt3", .clk = &gpt3_clk}, |
652 | /* clock derived from pll3 clk */ | 652 | /* clock derived from pll3 clk */ |
653 | { .dev_id = "designware_udc", .clk = &usbd_clk}, | ||
653 | { .con_id = "usbh.0_clk", .clk = &usbh0_clk}, | 654 | { .con_id = "usbh.0_clk", .clk = &usbh0_clk}, |
654 | { .con_id = "usbh.1_clk", .clk = &usbh1_clk}, | 655 | { .con_id = "usbh.1_clk", .clk = &usbh1_clk}, |
655 | { .dev_id = "usbd", .clk = &usbd_clk}, | ||
656 | /* clock derived from ahb clk */ | 656 | /* clock derived from ahb clk */ |
657 | { .con_id = "apb_clk", .clk = &apb_clk}, | 657 | { .con_id = "apb_clk", .clk = &apb_clk}, |
658 | { .dev_id = "i2c_designware.0", .clk = &i2c_clk}, | 658 | { .dev_id = "i2c_designware.0", .clk = &i2c_clk}, |