[PATCH 2/5] ARM: Tegra: Rename I2S clocks to match driver name
Colin Cross
ccross at android.com
Wed Feb 23 16:06:27 EST 2011
On Wed, Feb 23, 2011 at 10:58 AM, Stephen Warren <swarren at nvidia.com> wrote:
> The driver is tegra-i2s not just i2s. Rename the clocks to match, so that
> clk_get_sys can look up by driver name.
>
> Signed-off-by: Stephen Warren <swarren at nvidia.com>
> ---
> NOTE: This patch should apply right now.
>
> arch/arm/mach-tegra/tegra2_clocks.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-tegra/tegra2_clocks.c b/arch/arm/mach-tegra/tegra2_clocks.c
> index 3015a2c..ee3f9d7 100644
> --- a/arch/arm/mach-tegra/tegra2_clocks.c
> +++ b/arch/arm/mach-tegra/tegra2_clocks.c
> @@ -2128,8 +2128,8 @@ struct clk tegra_list_clks[] = {
> PERIPH_CLK("apbdma", "tegra-dma", NULL, 34, 0, 108000000, mux_pclk, 0),
> PERIPH_CLK("rtc", "rtc-tegra", NULL, 4, 0, 32768, mux_clk_32k, PERIPH_NO_RESET),
> PERIPH_CLK("timer", "timer", NULL, 5, 0, 26000000, mux_clk_m, 0),
> - PERIPH_CLK("i2s1", "i2s.0", NULL, 11, 0x100, 26000000, mux_pllaout0_audio2x_pllp_clkm, MUX | DIV_U71),
> - PERIPH_CLK("i2s2", "i2s.1", NULL, 18, 0x104, 26000000, mux_pllaout0_audio2x_pllp_clkm, MUX | DIV_U71),
> + PERIPH_CLK("i2s1", "tegra-i2s.0", NULL, 11, 0x100, 26000000, mux_pllaout0_audio2x_pllp_clkm, MUX | DIV_U71),
> + PERIPH_CLK("i2s2", "tegra-i2s.1", NULL, 18, 0x104, 26000000, mux_pllaout0_audio2x_pllp_clkm, MUX | DIV_U71),
> PERIPH_CLK("spdif_out", "spdif_out", NULL, 10, 0x108, 100000000, mux_pllaout0_audio2x_pllp_clkm, MUX | DIV_U71),
> PERIPH_CLK("spdif_in", "spdif_in", NULL, 10, 0x10c, 100000000, mux_pllp_pllc_pllm, MUX | DIV_U71),
> PERIPH_CLK("pwm", "pwm", NULL, 17, 0x110, 432000000, mux_pllp_pllc_audio_clkm_clk32, MUX | DIV_U71),
> --
> 1.7.1
>
>
Ack, I'll put it in for-next
More information about the linux-arm-kernel
mailing list