All of lore.kernel.org
 help / color / mirror / Atom feed
From: Simon Horman <horms+renesas@verge.net.au>
To: linux-renesas-soc@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org,
	Magnus Damm <magnus.damm@gmail.com>,
	Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>,
	Simon Horman <horms+renesas@verge.net.au>
Subject: [PATCH 23/26] ARM: dts: silk: add sound support
Date: Mon, 15 Aug 2016 10:55:42 +0200	[thread overview]
Message-ID: <feb13b95c3fc461bb01ef32cdb818f99d6a859db.1471251169.git.horms+renesas@verge.net.au> (raw)
In-Reply-To: <cover.1471251169.git.horms+renesas@verge.net.au>

From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

Define the SILK board dependent part of the R8A7794 sound  device node.
Add device node for Asahi Kasei AK4643 stereo codec to the I2C1 bus.
Add the "simple-audio-card" device node to interconnect the SoC sound
device  and the codec.

This patch is based on the commit 493b4da7c10c ("ARM: dts: porter: add
sound support").

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7794-silk.dts | 70 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7794-silk.dts b/arch/arm/boot/dts/r8a7794-silk.dts
index cf24f45fff22..cf880ac06f4b 100644
--- a/arch/arm/boot/dts/r8a7794-silk.dts
+++ b/arch/arm/boot/dts/r8a7794-silk.dts
@@ -10,6 +10,17 @@
  * kind, whether express or implied.
  */
 
+/*
+ * SSI-AK4643
+ *
+ * SW1: 2-1: AK4643
+ *      2-3: ADV7511
+ *
+ * This command is required before playback/capture:
+ *
+ *	amixer set "LINEOUT Mixer DACL" on
+ */
+
 /dts-v1/;
 #include "r8a7794.dtsi"
 #include <dt-bindings/gpio/gpio.h>
@@ -119,6 +130,29 @@
 		#clock-cells = <0>;
 		clock-frequency = <74250000>;
 	};
+
+	x9_clk: audio_clock {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <12288000>;
+	};
+
+	sound {
+		compatible = "simple-audio-card";
+
+		simple-audio-card,format = "left_j";
+		simple-audio-card,bitclock-master = <&soundcodec>;
+		simple-audio-card,frame-master = <&soundcodec>;
+
+		simple-audio-card,cpu {
+			sound-dai = <&rcar_sound>;
+		};
+
+		soundcodec: simple-audio-card,codec {
+			sound-dai = <&ak4643>;
+			clocks = <&x9_clk>;
+		};
+	};
 };
 
 &extal_clk {
@@ -193,6 +227,16 @@
 		groups = "du1_rgb666", "du1_sync", "du1_disp", "du1_clk0_out";
 		function = "du1";
 	};
+
+	ssi_pins: sound {
+		groups = "ssi0129_ctrl", "ssi0_data", "ssi1_data";
+		function = "ssi";
+	};
+
+	audio_clk_pins: audio_clk {
+		groups = "audio_clkc";
+		function = "audio_clk";
+	};
 };
 
 &scif2 {
@@ -230,6 +274,12 @@
 	status = "okay";
 	clock-frequency = <400000>;
 
+	ak4643: codec@12 {
+		compatible = "asahi-kasei,ak4643";
+		#sound-dai-cells = <0>;
+		reg = <0x12>;
+	};
+
 	composite-in@20 {
 		compatible = "adi,adv7180";
 		reg = <0x20>;
@@ -392,3 +442,23 @@
 		};
 	};
 };
+
+&rcar_sound {
+	pinctrl-0 = <&ssi_pins &audio_clk_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	/* Single DAI */
+	#sound-dai-cells = <0>;
+
+	rcar_sound,dai {
+		dai0 {
+			playback = <&ssi0>;
+			capture  = <&ssi1>;
+		};
+	};
+};
+
+&ssi1 {
+	shared-pin;
+};
-- 
2.7.0.rc3.207.g0ac5344

WARNING: multiple messages have this Message-ID (diff)
From: horms+renesas@verge.net.au (Simon Horman)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 23/26] ARM: dts: silk: add sound support
Date: Mon, 15 Aug 2016 10:55:42 +0200	[thread overview]
Message-ID: <feb13b95c3fc461bb01ef32cdb818f99d6a859db.1471251169.git.horms+renesas@verge.net.au> (raw)
In-Reply-To: <cover.1471251169.git.horms+renesas@verge.net.au>

