ASoC: rt5645: make RT5650_TDM_CTRL_4 readable
Subsystems (4)
PATCH v3 1/3 ASoC: rt5645: make RT5650_TDM_CTRL_4 readable
Register RT5650_TDM_CTRL_4(0x7A) is readable and used for mixer setting. It should be added in rt5645_readable_register function.
--- sound/soc/codecs/rt5645.c | 1 + 1 file changed, 1 insertion(+)
sound/soc/codecs/rt5645.c +1 -0
@@ -349,6 +349,7 @@ static bool rt5645_readable_register(struct device *dev, unsigned int reg)case RT5645_TDM_CTRL_1 :case RT5645_TDM_CTRL_2 :case RT5645_TDM_CTRL_3 : +case RT5650_TDM_CTRL_4 :case RT5645_GLB_CLK :case RT5645_PLL_CTRL1 :case RT5645_PLL_CTRL2 :
Signature · 1 line
1.8.1.1.439.g50a6b54
PATCH v3 2/3 ASoC: rt5645: change gpio to gpiod APIs
Move gpio to gpio_desc and use gpiod APIs in codec driver.
---
* Change gpio name from rt5645 to hp-detect
* Use devm_gpiod_get API to get gpiod
--- include/sound/rt5645.h | 3 --- sound/soc/codecs/rt5645.c | 47 ++++++++++++----------------------------------- sound/soc/codecs/rt5645.h | 1 + 3 files changed, 13 insertions(+), 38 deletions(-)
include/sound/rt5645.h +0 -3
@@ -20,9 +20,6 @@ struct rt5645_platform_data {unsigned int dmic2_data_pin;/* 0 = IN2P; 1 = GPIO6; 2 = GPIO10; 3 = GPIO12 */ -unsigned int hp_det_gpio; -bool gpio_hp_det_active_high; -unsigned int jd_mode; };
sound/soc/codecs/rt5645.c +12 -35
80 lines not on this page · raw message
sound/soc/codecs/rt5645.h +1 -0
@@ -2182,6 +2182,7 @@ struct rt5645_priv {struct rt5645_platform_data pdata;struct regmap *regmap;struct i2c_client *i2c; +struct gpio_desc *gpiod_hp_det;struct snd_soc_jack *hp_jack;struct snd_soc_jack *mic_jack;struct snd_soc_jack *btn_jack;
Signature · 1 line
1.8.1.1.439.g50a6b54
PATCH v3 3/3 ASoC: rt5645: add device tree support
In reply to Bard LiaoModify the RT5645 driver to parse platform data from device tree. Write a DT binding document to describe those properties.
---
* Add hp-detect-gpios' property
--- Documentation/devicetree/bindings/sound/rt5645.txt | 72 ++++++++++++++++++++++ sound/soc/codecs/rt5645.c | 16 +++++ 2 files changed, 88 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/rt5645.txt
Documentation/devicetree/bindings/sound/rt5645.txt new file +72 -0
@@ -0,0 +1,72 @@ +RT5650/RT5645 audio CODEC + +This device supports I2C only. + +Required properties: + +- compatible : One of "realtek,rt5645" or "realtek,rt5650". + +- reg : The I2C address of the device. + +- interrupts : The CODEC's interrupt output. + +Optional properties: + +- hp-detect-gpios: + a GPIO spec for the external headphone detect pin. If jd-mode = 0, + we will get the JD status by getting the value of hp-detect-gpios. + +- realtek,in2-differential + Boolean. Indicate MIC2 input are differential, rather than single-ended. + +- realtek,dmic1-data-pin + 0: dmic1 is not used + 1: using IN2P pin as dmic1 data pin + 2: using GPIO6 pin as dmic1 data pin + 3: using GPIO10 pin as dmic1 data pin + 4: using GPIO12 pin as dmic1 data pin + +- realtek,dmic2-data-pin + 0: dmic2 is not used + 1: using IN2N pin as dmic2 data pin + 2: using GPIO5 pin as dmic2 data pin + 3: using GPIO11 pin as dmic2 data pin + +-- realtek,jd-mode : The JD mode of rt5645/rt5650 + 0 : rt5645/rt5650 JD function is not used + 1 : Mode-0 (VDD=3.3V), two port jack detection + 2 : Mode-1 (VDD=3.3V), one port jack detection + 3 : Mode-2 (VDD=1.8V), one port jack detection + +Pins on the device (for linking into audio routes) for RT5645/RT5650: + + * DMIC L1 + * DMIC R1 + * DMIC L2 + * DMIC R2 + * IN1P + * IN1N + * IN2P + * IN2N + * Haptic Generator + * HPOL + * HPOR + * LOUTL + * LOUTR + * PDM1L + * PDM1R + * SPOL + * SPOR + +Example: + +codec: rt5650@1a { + compatible = "realtek,rt5650"; + reg = <0x1a>; + hp-detect-gpios = <&gpio 19 0>; + interrupt-parent = <&gpio>; + interrupts = <7 IRQ_TYPE_EDGE_FALLING>; + realtek,dmic-en = "true"; + realtek,en-jd-func = "true"; + realtek,jd-mode = <3>; +};
sound/soc/codecs/rt5645.c +16 -0
@@ -3226,6 +3226,20 @@ static struct dmi_system_id dmi_platform_intel_braswell[] = { { } }; +static int rt5645_parse_dt (struct rt5645_priv *rt5645,struct device_node *np) +{ + rt5645->pdata.in2_diff =device_property_read_bool (np, +"realtek,in2-differential" ); +device_property_read_u32 (np, +"realtek,dmic1-data-pin" , &rt5645->pdata.dmic1_data_pin); +device_property_read_u32 (np, +"realtek,dmic2-data-pin" , &rt5645->pdata.dmic2_data_pin); +device_property_read_u32 (np, +"realtek,jd-mode" , &rt5645->pdata.jd_mode); + +return 0 ; +} +static int rt5645_i2c_probe (struct i2c_client *i2c,const struct i2c_device_id *id) {
@@ -3244,6 +3258,8 @@ static int rt5645_i2c_probe(struct i2c_client *i2c,if (pdata) { rt5645->pdata = *pdata; + }else if (i2c->dev.of_node) { +rt5645_parse_dt (rt5645, i2c->dev.of_node); }else {if (dmi_check_system (dmi_platform_intel_braswell)) { rt5645->pdata = *rt5645_pdata;
Signature · 1 line
1.8.1.1.439.g50a6b54
Quoted 2 lines · Bard Liao
Register
RT5650_TDM_CTRL_4(0x7A)is readable and used for mixer setting. It should be added inrt5645_readable_registerfunction.
Applied all, thanks.
Mark Brown
maintainerQuoted 5 lines · Mark Brown
Quoted 2 lines · Bard Liao
Register
RT5650_TDM_CTRL_4(0x7A)is readable and used for mixer setting. It should be added inrt5645_readable_registerfunction.Applied all, thanks.
...then dropped as this seems to have lots of non-trivial conficts with the fix/rt5645 branch. Can you please check what's going on there and resend? Please use the tag I just sent to Takashi (asoc-v4.2) as the thing to base your patches on for this resend.