All of lore.kernel.org
 help / color / mirror / Atom feed
From: Xing Zheng <acgzxing@gmail.com>
To: dgreid@chromium.org, dianders@chromium.org, heiko@sntech.de,
	sonnyrao@chromium.org
Cc: linux-rockchip@lists.infradead.org,
	zhengxing <zhengxing@rock-chips.com>,
	Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
	Mark Rutland <mark.rutland@arm.com>,
	Ian Campbell <ijc+devicetree@hellion.org.uk>,
	Kumar Gala <galak@codeaurora.org>,
	devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 4/4] ASoC: rockchip-audio-machine: add rockchip machine driver bindings
Date: Tue, 12 May 2015 17:26:37 +0800	[thread overview]
Message-ID: <1431422797-31903-5-git-send-email-zhengxing@rock-chips.com> (raw)
In-Reply-To: <1431422797-31903-1-git-send-email-zhengxing@rock-chips.com>

From: zhengxing <zhengxing@rock-chips.com>

Add documentation to the machine driver of the device-tree
bindings for the soundcard of the Rockchip board.

Signed-off-by: zhengxing <zhengxing@rock-chips.com>

---

 .../sound/rockchip,rockchip-audio-machine.txt      |   38 ++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-machine.txt

diff --git a/Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-machine.txt b/Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-machine.txt
new file mode 100644
index 0000000..36864fd
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-machine.txt
@@ -0,0 +1,38 @@
+ROCKCHIP rk3288 audio complex, with AUDIO CODEC
+
+Required properties:
+- (machine) compatible : "rockchip,rockchip-audio-machine"
+- (codec) compatible : The child node name of compatible.
+- rockchip,model : The user-visible name of this sound complex.
+
+- rockchip,i2s-controller : The phandle of the Rockchip I2S controller that's
+  connected to the CODEC.
+- rockchip,audio-codec : The phandle of the audio codec.
+- rockchip,headset-codec : The phandle of the jack detection ic.
+
+Optional properties:
+- rockchip,hp-det-gpios : The GPIO that detect headphones are plugged in
+- rockchip,mic-det-gpios : The GPIO that detect microphones are plugged in
+
+Example:
+
+sound {
+	compatible = "rockchip,rockchip-audio-machine";
+
+	/* child node */
+	sound_rtl {
+		compatible = "rockchip,rockchip-audio-rt5645";
+		rockchip,model = "I2S-RT5650";
+		rockchip,i2s-controller = <&i2s>;
+		rockchip,audio-codec = <&rt5645>;
+	};
+
+	/* child node */
+	sound_maxim {
+		compatible = "rockchip,rockchip-audio-max98090";
+		rockchip,model = "ROCKCHIP-I2S";
+		rockchip,i2s-controller = <&i2s>;
+		rockchip,audio-codec = <&max98090>;
+		rockchip,headset-codec = <&headsetcodec>;
+	};
+};
\ No newline at end of file
-- 
1.7.9.5


WARNING: multiple messages have this Message-ID (diff)
From: acgzxing@gmail.com (Xing Zheng)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/4] ASoC: rockchip-audio-machine: add rockchip machine driver bindings
Date: Tue, 12 May 2015 17:26:37 +0800	[thread overview]
Message-ID: <1431422797-31903-5-git-send-email-zhengxing@rock-chips.com> (raw)
In-Reply-To: <1431422797-31903-1-git-send-email-zhengxing@rock-chips.com>

From: zhengxing <zhengxing@rock-chips.com>

Add documentation to the machine driver of the device-tree
bindings for the soundcard of the Rockchip board.

Signed-off-by: zhengxing <zhengxing@rock-chips.com>

---

 .../sound/rockchip,rockchip-audio-machine.txt      |   38 ++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-machine.txt

