From: kfx <kfx@rock-chips.com>
Date: Sat, 5 Jan 2013 02:40:58 +0000 (+0800)
Subject: iomux: update iomux name
X-Git-Tag: firefly_0821_release~8009
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=909dbed165ee73527eab589a64144d9b89ca014f;p=firefly-linux-kernel-4.4.55.git

iomux: update iomux name
---

diff --git a/arch/arm/mach-rk2928/include/mach/iomux-rk2928.h b/arch/arm/mach-rk2928/include/mach/iomux-rk2928.h
index b64b0feba2b9..8cfdf9de240c 100644
--- a/arch/arm/mach-rk2928/include/mach/iomux-rk2928.h
+++ b/arch/arm/mach-rk2928/include/mach/iomux-rk2928.h
@@ -119,7 +119,7 @@ enum{
 	/* GPIO3_A */
 	/* GPIO3_B */
 	/* GPIO3_C */
-	GPIO3_C1 = 0x3c10, OTG_DRVVBUS, 
+	GPIO3_C1 = 0x3c10, OTG_DRV_VBUS, 
 
 	/* GPIO3_D */
 	GPIO3_D7 = 0x3d70, TEST_CLK_OUT, 
diff --git a/arch/arm/mach-rk30/include/mach/iomux-rk30.h b/arch/arm/mach-rk30/include/mach/iomux-rk30.h
index 595fd50a0257..d82a3258b7c2 100644
--- a/arch/arm/mach-rk30/include/mach/iomux-rk30.h
+++ b/arch/arm/mach-rk30/include/mach/iomux-rk30.h
@@ -105,7 +105,7 @@ enum{
 	GPIO2_D4 = 0x2d40, SMC_BLSN0, 
 	GPIO2_D5 = 0x2d50, SMC_BLSN1, 
 	GPIO2_D6 = 0x2d60, SMC_CS1, 
-	GPIO2_D7 = 0x2d70, TEST_CLOCK_OUT, 
+	GPIO2_D7 = 0x2d70, TEST_CLK_OUT, 
 
 	/* GPIO3_A */
 	GPIO3_A0 = 0x3a00, MMC0_RSTNOUT, 
@@ -353,7 +353,7 @@ enum{
 
 	/* GPIO6_A */
 	/* GPIO6_B */
-	GPIO6_B7 = 0x6b70, TEST_CLOCK_OUT, 
+	GPIO6_B7 = 0x6b70, TEST_CLK_OUT, 
 
 	/* GPIO6_C */
 	/* GPIO6_D */