Skip to contentSkip to conversation

ASoC: lochnagar: Add device tree binding document

PATCH In review Charles Keepax 2 participants 4 messages Mar 20, 2019

Subsystems (4)
lore
Share & tools
lore

Charles Keepax

author maintainer
#0 lore raw

PATCH 1/2 ASoC: lochnagar: Add device tree binding document

Lochnagar is an evaluation and development board for Cirrus Logic Smart CODEC and Amp devices. It allows the connection of most Cirrus Logic devices on mini-cards, as well as allowing connection of various application processor systems to provide a full evaluation platform. This driver supports the board controller chip on the Lochnagar board.

---
 .../devicetree/bindings/sound/cirrus,lochnagar.txt | 39 ++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/sound/cirrus,lochnagar.txt
Documentation/devicetree/bindings/sound/cirrus,lochnagar.txt new file +39 -0
new file mode 100644
index 0000000000000..fba5fb53a2f90
@@ -0,0 +1,39 @@
+Cirrus Logic Lochnagar Audio Development Board
+
+Lochnagar is an evaluation and development board for Cirrus Logic
+Smart CODEC and Amp devices. It allows the connection of most Cirrus
+Logic devices on mini-cards, as well as allowing connection of
+various application processor systems to provide a full evaluation
+platform.  Audio system topology, clocking and power can all be
+controlled through the Lochnagar, allowing the device under test
+to be used in a variety of possible use cases.
+
+This binding document describes the binding for the audio portion
+of the driver.
+
+This binding must be part of the Lochnagar MFD binding:
+  [4] ../mfd/cirrus,lochnagar.txt
+
+Required properties:
+
+  - compatible : One of the following strings:
+                 "cirrus,lochnagar2-soundcard"
+
+  - #sound-dai-cells : Must be set to 1.
+
+  - clocks : Contains an entry for each entry in clock-names.
+  - clock-names : Must include the following clocks:
+      "ln-sound-mclk" Master clock source for the sound card, should
+      normally be set to LOCHNAGAR_SOUNDCARD_MCLK provided by the
+      Lochnagar clock driver.
+
+Example:
+
+lochnagar-sc {
+	compatible = "cirrus,lochnagar2-soundcard";
+
+	#sound-dai-cells = <1>;
+
+	clocks = <&lochnagar_clk LOCHNAGAR_SOUNDCARD_MCLK>;
+	clock-names = "ln-soundcard-mclk";
+};
Signature · 1 line
2.11.0
author maintainer
#1 lore raw

PATCH 2/2 ASoC: lochnagar: Add driver to support Lochnagar 2 sound card

From: Piotr Stankiewicz <[email protected]>

Lochnagar is an evaluation and development board for Cirrus Logic Smart CODEC and Amp devices. It allows the connection of most Cirrus Logic devices on mini-cards, as well as allowing connection of various application processor systems to provide a full evaluation platform.

Lochnagar 2 provides a set of line inputs/outputs, and a USB audio device. This driver adds support for these analog line connections and the Lochnagar side of the USB audio link.

---
 MAINTAINERS                     |   2 +
 sound/soc/codecs/Kconfig        |   8 ++
 sound/soc/codecs/Makefile       |   2 +
 sound/soc/codecs/lochnagar-sc.c | 266 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 278 insertions(+)
 create mode 100644 sound/soc/codecs/lochnagar-sc.c
MAINTAINERS +2 -0
index e17ebf70b5480..1bc9f64ab0e46 100644
@@ -3799,6 +3799,7 @@ F:	drivers/clk/clk-lochnagar.c
 F:	drivers/mfd/lochnagar-i2c.c
 F:	drivers/pinctrl/cirrus/pinctrl-lochnagar.c
 F:	drivers/regulator/lochnagar-regulator.c
+F:	sound/soc/codecs/lochnagar-sc.c
 F:	include/dt-bindings/clk/lochnagar.h
 F:	include/dt-bindings/pinctrl/lochnagar.h
 F:	include/linux/mfd/lochnagar*
@@ -3806,6 +3807,7 @@ F:	Documentation/devicetree/bindings/mfd/cirrus,lochnagar.txt
 F:	Documentation/devicetree/bindings/clock/cirrus,lochnagar.txt
 F:	Documentation/devicetree/bindings/pinctrl/cirrus,lochnagar.txt
 F:	Documentation/devicetree/bindings/regulator/cirrus,lochnagar.txt
