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

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

Merge remote-tracking branches 'asoc/topic/rt5514', 'asoc/topic/rt5616',... 

Merge remote-tracking branches 'asoc/topic/rt5514', 'asoc/topic/rt5616', 'asoc/topic/rt5640', 'asoc/topic/rt5660' and 'asoc/topic/rt5663' into asoc-next
parents 2f69b4b2 6342ad66 33ada14a ca5f17c5 d01580c3 73444723

Documentation/devicetree/bindings/sound/rt5514.txt

+3 −0
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ Optional properties: 
- clocks: The phandle of the master clock to the CODEC

- clock-names: Should be "mclk"



- realtek,dmic-init-delay-ms

  Set the DMIC initial delay (ms) to wait it ready.



Pins on the device (for linking into audio routes) for RT5514:



  * DMIC1L

Documentation/devicetree/bindings/sound/rt5663.txt

+3 −3
Original line number Diff line number Diff line 
RT5663/RT5668 audio CODEC

RT5663 audio CODEC



This device supports I2C only.



Required properties:



- compatible : One of "realtek,rt5663" or "realtek,rt5668".

- compatible : "realtek,rt5663".



- reg : The I2C address of the device.
@@ -12,7 +12,7 @@ Required properties: 


Optional properties:



Pins on the device (for linking into audio routes) for RT5663/RT5668:

Pins on the device (for linking into audio routes) for RT5663:



  * IN1P

  * IN1N

Documentation/devicetree/bindings/sound/rt5665.txt

0 → 100755
+68 −0
Original line number Diff line number Diff line 
RT5665/RT5666/RT5668 audio CODEC



This device supports I2C only.



Required properties:



- compatible : One of "realtek,rt5665", "realtek,rt5666" or "realtek,rt5668".



- reg : The I2C address of the device.



- interrupts : The CODEC's interrupt output.



Optional properties:



- realtek,in1-differential

- realtek,in2-differential

- realtek,in3-differential

- realtek,in4-differential

  Boolean. Indicate MIC1/2/3/4 input are differential, rather than single-ended.



- realtek,dmic1-data-pin

  0: dmic1 is not used

  1: using GPIO4 pin as dmic1 data pin

  2: using IN2N pin as dmic2 data pin



- realtek,dmic2-data-pin

  0: dmic2 is not used

  1: using GPIO5 pin as dmic2 data pin

  2: using IN2P pin as dmic2 data pin



- realtek,jd-src

  0: No JD is used

  1: using JD1 as JD source



- realtek,ldo1-en-gpios : The GPIO that controls the CODEC's LDO1_EN pin.



Pins on the device (for linking into audio routes) for RT5659/RT5658:



  * DMIC L1

  * DMIC R1

  * DMIC L2

  * DMIC R2

  * IN1P

  * IN1N

  * IN2P

  * IN2N

  * IN3P

  * IN3N

  * IN4P

  * IN4N

  * HPOL

  * HPOR

  * LOUTL

  * LOUTR

  * MONOOUT

  * PDML

  * PDMR



Example:



rt5659 {

	compatible = "realtek,rt5665";

	reg = <0x1b>;

	interrupt-parent = <&gpio>;

	interrupts = <TEGRA_GPIO(W, 3) GPIO_ACTIVE_HIGH>;

	realtek,ldo1-en-gpios =

		<&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_HIGH>;

};

include/sound/rt5514.h

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

 * linux/sound/rt5514.h -- Platform data for RT5514

 *

 * Copyright 2016 Realtek Semiconductor Corp.

 * Author: Oder Chiou <oder_chiou@realtek.com>

 *

 * 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_RT5514_H

#define __LINUX_SND_RT5514_H



struct rt5514_platform_data {

	unsigned int dmic_init_delay;

};



#endif

include/sound/rt5665.h

0 → 100755
+47 −0
Original line number Diff line number Diff line 
/*

 * linux/sound/rt5665.h -- Platform data for RT5665

 *

 * Copyright 2016 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_RT5665_H

#define __LINUX_SND_RT5665_H



enum rt5665_dmic1_data_pin {

	RT5665_DMIC1_NULL,

	RT5665_DMIC1_DATA_GPIO4,

	RT5665_DMIC1_DATA_IN2N,

};



enum rt5665_dmic2_data_pin {

	RT5665_DMIC2_NULL,

	RT5665_DMIC2_DATA_GPIO5,

	RT5665_DMIC2_DATA_IN2P,

};



enum rt5665_jd_src {

	RT5665_JD_NULL,

	RT5665_JD1,

};



struct rt5665_platform_data {

	bool in1_diff;

	bool in2_diff;

	bool in3_diff;

	bool in4_diff;



	int ldo1_en; /* GPIO for LDO1_EN */



	enum rt5665_dmic1_data_pin dmic1_data_pin;

	enum rt5665_dmic2_data_pin dmic2_data_pin;

	enum rt5665_jd_src jd_src;



	unsigned int sar_hs_type;

};



#endif