ASoC: cs35l33: Initial commit of the cs35l33 CODEC driver.
Subsystems (4)
PATCH v6 1/2 ASoC: cs35l33: Initial commit of the cs35l33 CODEC driver.
From: Paul Handrigan <[email protected]>
Initial commit of the Cirrus Logic cs35l33 8V boosted class D amplifier.
--- include/sound/cs35l33.h | 48 ++ sound/soc/codecs/Kconfig | 5 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/cs35l33.c | 1300 ++++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/cs35l33.h | 221 ++++++++ 5 files changed, 1576 insertions(+) create mode 100644 include/sound/cs35l33.h create mode 100644 sound/soc/codecs/cs35l33.c create mode 100644 sound/soc/codecs/cs35l33.h
include/sound/cs35l33.h new file +48 -0
@@ -0,0 +1,48 @@ +/* +* linux/sound/cs35l33.h -- Platform data for CS35l33 +* +* Copyright (c) 2016 Cirrus Logic Inc. +* +* 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 __CS35L33_H +#define __CS35L33_H + +struct cs35l33_hg { +bool enable_hg_algo; +unsigned int mem_depth; +unsigned int release_rate; +unsigned int hd_rm; +unsigned int ldo_thld; +unsigned int ldo_path_disable; +unsigned int ldo_entry_delay; +bool vp_hg_auto; +unsigned int vp_hg; +unsigned int vp_hg_rate; +unsigned int vp_hg_va; +}; + +struct cs35l33_pdata { +/* Boost Controller Voltage Setting */ +unsigned int boost_ctl; + +/* Boost Controller Peak Current */ +unsigned int boost_ipk; + +/* Amplifier Drive Select */ +unsigned int amp_drv_sel; + +/* soft volume ramp */ +unsigned int ramp_rate; + +/* IMON adc scale */ +unsigned int imon_adc_scale; + +/* H/G algo configuration */ +struct cs35l33_hg hg_config; +}; + +#endif /* __CS35L33_H */
sound/soc/codecs/Kconfig +5 -0
@@ -47,6 +47,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_BT_SCO select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC select SND_SOC_CS35L32 if I2C + select SND_SOC_CS35L33 if I2C select SND_SOC_CS42L51_I2C if I2C select SND_SOC_CS42L52 if I2C && INPUT select SND_SOC_CS42L56 if I2C && INPUT
@@ -386,6 +387,10 @@ config SND_SOC_CS35L32 tristate "Cirrus Logic CS35L32 CODEC" depends on I2C +config SND_SOC_CS35L33 + tristate "Cirrus Logic CS35L33 CODEC" + depends on I2C + config SND_SOC_CS42L51 tristate
sound/soc/codecs/Makefile +2 -0
@@ -36,6 +36,7 @@ snd-soc-arizona-objs := arizona.o snd-soc-bt-sco-objs := bt-sco.o snd-soc-cq93vc-objs := cq93vc.o snd-soc-cs35l32-objs := cs35l32.o +snd-soc-cs35l33-objs := cs35l33.o snd-soc-cs42l51-objs := cs42l51.o snd-soc-cs42l51-i2c-objs := cs42l51-i2c.o snd-soc-cs42l52-objs := cs42l52.o
@@ -254,6 +255,7 @@ obj-$(CONFIG_SND_SOC_ARIZONA) += snd-soc-arizona.o obj-$(CONFIG_SND_SOC_BT_SCO) += snd-soc-bt-sco.o obj-$(CONFIG_SND_SOC_CQ0093VC) += snd-soc-cq93vc.o obj-$(CONFIG_SND_SOC_CS35L32) += snd-soc-cs35l32.o +obj-$(CONFIG_SND_SOC_CS35L33) += snd-soc-cs35l33.o obj-$(CONFIG_SND_SOC_CS42L51) += snd-soc-cs42l51.o obj-$(CONFIG_SND_SOC_CS42L51_I2C) += snd-soc-cs42l51-i2c.o obj-$(CONFIG_SND_SOC_CS42L52) += snd-soc-cs42l52.o
sound/soc/codecs/cs35l33.c new file +1300 -0
1,300 lines not on this page · raw message
sound/soc/codecs/cs35l33.h new file +221 -0
221 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v6 2/2 ASoC: cs35l33: Add device tree bindings file for cs35l33
From: Paul Handrigan <[email protected]>
Add device tree bindings file for the cs35l33 8V boosted class D amplifier.
--- .../devicetree/bindings/sound/cs35l33.txt | 114 +++++++++++++++++++++ 1 file changed, 114 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/cs35l33.txt
Documentation/devicetree/bindings/sound/cs35l33.txt new file +114 -0
@@ -0,0 +1,114 @@ +CS35L33 Speaker Amplifier + +Required properties: + + - compatible : "cirrus,cs35l33" + + - reg : the I2C address of the device for I2C + + - VA-supply, VP-supply : power supplies for the device, + as covered in + Documentation/devicetree/bindings/regulator/regulator.txt. + +Optional properties: + + - reset-gpios : gpio used to reset the amplifier + + - interrupt-parent : Specifies the phandle of the interrupt controller to + which the IRQs from CS35L33 are delivered to. + - interrupts : IRQ line info CS35L33. + (See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt + for further information relating to interrupt properties) + + - boost-ctl : Booster voltage use to supply the amp. If the value is + 0, then VBST = VP. If greater than 0, the boost voltage will be 3300mV with + a value of 1 and will increase at a step size of 100mV until a maximum of + 8000mV. + + - ramp-rate : On power up, it affects the time from when the power + up sequence begins to the time the audio reaches a full-scale output. + On power down, it affects the time from when the power-down sequence + begins to when the amplifier disables the PWM outputs. If this property + is not set then soft ramping will be disabled and ramp time would be + 20ms. If this property is set to 0,1,2,3 then ramp times would be 40ms, + 60ms,100ms,175ms respectively for 48KHz sample rate. + + - boost-ipk : The maximum current allowed for the boost converter. + The range starts at 1850mA (0xF0) and goes to a maximum of 3600mA (0xE0) + with a step size of 15.625mA. The default is 2500mA (0x90). + + - hg-algo : Parameters for internal Class H/G algorithm that + controls the amplifier supplies. + + - mem-depth : Memory depth for the Class H/G algorithm measured in LRCLK + cycles. If this property is set to 0, 1, 2, or 3 then the memory depths + will be 1, 4, 8, 16 LRCLK cycles. The default is 16 LRCLK cycles. + + release-rate : The number of consecutive LRCLK periods before allowing + release condition tracking updates. The number of LRCLK periods start + at 3 to a maximum of 255. + + - ldo-thld : Configures the signal threshold at which the PWM output stage + enters LDO operation. Starts as a default value of 50mV for a value of 1 + and increases with a step size of 50mV to a maximum of 750mV (value of + 0xF). + + - ldo-path-disable : This is a boolean property. If present, the H/G + algorithm uses the max detection path. If not present, the LDO + detection path is used. + + - ldo-entry-delay : The LDO entry delay in milliseconds before the H/G + algorithm switches to the LDO voltage. This property can be set to values + from 0 to 7 for delays of 5ms, 10ms, 50ms, 100ms, 200ms, 500ms, 1000ms. + The default is 100ms. + + - vp-hg-auto : This is a boolean property. When set, class H/G VPhg + automatic updating is enabled. + + - vp-hg : Class H/G algorithm VPhg. Controls the H/G algorithm's + reference to the VP voltage for when to start generating a boosted VBST. + The reference voltage starts at 3000mV with a value of 0x3 and is increased + by 100mV per step to a maximum of 5500mV. + + - vp-hg-rate : The rate (number of LRCLK periods) at which the VPhg is + allowed to increase to a higher voltage when using VPhg automatic + tracking. This property can be set to values from 0 to 3 with rates of 128 + periods, 2048 periods, 32768 periods, and 524288 periods. + The default is 32768 periods. + + - vp-hg-va : VA calculation reference for automatic VPhg tracking using VPMON. + This property can be set to values from 0 to 6 starting at 1800mV with a + step size of 50mV up to a maximum value of 1750mV. Default is 1800mV. + + +Example: + +cs35l33: cs35l33@40 { + compatible = "cirrus,cs35l33"; + reg = <0x40>; + + VA-supply = <&ldo5_reg>; + VP-supply = <&ldo5_reg>; + + interrupt-parent = <&gpio8>; + interrupts = <3 IRQ_TYPE_LEVEL_LOW>; + + reset-gpios = <&cs47l91 34 0>; + + ramp-rate = <0x0>; + boost-ctl = <0x30>; /* VBST = 8000mV */ + boost-ipk = <0xE0>; /* 3600mA */ + + hg-algo { + mem-depth = <0x3>; + release-rate = <0x3>; + hd-rm = <0xA>; + ldo-thld = <0x1>; + ldo-path-disable = <0x0>; + ldo-entry-delay=<0x4>; + vp-hg-auto; + vp-hg=<0xF>; + vp-hg-rate=<0x2>; + vp-hg-va=<0x0>; + }; +};
Signature · 1 line
1.9.1
Mark Brown
maintainersound/soc/codecs/cs35l33.c line 664
Quoted 3 lines · On Fri, Jun 03, 2016 at 03:09:05PM -0500, [email protected] wrote:
sound/soc/codecs/cs35l33.c new file +3
-0+regmap_update_bits (cs35l33->regmap,CS35L33_CLK_CTL , +CS35L33_MCLKDIV2 ,CS35L33_MCLKDIV2 ); + cs35l33->mclk_int = freq/2 ;
Coding style, spaces around /.
sound/soc/codecs/cs35l33.c line 1051
Quoted 3 lines
sound/soc/codecs/cs35l33.c new file +3
-0+if (CS35L33_VBSTMON_OVFL & sticky_val2) +dev_err (codec->dev, +"ERROR: VPMON Overflow Interrupt\n" );
Cut'n'paste.
sound/soc/codecs/cs35l33.c line 1062
Quoted 10 lines
sound/soc/codecs/cs35l33.c new file +10
-0+/* Make sure that the bits are cleared */ +for (i =0 ; i <CS35L33_INT_ATTEMPTS ; i++) { +regmap_read (cs35l33->regmap,CS35L33_INT_STATUS_1 , + &sticky_val1); +regmap_read (cs35l33->regmap,CS35L33_INT_STATUS_2 , + &sticky_val2); + +if (!(sticky_val1 & ~mask1) && !(sticky_val2 & ~mask2)) +break ; + }
I still don't understand this. If these interrupts are clear on read (which seems to be the case since we don't ack anything?) then these repeated reads are obviously just going to ignore interrupts. I really hope that the masking also applies to the clear on read behaviour but that's a separate thing.
I'm guessing the hardware is just broken here but it's not clear to me that just letting the interrupt fire a couple of extra times isn't the best solution and we need a clear explanation of what this is trying to accomplish and why so that the code is maintainable.
sound/soc/codecs/cs35l33.c line 1162
Quoted 4 lines
sound/soc/codecs/cs35l33.c new file +4
-0+ ret =request_threaded_irq (i2c_client->irq,NULL , cs35l33_irq_thread, +IRQF_ONESHOT |IRQF_TRIGGER_LOW ,"cs35l33" , cs35l33); +if (ret !=0 ) +dev_err (&i2c_client->dev,"Failed to request IRQ: %d\n" , ret);
But otherwise ignore the error?
Quoted 7 lines · Mark Brown
sound/soc/codecs/cs35l33.c line 664
Quoted 3 lines · On Fri, Jun 03, 2016 at 03:09:05PM -0500, [email protected] wrote:
sound/soc/codecs/cs35l33.c new file +3
-0+regmap_update_bits (cs35l33->regmap,CS35L33_CLK_CTL , +CS35L33_MCLKDIV2 ,CS35L33_MCLKDIV2 ); + cs35l33->mclk_int = freq/2 ;Coding style, spaces around /.
Thanks!
Quoted 6 lines
sound/soc/codecs/cs35l33.c line 1051
Quoted 4 lines
sound/soc/codecs/cs35l33.c new file +3
-0+if (CS35L33_VBSTMON_OVFL & sticky_val2) +dev_err (codec->dev, +"ERROR: VPMON Overflow Interrupt\n" );Cut'n'paste.
Thanks!
Quoted 18 lines
sound/soc/codecs/cs35l33.c line 1062
Quoted 11 lines
sound/soc/codecs/cs35l33.c new file +10
-0+/* Make sure that the bits are cleared */ +for (i =0 ; i <CS35L33_INT_ATTEMPTS ; i++) { +regmap_read (cs35l33->regmap,CS35L33_INT_STATUS_1 , + &sticky_val1); +regmap_read (cs35l33->regmap,CS35L33_INT_STATUS_2 , + &sticky_val2); + +if (!(sticky_val1 & ~mask1) && !(sticky_val2 & ~mask2)) +break ; + }I still don't understand this. If these interrupts are clear on read (which seems to be the case since we don't ack anything?) then these repeated reads are obviously just going to ignore interrupts. I really hope that the masking also applies to the clear on read behaviour but that's a separate thing.
Quoted 4 lines
I'm guessing the hardware is just broken here but it's not clear to me that just letting the interrupt fire a couple of extra times isn't the best solution and we need a clear explanation of what this is trying to accomplish and why so that the code is maintainable.
It is just to ensure that the unmasked bits are cleared. We can remove this code all together.
Quoted 10 lines
Quoted 8 lines
+ ret = request_threaded_irq(i2c_client->irq, NULL,
cs35l33_irq_thread,
+IRQF_ONESHOT|IRQF_TRIGGER_LOW, "cs35l33",
cs35l33);(quoted diff) +2
-0+ if (ret != 0) + dev_err(&i2c_client->dev, "Failed to request IRQ:%d\n", ret);
But otherwise ignore the error?
This really should be a warning. The device can be used without an interrupt pin.
This should be devm_ as well.