+F:	Documentation/devicetree/bindings/sound/cirrus,lochnagar.txt
 
 CISCO FCOE HBA DRIVER
 M:	Satish Kharat <[email protected]>
sound/soc/codecs/Kconfig +8 -0
index 419114edfd57d..05f16632296bf 100644
@@ -94,6 +94,7 @@ config SND_SOC_ALL_CODECS
 	select SND_SOC_JZ4725B_CODEC
 	select SND_SOC_LM4857 if I2C
 	select SND_SOC_LM49453 if I2C
+	select SND_SOC_LOCHNAGAR_SC
 	select SND_SOC_MAX98088 if I2C
 	select SND_SOC_MAX98090 if I2C
 	select SND_SOC_MAX98095 if I2C
@@ -688,6 +689,13 @@ config SND_SOC_ISABELLE
 config SND_SOC_LM49453
 	tristate
 
+config SND_SOC_LOCHNAGAR_SC
+	tristate "Lochnagar Sound Card"
+	depends on MFD_LOCHNAGAR
+	help
+	  This driver support the sound card functionality of the Cirrus
+	  Logic Lochnagar audio development board.
+
 config SND_SOC_MAX98088
 	tristate "Maxim MAX98088/9 Low-Power, Stereo Audio Codec"
 	depends on I2C
sound/soc/codecs/Makefile +2 -0
index aab2ad95a137d..a597de9460272 100644
@@ -91,6 +91,7 @@ snd-soc-jz4725b-codec-objs := jz4725b.o
 snd-soc-l3-objs := l3.o
 snd-soc-lm4857-objs := lm4857.o
 snd-soc-lm49453-objs := lm49453.o
+snd-soc-lochnagar-sc-objs := lochnagar-sc.o
 snd-soc-max9759-objs := max9759.o
 snd-soc-max9768-objs := max9768.o
 snd-soc-max98088-objs := max98088.o
@@ -364,6 +365,7 @@ obj-$(CONFIG_SND_SOC_JZ4725B_CODEC)	+= snd-soc-jz4725b-codec.o
 obj-$(CONFIG_SND_SOC_L3)	+= snd-soc-l3.o
 obj-$(CONFIG_SND_SOC_LM4857)	+= snd-soc-lm4857.o
 obj-$(CONFIG_SND_SOC_LM49453)   += snd-soc-lm49453.o
+obj-$(CONFIG_SND_SOC_LOCHNAGAR_SC)	+= snd-soc-lochnagar-sc.o
 obj-$(CONFIG_SND_SOC_MAX9759)	+= snd-soc-max9759.o
 obj-$(CONFIG_SND_SOC_MAX9768)	+= snd-soc-max9768.o
 obj-$(CONFIG_SND_SOC_MAX98088)	+= snd-soc-max98088.o
sound/soc/codecs/lochnagar-sc.c new file +266 -0

266 lines not on this page · raw message

Signature · 1 line
2.11.0
maintainer
#2 lore raw
In reply to Charles Keepax

Documentation/devicetree/bindings/sound/cirrus,lochnagar.txt line 28

Quoted 4 lines · Charles Keepax
Documentation/devicetree/bindings/sound/cirrus,lochnagar.txt new file +4 -0
+  - clock-names : Must include the following clocks:
+      "ln-sound-mclk" Master clock source for the sound card, should
+      normally be set to LOCHNAGAR_SOUNDCARD_MCLK provided by the
+      Lochnagar clock driver.

Why the namespacing on the clock name here?

author maintainer
#3 lore raw
Quoted 8 lines · Mark Brown

Documentation/devicetree/bindings/sound/cirrus,lochnagar.txt line 28

Quoted 4 lines · Charles Keepax
Documentation/devicetree/bindings/sound/cirrus,lochnagar.txt new file +4 -0
+  - clock-names : Must include the following clocks:
+      "ln-sound-mclk" Master clock source for the sound card, should
+      normally be set to LOCHNAGAR_SOUNDCARD_MCLK provided by the
+      Lochnagar clock driver.

Why the namespacing on the clock name here?

I think this is just a hang over from when these clocks were not handled through DT and thus had to have the same name as was used in the clock driver. Agree it is redundant now and will remove, maybe even just mclk should be fine I guess, as the sound is kinda redundant as well.

Thanks,
Charles