ASoC: dt-bindings: cirrus,cs530x: Add initial DT binding
Subsystems (4)
PATCH v2 1/2 ASoC: dt-bindings: cirrus,cs530x: Add initial DT binding
Add the YAML DT bindings for the cs530x high performance audio ADCs.
--- .../bindings/sound/cirrus,cs530x.yaml | 85 +++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/cirrus,cs530x.yaml
Documentation/devicetree/bindings/sound/cirrus,cs530x.yaml new file +85 -0
@@ -0,0 +1,85 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/cirrus,cs530x.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Cirrus Logic cs530x family of audio ADCs + +maintainers: + - Paul Handrigan <[email protected]> + - [email protected] + +description: + The CS530X devices are a family of high performance audio ADCs. + +allOf: + - $ref: dai-common.yaml# + +properties: + compatible: + enum: + - cirrus,cs5302 + - cirrus,cs5304 + - cirrus,cs5308 + + reg: + maxItems: 1 + + '#sound-dai-cells': + const: 1 + + reset-gpios: + maxItems: 1 + + vdd-a-supply: + description: Analog power supply + + vdd-io-supply: + description: Digital IO power supply + + cirrus,in-hiz-pin12: + description: + Sets input channels one and two to high impedance. + type: boolean + + cirrus,in-hiz-pin34: + description: + Sets input channels three and four to high impedance. + type: boolean + + cirrus,in-hiz-pin56: + description: + Sets input channels five and six to high impedance. + type: boolean + + cirrus,in-hiz-pin78: + description: + Sets input channels seven and eight to high impedance. + type: boolean + +required: + - compatible + - reg + - "#sound-dai-cells" + +unevaluatedProperties: false + +examples: + - | + #include <dt-bindings/gpio/gpio.h> + + i2c { + #address-cells = <1>; + #size-cells = <0>; + + cs5304: cs5304@48 { + compatible = "cirrus,cs5304"; + reg = <0x48>; + #sound-dai-cells = <1>; + reset-gpios = <&gpio 110 GPIO_ACTIVE_LOW>; + vdd-a-supply = <&vreg>; + vdd-io-supply = <&vreg>; + cirrus,in-hiz-pin34; + }; + };
Signature · 1 line
2.34.1
PATCH v2 2/2 ASoC: cs530x: Support for cs530x ADCs
Add support for the cs530x family of high performance ADCs.
--- sound/soc/codecs/Kconfig | 14 + sound/soc/codecs/Makefile | 4 + sound/soc/codecs/cs530x-i2c.c | 71 +++ sound/soc/codecs/cs530x.c | 983 ++++++++++++++++++++++++++++++++++ sound/soc/codecs/cs530x.h | 223 ++++++++ 5 files changed, 1295 insertions(+) create mode 100644 sound/soc/codecs/cs530x-i2c.c create mode 100644 sound/soc/codecs/cs530x.c create mode 100644 sound/soc/codecs/cs530x.h
sound/soc/codecs/Kconfig +14 -0
@@ -99,6 +99,7 @@ config SND_SOC_ALL_CODECS imply SND_SOC_CS47L90 imply SND_SOC_CS47L92 imply SND_SOC_CS53L30 + imply SND_SOC_CS530X_I2C imply SND_SOC_CX20442 imply SND_SOC_CX2072X imply SND_SOC_DA7210
@@ -999,6 +1000,19 @@ config SND_SOC_CS53L30 tristate "Cirrus Logic CS53L30 CODEC" depends on I2C +config SND_SOC_CS530X + tristate + +config SND_SOC_CS530X_I2C + tristate "Cirrus Logic CS530x ADCs (I2C)" + depends on I2C + select REGMAP + select REGMAP_I2C + select SND_SOC_CS530X + help + Enable support for Cirrus Logic CS530X ADCs + with I2C control. + config SND_SOC_CX20442 tristate depends on TTY
sound/soc/codecs/Makefile +4 -0
@@ -107,6 +107,8 @@ snd-soc-cs47l85-y := cs47l85.o snd-soc-cs47l90-y := cs47l90.o snd-soc-cs47l92-y := cs47l92.o snd-soc-cs53l30-y := cs53l30.o +snd-soc-cs530x-y := cs530x.o +snd-soc-cs530x-i2c-y := cs530x-i2c.o snd-soc-cx20442-y := cx20442.o snd-soc-cx2072x-y := cx2072x.o snd-soc-da7210-y := da7210.o
@@ -508,6 +510,8 @@ obj-$(CONFIG_SND_SOC_CS47L85) += snd-soc-cs47l85.o obj-$(CONFIG_SND_SOC_CS47L90) += snd-soc-cs47l90.o obj-$(CONFIG_SND_SOC_CS47L92) += snd-soc-cs47l92.o obj-$(CONFIG_SND_SOC_CS53L30) += snd-soc-cs53l30.o +obj-$(CONFIG_SND_SOC_CS530X) += snd-soc-cs530x.o +obj-$(CONFIG_SND_SOC_CS530X_I2C) += snd-soc-cs530x-i2c.o obj-$(CONFIG_SND_SOC_CX20442) += snd-soc-cx20442.o obj-$(CONFIG_SND_SOC_CX2072X) += snd-soc-cx2072x.o obj-$(CONFIG_SND_SOC_DA7210) += snd-soc-da7210.o
sound/soc/codecs/cs530x-i2c.c new file +71 -0
71 lines not on this page · raw message
sound/soc/codecs/cs530x.c new file +983 -0
983 lines not on this page · raw message
sound/soc/codecs/cs530x.h new file +223 -0
223 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH v2 2/2] ASoC: cs530x: Support for cs530x ADCs
Quoted 4 lines · Paul Handrigan
Add support for the cs530x family of high performance ADCs.
Signed-off-by Paul Handrigan <[email protected]>
...
Quoted 14 lines
sound/soc/codecs/cs530x.c new file +14
-0+ +dev_dbg (dev,"Device ID 0x%x\n" , dev_id); + + ret =regmap_read (cs530x->regmap,CS530X_REVID , &rev); +if (ret) +return dev_err_probe (dev, ret,"Can't read REV ID\n" ); + +switch (dev_id) { +case CS530X_2CH_ADC_DEV_ID : + cs530x->num_adcs =2 ; +break ; +case CS530X_4CH_ADC_DEV_ID : + cs530x->num_adcs =4 ; +break ;
sound/soc/codecs/cs530x.c line 865
Quoted 10 lines
sound/soc/codecs/cs530x.c new file +10
-0+case CS530X_8CH_ADC_DEV_ID : + cs530x->num_adcs =8 ; +break ; +default : +return dev_err_probe (dev, -EINVAL ,"Invalid device ID 0x%x\n" , + dev_id); + } + +dev_info (dev,"CS5308 %d Channel Audio ADC Rev 0x%x\n" , + cs530x->num_adcs, rev &0xff );
dev_dbg or just drop. You already have dev_dbg with rev before.
Quoted 49 lines
sound/soc/codecs/cs530x.c new file +49
-0+ +return 0 ; +} + +static int cs530x_parse_device_properties (struct cs530x_priv *cs530x) +{ +struct regmap *regmap = cs530x->regmap; +struct device *dev = cs530x->dev; +unsigned int val =0 ; + +switch (cs530x->num_adcs) { +case 8 : +if (device_property_read_bool (dev,"cirrus,in-hiz-pin78" )) + val =CS530X_IN78_HIZ ; + +if (device_property_read_bool (dev,"cirrus,in-hiz-pin56" )) + val |=CS530X_IN56_HIZ ; + + fallthrough; +case 4 : +if (device_property_read_bool (dev,"cirrus,in-hiz-pin34" )) + val |=CS530X_IN34_HIZ ; + + fallthrough; +case 2 : +if (device_property_read_bool (dev,"cirrus,in-hiz-pin12" )) + val |=CS530X_IN12_HIZ ; + +return regmap_set_bits (regmap,CS530X_IN_HIZ , val); +default : +return dev_err_probe (dev, -EINVAL , +"Invalid number of adcs %d\n" , + cs530x->num_adcs); + } +} + +int cs530x_probe (struct cs530x_priv *cs530x) +{ +struct device *dev = cs530x->dev; +int ret, i; + +for (i =0 ; i <ARRAY_SIZE (cs530x->supplies); i++) + cs530x->supplies[i].supply = cs530x_supply_names[i]; + + ret =devm_regulator_bulk_get (dev,ARRAY_SIZE (cs530x->supplies), + cs530x->supplies); +if (ret !=0 ) +return dev_err_probe (dev, ret,"Failed to request supplies" ); +
sound/soc/codecs/cs530x.c line 924
Quoted 10 lines
sound/soc/codecs/cs530x.c new file +10
-0+ ret =regulator_bulk_enable (ARRAY_SIZE (cs530x->supplies), + cs530x->supplies); +if (ret !=0 ) +return dev_err_probe (dev, ret,"Failed to enable supplies" ); + + cs530x->reset_gpio =devm_gpiod_get_optional (dev,"reset" , +GPIOD_OUT_HIGH ); +if (IS_ERR (cs530x->reset_gpio)) { + ret =PTR_ERR (cs530x->reset_gpio); +dev_err_probe (dev, ret,"Reset gpio not available\n" );
My previous comments about syntax being return dev_err_probe() should lead you to understand how dev_err_probe works.
ret = dev_err_probe()
Quoted 23 lines
sound/soc/codecs/cs530x.c new file +23
-0+ goto err_regulator; + } + +if (cs530x->reset_gpio) { +usleep_range (2000 ,2100 ); +gpiod_set_value_cansleep (cs530x->reset_gpio,0 ); + } + +usleep_range (5000 ,5100 ); + ret =cs530x_check_device_id (cs530x); +if (ret) + goto err_reset; + +if (!cs530x->reset_gpio) { + ret =regmap_write (cs530x->regmap,CS530X_SW_RESET , +CS530X_SW_RST_VAL ); +if (ret) { +dev_err_probe (dev, ret,"Soft Reset Failed\n" ); + goto err_reset; + } + } + + ret =cs530x_parse_device_properties (cs530x);
sound/soc/codecs/cs530x.c line 957
Quoted 10 lines
sound/soc/codecs/cs530x.c new file +10
-0+if (ret) + goto err_reset; + + cs530x->dev_dai =devm_kmemdup (dev, &cs530x_dai, +sizeof (*(cs530x->dev_dai)), +GFP_KERNEL ); +if (!cs530x->dev_dai) { + ret = -ENOMEM ; + goto err_reset; + }
Allocations are usually placed at beginning of probe(). This simplifies error paths.
Quoted 11 lines
sound/soc/codecs/cs530x.c new file +11
-0+ + cs530x->dev_dai->capture.channels_max = cs530x->num_adcs; + + ret =devm_snd_soc_register_component (dev, + &soc_component_dev_cs530x, cs530x->dev_dai,1 ); +if (ret) { +dev_err_probe (dev, ret,"Can't register cs530x component\n" ); + goto err_reset; + } + +return 0 ;
sound/soc/codecs/cs530x.c line 978
Quoted 10 lines
sound/soc/codecs/cs530x.c new file +10
-0+ +err_reset: +gpiod_set_value_cansleep (cs530x->reset_gpio,1 ); + +err_regulator: +regulator_bulk_disable (ARRAY_SIZE (cs530x->supplies), + cs530x->supplies); + +return ret; +}
Best regards,
Krzysztof
Quoted 4 lines · Paul Handrigan
Add the YAML DT bindings for the cs530x high performance audio ADCs.
Documentation/devicetree/bindings/sound/cirrus,cs530x.yaml line 76
Quoted 10 lines
Documentation/devicetree/bindings/sound/cirrus,cs530x.yaml new file +10
-0+ +examples: + - | + #include <dt-bindings/gpio/gpio.h> + + i2c { + #address-cells = <1>; + #size-cells = <0>; + + cs5304: cs5304@48 {
What happened here? This was different.
Node names should be generic. See also an explanation and list of examples (not exhaustive) in DT specification:
https://devicetree-specification.readthedocs.io/en/latest/chapter2-devicetree-basics.html#generic-names-recommendation
audio-codec? audio-adc? adc?
Best regards,
Krzysztof