Commit 896637ac authored by Stephen Warren's avatar Stephen Warren Committed by Mark Brown
Browse files

ASoC: tegra: complete Tegra->Tegra20 renaming 



Rename Tegra20-specific Kconfig variables, module filenames, all internal
symbol names, clocks, and platform devices, to reflect the fact the DAS
and I2S drivers are for a specific HW version.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent ef280d39

arch/arm/mach-tegra/board-dt-tegra20.c

+3 −3
Original line number Diff line number Diff line
@@ -64,9 +64,9 @@ struct of_dev_auxdata tegra20_auxdata_lookup[] __initdata = { 
	OF_DEV_AUXDATA("nvidia,tegra20-i2c", TEGRA_I2C2_BASE, "tegra-i2c.1", NULL),

	OF_DEV_AUXDATA("nvidia,tegra20-i2c", TEGRA_I2C3_BASE, "tegra-i2c.2", NULL),

	OF_DEV_AUXDATA("nvidia,tegra20-i2c-dvc", TEGRA_DVC_BASE, "tegra-i2c.3", NULL),

	OF_DEV_AUXDATA("nvidia,tegra20-i2s", TEGRA_I2S1_BASE, "tegra-i2s.0", NULL),

	OF_DEV_AUXDATA("nvidia,tegra20-i2s", TEGRA_I2S2_BASE, "tegra-i2s.1", NULL),

	OF_DEV_AUXDATA("nvidia,tegra20-das", TEGRA_APB_MISC_DAS_BASE, "tegra-das", NULL),

	OF_DEV_AUXDATA("nvidia,tegra20-i2s", TEGRA_I2S1_BASE, "tegra20-i2s.0", NULL),

	OF_DEV_AUXDATA("nvidia,tegra20-i2s", TEGRA_I2S2_BASE, "tegra20-i2s.1", NULL),

	OF_DEV_AUXDATA("nvidia,tegra20-das", TEGRA_APB_MISC_DAS_BASE, "tegra20-das", NULL),

	OF_DEV_AUXDATA("nvidia,tegra20-ehci", TEGRA_USB_BASE, "tegra-ehci.0",

		       &tegra_ehci1_pdata),

	OF_DEV_AUXDATA("nvidia,tegra20-ehci", TEGRA_USB2_BASE, "tegra-ehci.1",

arch/arm/mach-tegra/devices.c

+3 −3
Original line number Diff line number Diff line
@@ -671,14 +671,14 @@ static struct resource i2s_resource2[] = { 
};



struct platform_device tegra_i2s_device1 = {

	.name		= "tegra-i2s",

	.name		= "tegra20-i2s",

	.id		= 0,

	.resource	= i2s_resource1,

	.num_resources	= ARRAY_SIZE(i2s_resource1),

};



struct platform_device tegra_i2s_device2 = {

	.name		= "tegra-i2s",

	.name		= "tegra20-i2s",

	.id		= 1,

	.resource	= i2s_resource2,

	.num_resources	= ARRAY_SIZE(i2s_resource2),
@@ -693,7 +693,7 @@ static struct resource tegra_das_resources[] = { 
};



struct platform_device tegra_das_device = {

	.name		= "tegra-das",

	.name		= "tegra20-das",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(tegra_das_resources),

	.resource	= tegra_das_resources,

arch/arm/mach-tegra/tegra2_clocks.c

+2 −2
Original line number Diff line number Diff line
@@ -2142,8 +2142,8 @@ static 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",	"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("i2s1",	"tegra20-i2s.0",	NULL,	11,	0x100,	26000000,  mux_pllaout0_audio2x_pllp_clkm,	MUX | DIV_U71),

	PERIPH_CLK("i2s2",	"tegra20-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),

sound/soc/tegra/Kconfig

+10 −10
Original line number Diff line number Diff line
@@ -4,29 +4,29 @@ config SND_SOC_TEGRA 
	help

	  Say Y or M here if you want support for SoC audio on Tegra.



config SND_SOC_TEGRA_DAS

config SND_SOC_TEGRA20_DAS

	tristate

	depends on SND_SOC_TEGRA && ARCH_TEGRA_2x_SOC

	help

	  Say Y or M if you want to add support for the Tegra DAS module.

	  Say Y or M if you want to add support for the Tegra20 DAS module.

	  You will also need to select the individual machine drivers to

	  support below.



config SND_SOC_TEGRA_I2S

config SND_SOC_TEGRA20_I2S

	tristate

	depends on SND_SOC_TEGRA && ARCH_TEGRA_2x_SOC

	select SND_SOC_TEGRA_DAS

	select SND_SOC_TEGRA20_DAS

	help

	  Say Y or M if you want to add support for codecs attached to the

	  Tegra I2S interface. You will also need to select the individual

	  Tegra20 I2S interface. You will also need to select the individual

	  machine drivers to support below.



config SND_SOC_TEGRA_SPDIF

config SND_SOC_TEGRA20_SPDIF

	tristate

	depends on SND_SOC_TEGRA && ARCH_TEGRA_2x_SOC

	default m

	help

	  Say Y or M if you want to add support for the SPDIF interface.

	  Say Y or M if you want to add support for the Tegra20 SPDIF interface.

	  You will also need to select the individual machine drivers to support

	  below.
@@ -41,7 +41,7 @@ config SND_SOC_TEGRA_WM8903 
	tristate "SoC Audio support for Tegra boards using a WM8903 codec"

	depends on SND_SOC_TEGRA && I2C

	depends on MACH_HAS_SND_SOC_TEGRA_WM8903

	select SND_SOC_TEGRA_I2S if ARCH_TEGRA_2x_SOC

	select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC

	select SND_SOC_WM8903

	help

	  Say Y or M here if you want to add support for SoC audio on Tegra
@@ -51,7 +51,7 @@ config SND_SOC_TEGRA_WM8903 
config SND_SOC_TEGRA_TRIMSLICE

	tristate "SoC Audio support for TrimSlice board"

	depends on SND_SOC_TEGRA && MACH_TRIMSLICE && I2C

	select SND_SOC_TEGRA_I2S if ARCH_TEGRA_2x_SOC

	select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC

	select SND_SOC_TLV320AIC23

	help

	  Say Y or M here if you want to add support for SoC audio on the
@@ -60,7 +60,7 @@ config SND_SOC_TEGRA_TRIMSLICE 
config SND_SOC_TEGRA_ALC5632

	tristate "SoC Audio support for Tegra boards using an ALC5632 codec"

	depends on SND_SOC_TEGRA && I2C

	select SND_SOC_TEGRA_I2S if ARCH_TEGRA_2x_SOC

	select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC

	select SND_SOC_ALC5632

	help

	  Say Y or M here if you want to add support for SoC audio on the

sound/soc/tegra/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ snd-soc-tegra20-spdif-objs := tegra20_spdif.o 


obj-$(CONFIG_SND_SOC_TEGRA) += snd-soc-tegra-pcm.o

obj-$(CONFIG_SND_SOC_TEGRA) += snd-soc-tegra-utils.o

obj-$(CONFIG_SND_SOC_TEGRA_DAS) += snd-soc-tegra20-das.o

obj-$(CONFIG_SND_SOC_TEGRA_I2S) += snd-soc-tegra20-i2s.o

obj-$(CONFIG_SND_SOC_TEGRA_SPDIF) += snd-soc-tegra20-spdif.o

obj-$(CONFIG_SND_SOC_TEGRA20_DAS) += snd-soc-tegra20-das.o

obj-$(CONFIG_SND_SOC_TEGRA20_I2S) += snd-soc-tegra20-i2s.o

obj-$(CONFIG_SND_SOC_TEGRA20_SPDIF) += snd-soc-tegra20-spdif.o



# Tegra machine Support

snd-soc-tegra-wm8903-objs := tegra_wm8903.o