From: chenxing <chenxing@rock-chips.com>
Date: Mon, 20 Aug 2012 12:27:32 +0000 (+0800)
Subject: rk2928:sdk: rename gpio(i)
X-Git-Tag: firefly_0821_release~8886^2~12
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=97044776120135351222b1c3eb9af6816ab93488;p=firefly-linux-kernel-4.4.55.git

rk2928:sdk: rename gpio(i)
---

diff --git a/arch/arm/mach-rk2928/clock_data.c b/arch/arm/mach-rk2928/clock_data.c
index a908f71ae142..a052019f5040 100644
--- a/arch/arm/mach-rk2928/clock_data.c
+++ b/arch/arm/mach-rk2928/clock_data.c
@@ -1897,10 +1897,10 @@ GATE_CLK(pclk_i2c2, pclk_periph_pre, PCLK_I2C2);
 GATE_CLK(pclk_i2c3, pclk_periph_pre, PCLK_I2C3);
 GATE_CLK(pclk_timer0, pclk_periph_pre, PCLK_TIMER0);
 GATE_CLK(pclk_timer1, pclk_periph_pre, PCLK_TIMER1);
-GATE_CLK(pclk_gpio0, pclk_periph_pre, PCLK_GPIO0);
-GATE_CLK(pclk_gpio1, pclk_periph_pre, PCLK_GPIO1);
-GATE_CLK(pclk_gpio2, pclk_periph_pre, PCLK_GPIO2);
-GATE_CLK(pclk_gpio3, pclk_periph_pre, PCLK_GPIO3);
+GATE_CLK(gpio0, pclk_periph_pre, PCLK_GPIO0);
+GATE_CLK(gpio1, pclk_periph_pre, PCLK_GPIO1);
+GATE_CLK(gpio2, pclk_periph_pre, PCLK_GPIO2);
+GATE_CLK(gpio3, pclk_periph_pre, PCLK_GPIO3);
 GATE_CLK(pclk_saradc, pclk_periph_pre, PCLK_SARADC);
 GATE_CLK(pclk_efuse, pclk_periph_pre, PCLK_EFUSE);
 
@@ -2164,10 +2164,10 @@ static struct clk_lookup clks[] = {
 	CLK("rk30_i2c.3", "i2c", &clk_pclk_i2c3),
 	CLK_GATE_NODEV(pclk_timer0),
 	CLK_GATE_NODEV(pclk_timer1),
-	CLK_GATE_NODEV(pclk_gpio0),
-	CLK_GATE_NODEV(pclk_gpio1),
-	CLK_GATE_NODEV(pclk_gpio2),
-	CLK_GATE_NODEV(pclk_gpio3),
+	CLK_GATE_NODEV(gpio0),
+	CLK_GATE_NODEV(gpio1),
+	CLK_GATE_NODEV(gpio2),
+	CLK_GATE_NODEV(gpio3),
 	CLK_GATE_NODEV(pclk_saradc),
 	CLK_GATE_NODEV(pclk_efuse),
 
@@ -2226,10 +2226,10 @@ static void __init rk30_init_enable_clocks(void)
 	clk_enable_nolock(&clk_pclk_pwm01);
 	clk_enable_nolock(&clk_hclk_otg0);
 	clk_enable_nolock(&clk_hclk_otg1);
-	clk_enable_nolock(&clk_pclk_gpio0);
-	clk_enable_nolock(&clk_pclk_gpio1);
-	clk_enable_nolock(&clk_pclk_gpio2);
-	clk_enable_nolock(&clk_pclk_gpio3);
+	clk_enable_nolock(&clk_gpio0);
+	clk_enable_nolock(&clk_gpio1);
+	clk_enable_nolock(&clk_gpio2);
+	clk_enable_nolock(&clk_gpio3);
 
 #if CONFIG_RK_DEBUG_UART == 0
 	clk_enable_nolock(&clk_uart0);