iomux: Uniform Naming: I2S0_MCLK && I2S0_LRCKRX

diff --git a/arch/arm/mach-rk30/include/mach/iomux-rk30.h b/arch/arm/mach-rk30/include/mach/iomux-rk30.h
index 5d070db557a0490f7aa1e552791c0abedd137fe7..bdaffea9933db394dd58af68e119e5fbe4a5a42d 100644 (file)
--- a/arch/arm/mach-rk30/include/mach/iomux-rk30.h
+++ b/arch/arm/mach-rk30/include/mach/iomux-rk30.h
@@ -50,9 +50,9 @@ enum{
        GPIO1_B7 = 0x1b70, SPI0_CS1, 
 
        /* GPIO1_C */
-       GPIO1_C0 = 0x1c00, I2S0_CLK, 
+       GPIO1_C0 = 0x1c00, I2S0_MCLK, 
        GPIO1_C1 = 0x1c10, I2S0_SCLK, 
-       GPIO1_C2 = 0x1c20, I2S0_LRCLKRX, 
+       GPIO1_C2 = 0x1c20, I2S0_LRCKRX, 
        GPIO1_C3 = 0x1c30, I2S0_LRCKTX, 
        GPIO1_C4 = 0x1c40, I2S0_SDI, 
        GPIO1_C5 = 0x1c50, I2S0_SDO, 
@@ -162,7 +162,7 @@ enum{
        GPIO0_A7 = 0x0a70, I2S0_SDI, 
 
        /* GPIO0_B */
-       GPIO0_B0 = 0x0b00, I2S0_CLK, 
+       GPIO0_B0 = 0x0b00, I2S0_MCLK, 
        GPIO0_B1 = 0x0b10, I2S0_SCLK, 
        GPIO0_B2 = 0x0b20, I2S0_LRCKRX, 
        GPIO0_B3 = 0x0b30, I2S0_LRCKTX, 
@@ -172,7 +172,7 @@ enum{
        GPIO0_B7 = 0x0b70, I2S0_SDO3, 
 
        /* GPIO0_C */
-       GPIO0_C0 = 0x0c00, I2S1_CLK, 
+       GPIO0_C0 = 0x0c00, I2S1_MCLK, 
        GPIO0_C1 = 0x0c10, I2S1_SCLK, 
        GPIO0_C2 = 0x0c20, I2S1_LRCKRX, 
        GPIO0_C3 = 0x0c30, I2S1_LRCKTX, 
@@ -182,7 +182,7 @@ enum{
        GPIO0_C7 = 0x0c70, TRACE_CTL, SMC_R3, 
 
        /* GPIO0_D */
-       GPIO0_D0 = 0x0d00, I2S2_CLK, SMC_CS0, 
+       GPIO0_D0 = 0x0d00, I2S2_MCLK, SMC_CS0, 
        GPIO0_D1 = 0x0d10, I2S2_SCLK, SMC_WEN, 
        GPIO0_D2 = 0x0d20, I2S2_LRCKRX, SMC_OEN, 
        GPIO0_D3 = 0x0d30, I2S2_LRCKTX, SMC_ADVN, 

diff --git a/arch/arm/mach-rk3026/include/mach/iomux.h b/arch/arm/mach-rk3026/include/mach/iomux.h
index 584b93a08b10b2ddecb5ddc857954cf2a357c055..8756d2c9762bdf0c9adb72abd98a457e1896dbab 100644 (file)
--- a/arch/arm/mach-rk3026/include/mach/iomux.h
+++ b/arch/arm/mach-rk3026/include/mach/iomux.h
@@ -44,9 +44,9 @@ enum {
        GPIO0_D7 = 0x0d70, MMC1_BKEPWR,
 
        /* GPIO1_A */
-       GPIO1_A0 = 0x1a00, I2S0_MCLK, I2S0_CLK = I2S0_MCLK,
+       GPIO1_A0 = 0x1a00, I2S0_MCLK,
        GPIO1_A1 = 0x1a10, I2S0_SCLK,
-       GPIO1_A2 = 0x1a20, I2S0_LRCKRX, GPS_CLK, I2S0_LRCLKRX = I2S0_LRCKRX,
+       GPIO1_A2 = 0x1a20, I2S0_LRCKRX, GPS_CLK,
        GPIO1_A3 = 0x1a30, I2S0_LRCKTX,
        GPIO1_A4 = 0x1a40, I2S0_SDO, GPS_MAG,
        GPIO1_A5 = 0x1a50, I2S0_SDI, GPS_SIGN, JTAG_TCK,

diff --git a/arch/arm/mach-rk3188/include/mach/iomux.h b/arch/arm/mach-rk3188/include/mach/iomux.h
index ce66df05f297e12df9c2a8a6f618b61756b76c77..b8ca6ac757d04d9cb0cbf6a509e8020e461fcc1d 100644 (file)
--- a/arch/arm/mach-rk3188/include/mach/iomux.h
+++ b/arch/arm/mach-rk3188/include/mach/iomux.h
@@ -52,9 +52,9 @@ enum{
        GPIO1_B7 = 0x1b70, SPI0_CS1, 
 
        /* GPIO1_C */
-       GPIO1_C0 = 0x1c00, I2S0_CLK, 
+       GPIO1_C0 = 0x1c00, I2S0_MCLK, 
        GPIO1_C1 = 0x1c10, I2S0_SCLK, 
-       GPIO1_C2 = 0x1c20, I2S0_LRCLKRX, 
+       GPIO1_C2 = 0x1c20, I2S0_LRCKRX, 
        GPIO1_C3 = 0x1c30, I2S0_LRCKTX, 
        GPIO1_C4 = 0x1c40, I2S0_SDI, 
        GPIO1_C5 = 0x1c50, I2S0_SDO, 

diff --git a/drivers/mfd/rk610-core.c b/drivers/mfd/rk610-core.c
index e511a1c29492ff4e3b26a08c85c8ccc66e29c23d..68112a0c6f9a1ede29b46a38fcdad624ed2a2de1 100755 (executable)
--- a/drivers/mfd/rk610-core.c
+++ b/drivers/mfd/rk610-core.c
@@ -262,7 +262,7 @@ static int rk610_control_probe(struct i2c_client *client,
                #if defined(CONFIG_ARCH_RK29)
                rk29_mux_api_set(GPIO2D0_I2S0CLK_MIIRXCLKIN_NAME, GPIO2H_I2S0_CLK);
                #elif defined(CONFIG_ARCH_RK3066B)||defined(CONFIG_ARCH_RK3188)
-               iomux_set(I2S0_CLK);
+               iomux_set(I2S0_MCLK);
                #elif defined(CONFIG_ARCH_RK30)
                 rk30_mux_api_set(GPIO0B0_I2S8CHCLK_NAME, GPIO0B_I2S_8CH_CLK);
                #endif

diff --git a/drivers/mfd/rk616-core.c b/drivers/mfd/rk616-core.c
index fd3dfbef1dc119d47d40c85e59f975302ef8412a..4303096f7a52b1bb897c046e73a5e80f8fc4661c 100755 (executable)
--- a/drivers/mfd/rk616-core.c
+++ b/drivers/mfd/rk616-core.c
@@ -473,7 +473,7 @@ static int rk616_i2c_probe(struct i2c_client *client,const struct i2c_device_id
                #if defined(CONFIG_ARCH_RK29)
                rk29_mux_api_set(GPIO2D0_I2S0CLK_MIIRXCLKIN_NAME, GPIO2H_I2S0_CLK);
                #else
-               iomux_set(I2S0_CLK);
+               iomux_set(I2S0_MCLK);
                #endif
                clk_enable(iis_clk);
                clk_set_rate(iis_clk, 11289600);

diff --git a/sound/soc/rk29/rk30_i2s.c b/sound/soc/rk29/rk30_i2s.c
index 7635880b9be87b7fc843c4d94a5e7ed15394654f..73338e28ea2e248da248b72a6269cb3f71bebc26 100755 (executable)
--- a/sound/soc/rk29/rk30_i2s.c
+++ b/sound/soc/rk29/rk30_i2s.c
@@ -439,9 +439,9 @@ static int rockchip_i2s_dai_probe(struct snd_soc_dai *dai)
        switch(dai->id) {
 #if defined(CONFIG_ARCH_RK3066B) || defined(CONFIG_ARCH_RK3188)
         case 1:
-                        iomux_set(I2S0_CLK);
+                        iomux_set(I2S0_MCLK);
                         iomux_set(I2S0_SCLK);
-                        iomux_set(I2S0_LRCLKRX);
+                        iomux_set(I2S0_LRCKRX);
                         iomux_set(I2S0_LRCKTX);
                         iomux_set(I2S0_SDI);
                         iomux_set(I2S0_SDO);