From 06ae80f613a2ae48ca5f141919c6dbac4ffc2e70 Mon Sep 17 00:00:00 2001 From: kfx Date: Tue, 16 Jul 2013 10:29:49 +0800 Subject: [PATCH] iomux: Uniform Naming: I2S0_MCLK && I2S0_LRCKRX --- arch/arm/mach-rk30/include/mach/iomux-rk30.h | 10 +++++----- arch/arm/mach-rk3026/include/mach/iomux.h | 4 ++-- arch/arm/mach-rk3188/include/mach/iomux.h | 4 ++-- drivers/mfd/rk610-core.c | 2 +- drivers/mfd/rk616-core.c | 2 +- sound/soc/rk29/rk30_i2s.c | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-rk30/include/mach/iomux-rk30.h b/arch/arm/mach-rk30/include/mach/iomux-rk30.h index 5d070db557a0..bdaffea9933d 100644 --- 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 584b93a08b10..8756d2c9762b 100644 --- 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 ce66df05f297..b8ca6ac757d0 100644 --- 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 e511a1c29492..68112a0c6f9a 100755 --- 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 fd3dfbef1dc1..4303096f7a52 100755 --- 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 7635880b9be8..73338e28ea2e 100755 --- 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); -- 2.34.1