Commit 9504940a authored by Mike Rapoport's avatar Mike Rapoport Committed by Colin Cross
Browse files

ARM: tegra: trimslice: add audio devices and clocks 



Signed-off-by: default avatarMike Rapoport <mike@compulab.co.il>
Signed-off-by: default avatarColin Cross <ccross@android.com>
parent bea2d6b8

arch/arm/mach-tegra/board-trimslice-pinmux.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static __initdata struct tegra_pingroup_config trimslice_pinmux[] = { 
	{TEGRA_PINGROUP_ATC,   TEGRA_MUX_NAND,          TEGRA_PUPD_NORMAL,	TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_ATD,   TEGRA_MUX_GMI,           TEGRA_PUPD_NORMAL,	TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_ATE,   TEGRA_MUX_GMI,           TEGRA_PUPD_NORMAL,	TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_CDEV1, TEGRA_MUX_OSC,           TEGRA_PUPD_NORMAL,      TEGRA_TRI_NORMAL},

	{TEGRA_PINGROUP_CDEV1, TEGRA_MUX_PLLA_OUT,      TEGRA_PUPD_NORMAL,      TEGRA_TRI_NORMAL},

	{TEGRA_PINGROUP_CDEV2, TEGRA_MUX_PLLP_OUT4,     TEGRA_PUPD_PULL_DOWN,   TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_CRTP,  TEGRA_MUX_CRT,           TEGRA_PUPD_NORMAL,      TEGRA_TRI_TRISTATE},

	{TEGRA_PINGROUP_CSUS,  TEGRA_MUX_VI_SENSOR_CLK, TEGRA_PUPD_PULL_DOWN,   TEGRA_TRI_TRISTATE},

arch/arm/mach-tegra/board-trimslice.c

+13 −0
Original line number Diff line number Diff line
@@ -73,10 +73,19 @@ static struct tegra_sdhci_platform_data sdhci_pdata4 = { 
	.power_gpio	= -1,

};



static struct platform_device trimslice_audio_device = {

	.name	= "tegra-snd-trimslice",

	.id	= 0,

};



static struct platform_device *trimslice_devices[] __initdata = {

	&debug_uart,

	&tegra_sdhci_device1,

	&tegra_sdhci_device4,

	&tegra_i2s_device1,

	&tegra_das_device,

	&tegra_pcm_device,

	&trimslice_audio_device,

};



static struct tegra_i2c_platform_data trimslice_i2c1_platform_data = {
@@ -127,6 +136,10 @@ static void __init tegra_trimslice_fixup(struct machine_desc *desc, 
static __initdata struct tegra_clk_init_table trimslice_clk_init_table[] = {

	/* name		parent		rate		enabled */

	{ "uarta",	"pll_p",	216000000,	true },

	{ "pll_a",	"pll_p_out1",	56448000,	true },

	{ "pll_a_out0",	"pll_a",	11289600,	true },

	{ "cdev1",	NULL,		0,		true },

	{ "i2s1",	"pll_a_out0",	11289600,	false},

	{ NULL,		NULL,		0,		0},

};