Commit d6e29da9 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'davinci-for-v4.8' of... 

Merge tag 'davinci-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc

Clean-up unused pdata for DaVinci McBSP
audio driver and add McBSP clocks for
DaVinci DA850 SoC.

* tag 'davinci-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci

:
  ARM: davinci: remove unused davinci-i2s pdata
  ARM: davinci: da850: add clocks for mcbsp0 and 1

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 217c55db 6bce5efd

arch/arm/mach-davinci/board-dm355-evm.c

+1 −3
Original line number Diff line number Diff line
@@ -115,8 +115,6 @@ static struct davinci_i2c_platform_data i2c_pdata = { 
	.scl_pin        = 14,

};



static struct snd_platform_data dm355_evm_snd_data;



static int dm355evm_mmc_gpios = -EINVAL;



static void dm355evm_mmcsd_gpios(unsigned gpio)
@@ -411,7 +409,7 @@ static __init void dm355_evm_init(void) 
			ARRAY_SIZE(dm355_evm_spi_info));



	/* DM335 EVM uses ASP1; line-out is a stereo mini-jack */

	dm355_init_asp1(ASP1_TX_EVT_EN | ASP1_RX_EVT_EN, &dm355_evm_snd_data);

	dm355_init_asp1(ASP1_TX_EVT_EN | ASP1_RX_EVT_EN);

}



MACHINE_START(DAVINCI_DM355_EVM, "DaVinci DM355 EVM")

arch/arm/mach-davinci/board-dm365-evm.c

+1 −5
Original line number Diff line number Diff line
@@ -176,10 +176,6 @@ static struct at24_platform_data eeprom_info = { 
	.context	= (void *)0x7f00,

};



static struct snd_platform_data dm365_evm_snd_data __maybe_unused = {

	.asp_chan_q = EVENTQ_3,

};



static struct i2c_board_info i2c_info[] = {

	{

		I2C_BOARD_INFO("24c256", 0x50),
@@ -763,7 +759,7 @@ static __init void dm365_evm_init(void) 
	evm_init_cpld();



#ifdef CONFIG_SND_DM365_AIC3X_CODEC

	dm365_init_asp(&dm365_evm_snd_data);

	dm365_init_asp();

#elif defined(CONFIG_SND_DM365_VOICE_CODEC)

	dm365_init_vc(&dm365_evm_snd_data);

#endif

arch/arm/mach-davinci/board-dm644x-evm.c

+1 −3
Original line number Diff line number Diff line
@@ -264,8 +264,6 @@ static struct platform_device rtc_dev = { 
	.id             = -1,

};



static struct snd_platform_data dm644x_evm_snd_data;



/*----------------------------------------------------------------------*/

#ifdef CONFIG_I2C

/*
@@ -799,7 +797,7 @@ static __init void davinci_evm_init(void) 
	dm644x_init_video(&dm644xevm_capture_cfg, &dm644xevm_display_cfg);



	davinci_serial_init(dm644x_serial_device);

	dm644x_init_asp(&dm644x_evm_snd_data);

	dm644x_init_asp();



	/* irlml6401 switches over 1A, in under 8 msec */

	davinci_setup_usb(1000, 8);

arch/arm/mach-davinci/board-neuros-osd2.c

+1 −3
Original line number Diff line number Diff line
@@ -127,8 +127,6 @@ static struct platform_device davinci_fb_device = { 
	.num_resources = 0,

};



static struct snd_platform_data dm644x_ntosd2_snd_data;



static struct gpio_led ntosd2_leds[] = {

	{ .name = "led1_green", .gpio = GPIO(10), },

	{ .name = "led1_red",   .gpio = GPIO(11), },
@@ -200,7 +198,7 @@ static __init void davinci_ntosd2_init(void) 
				ARRAY_SIZE(davinci_ntosd2_devices));



	davinci_serial_init(dm644x_serial_device);

	dm644x_init_asp(&dm644x_ntosd2_snd_data);

	dm644x_init_asp();



	soc_info->emac_pdata->phy_id = NEUROS_OSD2_PHY_ID;

arch/arm/mach-davinci/da850.c

+16 −0
Original line number Diff line number Diff line
@@ -326,6 +326,20 @@ static struct clk mcasp_clk = { 
	.gpsc		= 1,

};



static struct clk mcbsp0_clk = {

	.name		= "mcbsp0",

	.parent		= &async3_clk,

	.lpsc		= DA850_LPSC1_McBSP0,

	.gpsc		= 1,

};



static struct clk mcbsp1_clk = {

	.name		= "mcbsp1",

	.parent		= &async3_clk,

	.lpsc		= DA850_LPSC1_McBSP1,

	.gpsc		= 1,

};



static struct clk lcdc_clk = {

	.name		= "lcdc",

	.parent		= &pll0_sysclk2,
@@ -482,6 +496,8 @@ static struct clk_lookup da850_clks[] = { 
	CLK("davinci_emac.1",	NULL,		&emac_clk),

	CLK("davinci_mdio.0",	"fck",		&emac_clk),

	CLK("davinci-mcasp.0",	NULL,		&mcasp_clk),

	CLK("davinci-mcbsp.0",	NULL,		&mcbsp0_clk),

	CLK("davinci-mcbsp.1",	NULL,		&mcbsp1_clk),

	CLK("da8xx_lcdc.0",	"fck",		&lcdc_clk),

	CLK("da830-mmc.0",	NULL,		&mmcsd0_clk),

	CLK("da830-mmc.1",	NULL,		&mmcsd1_clk),