Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27b92d4f authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/asoc' into for-linus

parents 5de0ee57 e58a8947

arch/arm/mach-shmobile/board-ag5evm.c

+0 −10
Original line number Diff line number Diff line
@@ -119,13 +119,6 @@ static struct platform_device keysc_device = { 
};



/* FSI A */

static struct sh_fsi_platform_info fsi_info = {

	.porta_flags = SH_FSI_OUT_SLAVE_MODE	|

		       SH_FSI_IN_SLAVE_MODE	|

		       SH_FSI_OFMT(I2S)		|

		       SH_FSI_IFMT(I2S),

};



static struct resource fsi_resources[] = {

	[0] = {

		.name	= "FSI",
@@ -144,9 +137,6 @@ static struct platform_device fsi_device = { 
	.id		= -1,

	.num_resources	= ARRAY_SIZE(fsi_resources),

	.resource	= fsi_resources,

	.dev	= {

		.platform_data	= &fsi_info,

	},

};



static struct resource sh_mmcif_resources[] = {

arch/arm/mach-shmobile/board-ap4evb.c

+7 −6
Original line number Diff line number Diff line
@@ -673,16 +673,12 @@ static int fsi_set_rate(struct device *dev, int is_porta, int rate, int enable) 
}



static struct sh_fsi_platform_info fsi_info = {

	.porta_flags = SH_FSI_BRS_INV |

		       SH_FSI_OUT_SLAVE_MODE |

		       SH_FSI_IN_SLAVE_MODE |

		       SH_FSI_OFMT(PCM) |

		       SH_FSI_IFMT(PCM),

	.porta_flags = SH_FSI_BRS_INV,



	.portb_flags = SH_FSI_BRS_INV |

		       SH_FSI_BRM_INV |

		       SH_FSI_LRS_INV |

		       SH_FSI_OFMT(SPDIF),

		       SH_FSI_FMT_SPDIF,

	.set_rate = fsi_set_rate,

};
@@ -783,6 +779,10 @@ static struct platform_device hdmi_device = { 
	},

};



static struct platform_device fsi_hdmi_device = {

	.name		= "sh_fsi2_b_hdmi",

};



static long ap4evb_clk_optimize(unsigned long target, unsigned long *best_freq,

				unsigned long *parent_freq)

{
@@ -936,6 +936,7 @@ static struct platform_device *ap4evb_devices[] __initdata = { 
	&usb1_host_device,

	&fsi_device,

	&fsi_ak4643_device,

	&fsi_hdmi_device,

	&sh_mmcif_device,

	&lcdc1_device,

	&lcdc_device,

arch/arm/mach-shmobile/board-mackerel.c

+7 −6
Original line number Diff line number Diff line
@@ -399,6 +399,10 @@ static struct platform_device hdmi_device = { 
	},

};



static struct platform_device fsi_hdmi_device = {

	.name		= "sh_fsi2_b_hdmi",

};



static int __init hdmi_init_pm_clock(void)

{

	struct clk *hdmi_ick = clk_get(&hdmi_device.dev, "ick");
@@ -609,16 +613,12 @@ static int fsi_set_rate(struct device *dev, int is_porta, int rate, int enable) 
}



static struct sh_fsi_platform_info fsi_info = {

	.porta_flags =	SH_FSI_BRS_INV		|

			SH_FSI_OUT_SLAVE_MODE	|

			SH_FSI_IN_SLAVE_MODE	|

			SH_FSI_OFMT(PCM)	|

			SH_FSI_IFMT(PCM),

	.porta_flags =	SH_FSI_BRS_INV,



	.portb_flags =	SH_FSI_BRS_INV	|

			SH_FSI_BRM_INV	|

			SH_FSI_LRS_INV	|

			SH_FSI_OFMT(SPDIF),

			SH_FSI_FMT_SPDIF,



	.set_rate = fsi_set_rate,

};
@@ -921,6 +921,7 @@ static struct platform_device *mackerel_devices[] __initdata = { 
	&leds_device,

	&fsi_device,

	&fsi_ak4643_device,

	&fsi_hdmi_device,

	&sdhi0_device,

#if !defined(CONFIG_MMC_SH_MMCIF)

	&sdhi1_device,

arch/arm/mach-tegra/include/mach/harmony_audio.h

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-tegra/include/mach/harmony_audio.h

 *

 * Copyright 2011 NVIDIA, Inc.

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and

 * may be copied, distributed, and modified under those terms.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 */



struct harmony_audio_platform_data {

	int gpio_spkr_en;

	int gpio_hp_det;

	int gpio_int_mic_en;

	int gpio_ext_mic_en;

};

arch/sh/boards/mach-ecovec24/setup.c

+1 −5
Original line number Diff line number Diff line
@@ -723,11 +723,7 @@ static struct platform_device camera_devices[] = { 


/* FSI */

static struct sh_fsi_platform_info fsi_info = {

	.portb_flags = SH_FSI_BRS_INV |

		       SH_FSI_OUT_SLAVE_MODE |

		       SH_FSI_IN_SLAVE_MODE |

		       SH_FSI_OFMT(I2S) |

		       SH_FSI_IFMT(I2S),

	.portb_flags = SH_FSI_BRS_INV,

};



static struct resource fsi_resources[] = {