[PATCH v4 1/2] dt-bindings: tas2562: Convert the tas2562 binding to yaml
Convert the TAS2562 text file to yaml format.
Signed-off-by: Dan Murphy dmurphy@ti.com --- .../devicetree/bindings/sound/tas2562.txt | 34 --------- .../devicetree/bindings/sound/tas2562.yaml | 69 +++++++++++++++++++ 2 files changed, 69 insertions(+), 34 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/tas2562.txt create mode 100644 Documentation/devicetree/bindings/sound/tas2562.yaml
diff --git a/Documentation/devicetree/bindings/sound/tas2562.txt b/Documentation/devicetree/bindings/sound/tas2562.txt deleted file mode 100644 index 94796b547184..000000000000 --- a/Documentation/devicetree/bindings/sound/tas2562.txt +++ /dev/null @@ -1,34 +0,0 @@ -Texas Instruments TAS2562 Smart PA - -The TAS2562 is a mono, digital input Class-D audio amplifier optimized for -efficiently driving high peak power into small loudspeakers. -Integrated speaker voltage and current sense provides for -real time monitoring of loudspeaker behavior. - -Required properties: - - #address-cells - Should be <1>. - - #size-cells - Should be <0>. - - compatible: - Should contain "ti,tas2562", "ti,tas2563". - - reg: - The i2c address. Should be 0x4c, 0x4d, 0x4e or 0x4f. - - ti,imon-slot-no:- TDM TX current sense time slot. - -Optional properties: -- interrupt-parent: phandle to the interrupt controller which provides - the interrupt. -- interrupts: (GPIO) interrupt to which the chip is connected. -- shut-down: GPIO used to control the state of the device. - -Examples: -tas2562@4c { - #address-cells = <1>; - #size-cells = <0>; - compatible = "ti,tas2562"; - reg = <0x4c>; - - interrupt-parent = <&gpio1>; - interrupts = <14>; - - shut-down = <&gpio1 15 0>; - ti,imon-slot-no = <0>; -}; - diff --git a/Documentation/devicetree/bindings/sound/tas2562.yaml b/Documentation/devicetree/bindings/sound/tas2562.yaml new file mode 100644 index 000000000000..d2d3401bf251 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/tas2562.yaml @@ -0,0 +1,69 @@ +# SPDX-License-Identifier: (GPL-2.0+ OR BSD-2-Clause) +# Copyright (C) 2019 Texas Instruments Incorporated +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/sound/tas2562.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Texas Instruments TAS2562 Smart PA + +maintainers: + - Dan Murphy dmurphy@ti.com + +description: | + The TAS2562 is a mono, digital input Class-D audio amplifier optimized for + efficiently driving high peak power into small loudspeakers. + Integrated speaker voltage and current sense provides for + real time monitoring of loudspeaker behavior. + +properties: + compatible: + enum: + - ti,tas2562 + - ti,tas2563 + + reg: + maxItems: 1 + description: | + I2C address of the device can be one of these 0x4c, 0x4d, 0x4e or 0x4f + + shut-down-gpio: + description: GPIO used to control the state of the device. + deprecated: true + + shutdown-gpio: + description: GPIO used to control the state of the device. + + interrupts: + maxItems: 1 + + ti,imon-slot-no: + $ref: /schemas/types.yaml#/definitions/uint32 + description: TDM TX current sense time slot. + + '#sound-dai-cells': + const: 1 + +required: + - compatible + - reg + +additionalProperties: false + +examples: + - | + #include <dt-bindings/gpio/gpio.h> + i2c0 { + #address-cells = <1>; + #size-cells = <0>; + codec: codec@4c { + compatible = "ti,tas2562"; + reg = <0x4c>; + #sound-dai-cells = <1>; + interrupt-parent = <&gpio1>; + interrupts = <14>; + shutdown-gpio = <&gpio1 15 0>; + ti,imon-slot-no = <0>; + }; + }; +
Update the shutdown GPIO property to be shutdown from shut-down.
Fixes: c173dba44c2d2 ("ASoC: tas2562: Introduce the TAS2562 amplifier") Signed-off-by: Dan Murphy dmurphy@ti.com --- sound/soc/codecs/tas2562.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/sound/soc/codecs/tas2562.c b/sound/soc/codecs/tas2562.c index 7fae88655a0f..6026d8b1e7d3 100644 --- a/sound/soc/codecs/tas2562.c +++ b/sound/soc/codecs/tas2562.c @@ -619,7 +619,7 @@ static int tas2562_parse_dt(struct tas2562_data *tas2562) struct device *dev = tas2562->dev; int ret = 0;
- tas2562->sdz_gpio = devm_gpiod_get_optional(dev, "shut-down-gpio", + tas2562->sdz_gpio = devm_gpiod_get_optional(dev, "shutdown", GPIOD_OUT_HIGH); if (IS_ERR(tas2562->sdz_gpio)) { if (PTR_ERR(tas2562->sdz_gpio) == -EPROBE_DEFER) { @@ -628,6 +628,21 @@ static int tas2562_parse_dt(struct tas2562_data *tas2562) } }
+ /* + * The shut-down property is deprecated but needs to be checked for + * backwards compatibility. + */ + if (tas2562->sdz_gpio == NULL) { + tas2562->sdz_gpio = devm_gpiod_get_optional(dev, "shut-down", + GPIOD_OUT_HIGH); + if (IS_ERR(tas2562->sdz_gpio)) { + if (PTR_ERR(tas2562->sdz_gpio) == -EPROBE_DEFER) { + tas2562->sdz_gpio = NULL; + return -EPROBE_DEFER; + } + } + } + ret = fwnode_property_read_u32(dev->fwnode, "ti,imon-slot-no", &tas2562->i_sense_slot); if (ret)
Hello
On 6/12/20 12:14 PM, Dan Murphy wrote:
Update the shutdown GPIO property to be shutdown from shut-down.
I have some other patches that go on top of this patchset I am wondering if I should re-submit with those patches on top or indicate in a cover letter the dependency
Dan
On Tue, Jun 23, 2020 at 10:59:49AM -0500, Dan Murphy wrote:
On 6/12/20 12:14 PM, Dan Murphy wrote:
Update the shutdown GPIO property to be shutdown from shut-down.
I have some other patches that go on top of this patchset I am wondering if I should re-submit with those patches on top or indicate in a cover letter the dependency
If you decide to resubmit please make the YAML conversion the very last thing you do in your series, there is a considerable backlog on YAML conversion reviews which slows down any changes that depend on them.
Mark
On 6/23/20 12:18 PM, Mark Brown wrote:
On Tue, Jun 23, 2020 at 10:59:49AM -0500, Dan Murphy wrote:
On 6/12/20 12:14 PM, Dan Murphy wrote:
Update the shutdown GPIO property to be shutdown from shut-down.
I have some other patches that go on top of this patchset I am wondering if I should re-submit with those patches on top or indicate in a cover letter the dependency
If you decide to resubmit please make the YAML conversion the very last thing you do in your series, there is a considerable backlog on YAML conversion reviews which slows down any changes that depend on them.
Thanks for the advice. I know the DT folks have a lot to review and the merge window did not help them.
I will re-factor these and re-submit as well as the TAS2770 patchset.
Dan
On Fri, 12 Jun 2020 12:14:11 -0500, Dan Murphy wrote:
Convert the TAS2562 text file to yaml format.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/2] dt-bindings: tas2562: Convert the tas2562 binding to yaml (no commit info) [2/2] ASoC: tas2562: Update shutdown GPIO property commit: f78a97003b8babb1c49e2e4a6b46f15ac31ecf49
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
participants (2)
-
Dan Murphy -
Mark Brown