From: chenxing Date: Wed, 19 Sep 2012 10:15:47 +0000 (+0800) Subject: rk3066b: rename hclk_emac to hclk_mac X-Git-Tag: firefly_0821_release~8600 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a031ead3bf3a9c24b6e5b11bfdb9c8c0357058a0;p=firefly-linux-kernel-4.4.55.git rk3066b: rename hclk_emac to hclk_mac --- diff --git a/arch/arm/mach-rk30/clock_data-rk3066b.c b/arch/arm/mach-rk30/clock_data-rk3066b.c index 842a231ba30e..16d443283a01 100644 --- a/arch/arm/mach-rk30/clock_data-rk3066b.c +++ b/arch/arm/mach-rk30/clock_data-rk3066b.c @@ -2440,7 +2440,7 @@ GATE_CLK(aclk_peri_axi_matrix, aclk_periph, ACLK_PERI_AXI_MATRIX); GATE_CLK(hclk_peri_axi_matrix, hclk_periph, HCLK_PERI_AXI_MATRIX); GATE_CLK(hclk_peri_ahb_arbi, hclk_periph, HCLK_PERI_AHB_ARBI); GATE_CLK(hclk_emem_peri, hclk_periph, HCLK_EMEM_PERI); -GATE_CLK(hclk_emac, hclk_periph, HCLK_EMAC); +GATE_CLK(hclk_mac, hclk_periph, HCLK_EMAC); GATE_CLK(nandc, hclk_periph, HCLK_NANDC); GATE_CLK(hclk_usb_peri, hclk_periph, HCLK_USB_PERI); GATE_CLK(hclk_otg0, clk_hclk_usb_peri, HCLK_OTG0); @@ -2667,7 +2667,7 @@ static struct clk_lookup clks[] = { CLK1(hclk_peri_axi_matrix), CLK1(hclk_peri_ahb_arbi), CLK1(hclk_emem_peri), - CLK1(hclk_emac), + CLK1(hclk_mac), CLK1(nandc), CLK1(hclk_usb_peri), CLK1(hclk_otg0), @@ -2922,7 +2922,7 @@ static void __init rk30_init_enable_clocks(void) clk_enable_nolock(&clk_hclk_peri_axi_matrix); clk_enable_nolock(&clk_hclk_peri_ahb_arbi); clk_enable_nolock(&clk_hclk_emem_peri); - //clk_enable_nolock(&clk_hclk_emac); + //clk_enable_nolock(&clk_hclk_mac); //clk_enable_nolock(&clk_nandc); clk_enable_nolock(&clk_hclk_usb_peri); #if 0