diff --git a/Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-machine.txt b/Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-machine.txt
new file mode 100644
index 0000000..36864fd
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-machine.txt
@@ -0,0 +1,38 @@
+ROCKCHIP rk3288 audio complex, with AUDIO CODEC
+
+Required properties:
+- (machine) compatible : "rockchip,rockchip-audio-machine"
+- (codec) compatible : The child node name of compatible.
+- rockchip,model : The user-visible name of this sound complex.
+
+- rockchip,i2s-controller : The phandle of the Rockchip I2S controller that's
+  connected to the CODEC.
+- rockchip,audio-codec : The phandle of the audio codec.
+- rockchip,headset-codec : The phandle of the jack detection ic.
+
+Optional properties:
+- rockchip,hp-det-gpios : The GPIO that detect headphones are plugged in
+- rockchip,mic-det-gpios : The GPIO that detect microphones are plugged in
+
+Example:
+
+sound {
+	compatible = "rockchip,rockchip-audio-machine";
+
+	/* child node */
+	sound_rtl {
+		compatible = "rockchip,rockchip-audio-rt5645";
+		rockchip,model = "I2S-RT5650";
+		rockchip,i2s-controller = <&i2s>;
+		rockchip,audio-codec = <&rt5645>;
+	};
+
+	/* child node */
+	sound_maxim {
+		compatible = "rockchip,rockchip-audio-max98090";
+		rockchip,model = "ROCKCHIP-I2S";
+		rockchip,i2s-controller = <&i2s>;
+		rockchip,audio-codec = <&max98090>;
+		rockchip,headset-codec = <&headsetcodec>;
+	};
+};
\ No newline at end of file
-- 
1.7.9.5

  parent reply	other threads:[~2015-05-12  9:31 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-12  9:26 [PATCH 0/4] ASoC: rockchip: add rockchip machine driver Xing Zheng
2015-05-12  9:26 ` Xing Zheng
2015-05-12  9:26 ` [PATCH 1/4] " Xing Zheng
2015-05-12  9:26   ` Xing Zheng
2015-05-12 19:22   ` Mark Brown
2015-05-12 19:22     ` Mark Brown
2015-05-13 13:23     ` zhengxing
2015-05-13 13:23       ` zhengxing
2015-05-13 16:42       ` Mark Brown
2015-05-13 16:42         ` Mark Brown
2015-05-13 17:21         ` Dylan Reid
2015-05-13 17:21           ` Dylan Reid
2015-05-13 23:11           ` Dylan Reid
2015-05-13 23:11             ` Dylan Reid
2015-05-14  2:22             ` zhengxing
2015-05-14  2:22               ` zhengxing
2015-05-15 20:40             ` [alsa-devel] " Lars-Peter Clausen
2015-05-15 20:40               ` Lars-Peter Clausen
2015-05-19 11:16               ` Mark Brown
2015-05-19 11:16                 ` Mark Brown
2015-05-19 11:16                 ` Mark Brown
2015-05-19 16:37                 ` [alsa-devel] " Dylan Reid
2015-05-19 16:37                   ` Dylan Reid
2015-05-21 11:10                   ` Mark Brown
2015-05-21 11:10                     ` Mark Brown
2015-05-12  9:26 ` [PATCH 2/4] ASoC: rockchip: add rockchip machine driver for max98090 Xing Zheng
2015-05-12  9:26   ` Xing Zheng
2015-05-12 19:26   ` Mark Brown
2015-05-12 19:26     ` Mark Brown
2015-05-13 13:23     ` zhengxing
2015-05-13 13:23       ` zhengxing
2015-05-13 16:47       ` Mark Brown
2015-05-13 16:47         ` Mark Brown
2015-05-12  9:26 ` [PATCH 3/4] ASoC: rockchip: add rockchip machine driver for rt5650/rt5645 Xing Zheng
2015-05-12  9:26   ` Xing Zheng
2015-05-12 19:30   ` Mark Brown
2015-05-12 19:30     ` Mark Brown
2015-05-12  9:26 ` Xing Zheng [this message]
2015-05-12  9:26   ` [PATCH 4/4] ASoC: rockchip-audio-machine: add rockchip machine driver bindings Xing Zheng

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1431422797-31903-5-git-send-email-zhengxing@rock-chips.com \
    --to=acgzxing@gmail.com \
    --cc=devicetree@vger.kernel.org \
    --cc=dgreid@chromium.org \
    --cc=dianders@chromium.org \
    --cc=galak@codeaurora.org \
    --cc=heiko@sntech.de \
    --cc=ijc+devicetree@hellion.org.uk \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=mark.rutland@arm.com \
    --cc=pawel.moll@arm.com \
    --cc=robh+dt@kernel.org \
    --cc=sonnyrao@chromium.org \
    --cc=zhengxing@rock-chips.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.