Commit c1bd940a authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/rt5670', 'asoc/topic/rt5677',... 

Merge remote-tracking branches 'asoc/topic/rt5670', 'asoc/topic/rt5677', 'asoc/topic/s6000', 'asoc/topic/samsung' and 'asoc/topic/sh-fsi' into asoc-next
parents b0ae27c4 01957572 f18803a3 1bb60b3a 71864b22 9f98cd69

Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt

0 → 100644
+35 −0
Original line number Diff line number Diff line 
Samsung Exynos Odroid X2/U3 audio complex with MAX98090 codec



Required properties:

 - compatible : "samsung,odroidx2-audio" - for Odroid X2 board,

		"samsung,odroidu3-audio" - for Odroid U3 board

 - samsung,model : the user-visible name of this sound complex

 - samsung,i2s-controller : the phandle of the I2S controller

 - samsung,audio-codec : the phandle of the MAX98090 audio codec

 - samsung,audio-routing : a list of the connections between audio

   components;  each entry is a pair of strings, the first being the

   connection's sink, the second being the connection's source;

   valid names for sources and sinks are the MAX98090's pins (as

   documented in its binding), and the jacks on the board

   For Odroid X2:

     * Headphone Jack

     * Mic Jack

     * DMIC



   For Odroid U3:

     * Headphone Jack

     * Speakers



Example:



sound {

	compatible = "samsung,odroidu3-audio";

	samsung,i2s-controller = <&i2s0>;

	samsung,audio-codec = <&max98090>;

	samsung,model = "Odroid-X2";

	samsung,audio-routing =

		"Headphone Jack", "HPL",

		"Headphone Jack", "HPR",

		"IN1", "Mic Jack",

		"Mic Jack", "MICBIAS";

};

Documentation/devicetree/bindings/sound/snow.txt

+5 −0
Original line number Diff line number Diff line
@@ -3,15 +3,20 @@ Audio Binding for Snow boards 
Required properties:

- compatible : Can be one of the following,

			"google,snow-audio-max98090" or

			"google,snow-audio-max98091" or

			"google,snow-audio-max98095"

- samsung,i2s-controller: The phandle of the Samsung I2S controller

- samsung,audio-codec: The phandle of the audio codec



Optional:

- samsung,model: The name of the sound-card



Example:



sound {

		compatible = "google,snow-audio-max98095";



		samsung,model = "Snow-I2S-MAX98095";

		samsung,i2s-controller = <&i2s0>;

		samsung,audio-codec = <&max98095>;

};

include/linux/platform_data/asoc-s3c.h

+0 −9
Original line number Diff line number Diff line
@@ -15,15 +15,6 @@ 
#define S3C64XX_AC97_GPE  1

extern void s3c64xx_ac97_setup_gpio(int);



/*

 * The machine init code calls s5p*_spdif_setup_gpio with

 * one of these defines in order to select appropriate bank

 * of GPIO for S/PDIF pins

 */

#define S5PC100_SPDIF_GPD  0

#define S5PC100_SPDIF_GPG3 1

extern void s5pc100_spdif_setup_gpio(int);



struct samsung_i2s {

/* If the Primary DAI has 5.1 Channels */

#define QUIRK_PRI_6CHAN		(1 << 0)

include/sound/rt5670.h

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

 * linux/sound/rt5670.h -- Platform data for RT5670

 *

 * Copyright 2014 Realtek Microelectronics

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef __LINUX_SND_RT5670_H

#define __LINUX_SND_RT5670_H



struct rt5670_platform_data {

	int jd_mode;

	bool in2_diff;



	bool dmic_en;

	unsigned int dmic1_data_pin;

	/* 0 = GPIO6; 1 = IN2P; 3 = GPIO7*/

	unsigned int dmic2_data_pin;

	/* 0 = GPIO8; 1 = IN3N; */

	unsigned int dmic3_data_pin;

	/* 0 = GPIO9; 1 = GPIO10; 2 = GPIO5*/

};



#endif

sound/soc/codecs/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_RT5640 if I2C

	select SND_SOC_RT5645 if I2C

	select SND_SOC_RT5651 if I2C

	select SND_SOC_RT5670 if I2C

	select SND_SOC_RT5677 if I2C

	select SND_SOC_SGTL5000 if I2C

	select SND_SOC_SI476X if MFD_SI476X_CORE
@@ -452,9 +453,13 @@ config SND_SOC_RL6231 
	default y if SND_SOC_RT5640=y

	default y if SND_SOC_RT5645=y

	default y if SND_SOC_RT5651=y

	default y if SND_SOC_RT5670=y

	default y if SND_SOC_RT5677=y

	default m if SND_SOC_RT5640=m

	default m if SND_SOC_RT5645=m

	default m if SND_SOC_RT5651=m

	default m if SND_SOC_RT5670=m

	default m if SND_SOC_RT5677=m



config SND_SOC_RT286

	tristate
@@ -471,6 +476,9 @@ config SND_SOC_RT5645 
config SND_SOC_RT5651

	tristate



config SND_SOC_RT5670

	tristate



config SND_SOC_RT5677

	tristate