We don't need multiple aliases for the OMAP USB host clocks so remove them.

CC: Paul Walmsley <p...@pwsan.com>
CC: Rajendra Nayak <rna...@ti.com>
CC: Benoit Cousson <b-cous...@ti.com>
CC: Mike Turquette <mturque...@gmail.com>

Signed-off-by: Roger Quadros <rog...@ti.com>
---
 arch/arm/mach-omap2/cclock44xx_data.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-omap2/cclock44xx_data.c 
b/arch/arm/mach-omap2/cclock44xx_data.c
index 74535fe..5a27244 100644
--- a/arch/arm/mach-omap2/cclock44xx_data.c
+++ b/arch/arm/mach-omap2/cclock44xx_data.c
@@ -1858,7 +1858,6 @@ static struct omap_clk omap44xx_clks[] = {
        CLK(NULL,       "uart3_fck",                    &uart3_fck,     
CK_443X),
        CLK(NULL,       "uart4_fck",                    &uart4_fck,     
CK_443X),
        CLK(NULL,       "usb_host_fs_fck",              &usb_host_fs_fck,       
CK_443X),
-       CLK("usbhs_omap",       "fs_fck",               &usb_host_fs_fck,       
CK_443X),
        CLK(NULL,       "usb_host_hs_utmi_p1_clk",      
&usb_host_hs_utmi_p1_clk,       CK_443X),
        CLK(NULL,       "usb_host_hs_utmi_p2_clk",      
&usb_host_hs_utmi_p2_clk,       CK_443X),
        CLK(NULL,       "usb_host_hs_utmi_p3_clk",      
&usb_host_hs_utmi_p3_clk,       CK_443X),
@@ -1868,7 +1867,6 @@ static struct omap_clk omap44xx_clks[] = {
        CLK(NULL,       "usb_host_hs_hsic480m_p2_clk",  
&usb_host_hs_hsic480m_p2_clk,   CK_443X),
        CLK(NULL,       "usb_host_hs_func48mclk",       
&usb_host_hs_func48mclk,        CK_443X),
        CLK(NULL,       "usb_host_hs_fck",              &usb_host_hs_fck,       
CK_443X),
-       CLK("usbhs_omap",       "hs_fck",               &usb_host_hs_fck,       
CK_443X),
        CLK(NULL,       "otg_60m_gfclk",                &otg_60m_gfclk, 
CK_443X),
        CLK(NULL,       "usb_otg_hs_xclk",              &usb_otg_hs_xclk,       
CK_443X),
        CLK(NULL,       "usb_otg_hs_ick",               &usb_otg_hs_ick,        
CK_443X),
@@ -1878,8 +1876,6 @@ static struct omap_clk omap44xx_clks[] = {
        CLK(NULL,       "usb_tll_hs_usb_ch0_clk",       
&usb_tll_hs_usb_ch0_clk,        CK_443X),
        CLK(NULL,       "usb_tll_hs_usb_ch1_clk",       
&usb_tll_hs_usb_ch1_clk,        CK_443X),
        CLK(NULL,       "usb_tll_hs_ick",               &usb_tll_hs_ick,        
CK_443X),
-       CLK("usbhs_omap",       "usbtll_ick",           &usb_tll_hs_ick,        
CK_443X),
-       CLK("usbhs_tll",        "usbtll_ick",           &usb_tll_hs_ick,        
CK_443X),
        CLK(NULL,       "usim_ck",                      &usim_ck,       
CK_443X),
        CLK(NULL,       "usim_fclk",                    &usim_fclk,     
CK_443X),
        CLK(NULL,       "usim_fck",                     &usim_fck,      
CK_443X),
@@ -1930,9 +1926,7 @@ static struct omap_clk omap44xx_clks[] = {
        CLK(NULL,       "uart2_ick",                    &dummy_ck,      
CK_443X),
        CLK(NULL,       "uart3_ick",                    &dummy_ck,      
CK_443X),
        CLK(NULL,       "uart4_ick",                    &dummy_ck,      
CK_443X),
-       CLK("usbhs_omap",       "usbhost_ick",          &dummy_ck,              
CK_443X),
-       CLK("usbhs_omap",       "usbtll_fck",           &dummy_ck,      
CK_443X),
-       CLK("usbhs_tll",        "usbtll_fck",           &dummy_ck,      
CK_443X),
+       CLK(NULL,       "usbhost_ick",                  &dummy_ck,      
CK_443X),
        CLK("omap_wdt", "ick",                          &dummy_ck,      
CK_443X),
        CLK(NULL,       "timer_32k_ck", &sys_32k_ck,    CK_443X),
        /* TODO: Remove "omap_timer.X" aliases once DT migration is complete */
-- 
1.7.4.1

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to