From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

Define the SILK board dependent part of the R8A7794 sound  device node.
Add device node for Asahi Kasei AK4643 stereo codec to the I2C1 bus.
Add the "simple-audio-card" device node to interconnect the SoC sound
device  and the codec.

This patch is based on the commit 493b4da7c10c ("ARM: dts: porter: add
sound support").

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a7794-silk.dts | 70 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7794-silk.dts b/arch/arm/boot/dts/r8a7794-silk.dts
index cf24f45fff22..cf880ac06f4b 100644
--- a/arch/arm/boot/dts/r8a7794-silk.dts
+++ b/arch/arm/boot/dts/r8a7794-silk.dts
@@ -10,6 +10,17 @@
  * kind, whether express or implied.
  */
 
+/*
+ * SSI-AK4643
+ *
+ * SW1: 2-1: AK4643
+ *      2-3: ADV7511
+ *
+ * This command is required before playback/capture:
+ *
+ *	amixer set "LINEOUT Mixer DACL" on
+ */
+
 /dts-v1/;
 #include "r8a7794.dtsi"
 #include <dt-bindings/gpio/gpio.h>
@@ -119,6 +130,29 @@
 		#clock-cells = <0>;
 		clock-frequency = <74250000>;
 	};
+
+	x9_clk: audio_clock {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <12288000>;
+	};
+
+	sound {
+		compatible = "simple-audio-card";
+
+		simple-audio-card,format = "left_j";
+		simple-audio-card,bitclock-master = <&soundcodec>;
+		simple-audio-card,frame-master = <&soundcodec>;
+
+		simple-audio-card,cpu {
+			sound-dai = <&rcar_sound>;
+		};
+
+		soundcodec: simple-audio-card,codec {
+			sound-dai = <&ak4643>;
+			clocks = <&x9_clk>;
+		};
+	};
 };
 
 &extal_clk {
@@ -193,6 +227,16 @@
 		groups = "du1_rgb666", "du1_sync", "du1_disp", "du1_clk0_out";
 		function = "du1";
 	};
+
+	ssi_pins: sound {
+		groups = "ssi0129_ctrl", "ssi0_data", "ssi1_data";
+		function = "ssi";
+	};
+
+	audio_clk_pins: audio_clk {
+		groups = "audio_clkc";
+		function = "audio_clk";
+	};
 };
 
 &scif2 {
@@ -230,6 +274,12 @@
 	status = "okay";
 	clock-frequency = <400000>;
 
+	ak4643: codec at 12 {
+		compatible = "asahi-kasei,ak4643";
+		#sound-dai-cells = <0>;
+		reg = <0x12>;
+	};
+
 	composite-in at 20 {
 		compatible = "adi,adv7180";
 		reg = <0x20>;
@@ -392,3 +442,23 @@
 		};
 	};
 };
+
+&rcar_sound {
+	pinctrl-0 = <&ssi_pins &audio_clk_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+
+	/* Single DAI */
+	#sound-dai-cells = <0>;
+
+	rcar_sound,dai {
+		dai0 {
+			playback = <&ssi0>;
+			capture  = <&ssi1>;
+		};
+	};
+};
+
+&ssi1 {
+	shared-pin;
+};
-- 
2.7.0.rc3.207.g0ac5344

  parent reply	other threads:[~2016-08-15  8:56 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-15  8:55 [GIT PULL] Renesas ARM Based SoC DT Updates for v4.9 Simon Horman
2016-08-15  8:55 ` Simon Horman
2016-08-15  8:55 ` [PATCH 01/26] ARM: dts: r8a7792: add PFC support Simon Horman
2016-08-15  8:55   ` Simon Horman
2016-08-15  8:55 ` [PATCH 02/26] ARM: dts: blanche: add SCIF0/3 pins Simon Horman
2016-08-15  8:55   ` Simon Horman
2016-08-15  8:55 ` [PATCH 03/26] ARM: dts: blanche: add Ethernet pins Simon Horman
2016-08-15  8:55   ` Simon Horman
2016-08-15  8:55 ` [PATCH 04/26] ARM: dts: r8a7792: add GPIO clocks Simon Horman
2016-08-15  8:55   ` Simon Horman
2016-08-15  8:55 ` [PATCH 05/26] ARM: dts: r8a7792: add GPIO support Simon Horman
2016-08-15  8:55   ` Simon Horman
2016-08-15  8:55 ` [PATCH 06/26] ARM: dts: r8a7792: add EtherAVB clocks Simon Horman
2016-08-15  8:55   ` Simon Horman
2016-08-15  8:55 ` [PATCH 07/26] ARM: dts: r8a7792: add EtherAVB support Simon Horman
2016-08-15  8:55   ` Simon Horman
2016-08-15  8:55 ` [PATCH 08/26] ARM: dts: r8a7792: add CAN clocks Simon Horman
2016-08-15  8:55   ` Simon Horman
2016-08-15  8:55 ` [PATCH 09/26] ARM: dts: r8a7792: add CAN support Simon Horman
2016-08-15  8:55   ` Simon Horman
2016-08-15  8:55 ` [PATCH 10/26] ARM: dts: blanche: add CAN0 support Simon Horman
2016-08-15  8:55   ` Simon Horman
2016-08-15  8:55 ` [PATCH 11/26] ARM: dts: r8a7794: Correct SDHI register size Simon Horman
2016-08-15  8:55   ` Simon Horman
2016-08-15  8:55 ` [PATCH 12/26] ARM: dts: r8a7792: add SD clocks Simon Horman
2016-08-15  8:55   ` Simon Horman
2016-08-15  8:55 ` [PATCH 13/26] ARM: dts: r8a7792: add SDHI support Simon Horman
2016-08-15  8:55   ` Simon Horman
2016-08-15  8:55 ` [PATCH 14/26] ARM: dts: r8a7792: add I2C clocks Simon Horman
2016-08-15  8:55   ` Simon Horman
2016-08-15  8:55 ` [PATCH 15/26] ARM: dts: r8a7792: add I2C support Simon Horman
2016-08-15  8:55   ` Simon Horman
2016-08-15  8:55 ` [PATCH 16/26] ARM: dts: r8a7792: add VIN clocks Simon Horman
2016-08-15  8:55   ` Simon Horman
2016-08-15  8:55 ` [PATCH 17/26] ARM: dts: r8a7792: add VIN support Simon Horman
2016-08-15  8:55   ` Simon Horman
2016-08-15  8:55 ` [PATCH 18/26] ARM: dts: r8a7794: add audio clocks Simon Horman
2016-08-15  8:55   ` Simon Horman
2016-08-15  8:55 ` [PATCH 19/26] ARM: dts: r8a7794: add MSTP5 clocks Simon Horman
2016-08-15  8:55   ` Simon Horman
2016-08-15 17:56   ` Sergei Shtylyov
2016-08-15 17:56     ` Sergei Shtylyov
2016-08-16  8:12     ` Simon Horman
2016-08-16  8:12       ` Simon Horman
2016-08-15  8:55 ` [PATCH 20/26] ARM: dts: r8a7794: add MSTP10 clocks Simon Horman
2016-08-15  8:55   ` Simon Horman
2016-08-15  8:55 ` [PATCH 21/26] ARM: dts: r8a7794: add Audio-DMAC support Simon Horman
2016-08-15  8:55   ` Simon Horman
2016-08-15  8:55 ` [PATCH 22/26] ARM: dts: r8a7794: add sound support Simon Horman
2016-08-15  8:55   ` Simon Horman
2016-08-15  8:55 ` Simon Horman [this message]
2016-08-15  8:55   ` [PATCH 23/26] ARM: dts: silk: " Simon Horman
2016-08-15  8:55 ` [PATCH 24/26] ARM: dts: r8a7792: fix misindented line Simon Horman
2016-08-15  8:55   ` Simon Horman
2016-08-15  8:55 ` [PATCH 25/26] ARM: dts: r8a7792: add DU clocks Simon Horman
2016-08-15  8:55   ` Simon Horman
2016-08-15  8:55 ` [PATCH 26/26] ARM: dts: r8a7792: add DU support Simon Horman
2016-08-15  8:55   ` Simon Horman
2016-09-13 14:02 ` [GIT PULL] Renesas ARM Based SoC DT Updates for v4.9 Arnd Bergmann
2016-09-13 14:02   ` Arnd Bergmann

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=feb13b95c3fc461bb01ef32cdb818f99d6a859db.1471251169.git.horms+renesas@verge.net.au \
    --to=horms+renesas@verge.net.au \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-renesas-soc@vger.kernel.org \
    --cc=magnus.damm@gmail.com \
    --cc=sergei.shtylyov@cogentembedded.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.