From patchwork Tue Feb 13 13:01:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Katsuhiro Suzuki X-Patchwork-Id: 128230 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4229605ljc; Tue, 13 Feb 2018 05:02:48 -0800 (PST) X-Google-Smtp-Source: AH8x224Ea0oOzFohn2TDJ5YKZI1mbJNBfUtUqVvN5yOP8DCTh07wHusnHuYbsD00ljR0dvzj+Uft X-Received: by 10.101.64.193 with SMTP id u1mr986893pgp.24.1518526968399; Tue, 13 Feb 2018 05:02:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518526968; cv=none; d=google.com; s=arc-20160816; b=wy7IYin41Ez7ED6kENwbmAaadPAIucAC70ygHLWe17xgeIjc/Vb/QiVOZKJ8c5m1iQ v3KoiHuigzIx5XWDZUyVjxQgzXy3qV0+zfqiMSBP/bnT8iOk6MxpEtry40Wd1EJcBU0p VS9YPAkFPjRnGfazgtnpOS+QjpihV0heYRfn+CxCTW55BvjWzd5Unp+Te5ChGdTCx3hd tg812kL/9tyLTegJYQ6x9XvyJAyDu6bkz7mL1fAs5t2rCGwPgO77LFRusq7WFN3u+5+j m7CR19Lg5Q6c7sz1ys+QYqkneF2abxd0KfRuudPHvNG6ua8XP/z416mW0HUx53zw3iCs uKyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=wcGCeDgzd7/Mq2+EUWo7cuB3pKUQlamHTZfmgqhP/6g=; b=K9snQFx8zold4PGWNcHj0mCYVb0XvD2+ugH03GS53hOPBkqk08nJAU0ncsrtOJbLmR vvUBN369D3dDXUFtgUfeQaoSfobG6DfjFsDNiHXE3pElzAjMOkQIQxU0bGnJc/lz9Ik4 UxlpBBGpDCSK4oOaiNrsGp/urnWI7VSPBHRXr/Z7wSz8NS0b6XBpC2XJi8+d67FR8djI Q6o0+OdWTMIz25IyrIUPPyRR1Dm3CLoliOGnfelGZbZQxNe7WZXjs8N2n/uWAJInPw06 bogCdIxm9s3GdyAYibUaFSylwvjDWHjjeQgO7v2g9f1bmYVuqTouIhvxvDG2lKazuUep vcYA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x6si743890pgc.357.2018.02.13.05.02.48; Tue, 13 Feb 2018 05:02:48 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935317AbeBMNCo (ORCPT + 28 others); Tue, 13 Feb 2018 08:02:44 -0500 Received: from mx.socionext.com ([202.248.49.38]:19017 "EHLO mx.socionext.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935118AbeBMNCF (ORCPT ); Tue, 13 Feb 2018 08:02:05 -0500 Received: from unknown (HELO iyokan-ex.css.socionext.com) ([172.31.9.54]) by mx.socionext.com with ESMTP; 13 Feb 2018 22:02:03 +0900 Received: from mail.mfilter.local (m-filter-2 [10.213.24.62]) by iyokan-ex.css.socionext.com (Postfix) with ESMTP id B073A600D0; Tue, 13 Feb 2018 22:02:03 +0900 (JST) Received: from 172.31.9.53 (172.31.9.53) by m-FILTER with ESMTP; Tue, 13 Feb 2018 22:02:34 +0900 Received: from yuzu.css.socionext.com (yuzu [172.31.8.45]) by iyokan.css.socionext.com (Postfix) with ESMTP id 3F48E40372; Tue, 13 Feb 2018 22:02:03 +0900 (JST) Received: from aegis.e01.socionext.com (unknown [10.213.134.210]) by yuzu.css.socionext.com (Postfix) with ESMTP id 166031209D6; Tue, 13 Feb 2018 22:02:03 +0900 (JST) From: Katsuhiro Suzuki To: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Masahiro Yamada Cc: alsa-devel@alsa-project.org, Masami Hiramatsu , Jassi Brar , linux-kernel@vger.kernel.org, Katsuhiro Suzuki Subject: [PATCH v3 1/3] arm64: dts: uniphier: add sound node for UniPhier Date: Tue, 13 Feb 2018 22:01:54 +0900 Message-Id: <20180213130156.27827-2-suzuki.katsuhiro@socionext.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180213130156.27827-1-suzuki.katsuhiro@socionext.com> References: <20180213130156.27827-1-suzuki.katsuhiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds audio controller, codec and simple card node of UniPhier AIO sound system for LD11/20 SoCs. Signed-off-by: Katsuhiro Suzuki --- Changes in v3: - Move sound and spdif-out nodes to root from soc node - Use phandle of endpoint directly instead of port node - Describe connections between AIO and EVEA in *.dtsi because these cores are in inside of SoC --- .../boot/dts/socionext/uniphier-ld11-global.dts | 25 ++++++ arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 92 +++++++++++++++++++++ .../boot/dts/socionext/uniphier-ld20-global.dts | 25 ++++++ arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 96 ++++++++++++++++++++++ 4 files changed, 238 insertions(+) -- 2.15.1 diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts b/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts index 2452b2243f42..fb6bf435dc96 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts +++ b/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts @@ -37,6 +37,27 @@ device_type = "memory"; reg = <0 0x80000000 0 0x40000000>; }; + + sound { + compatible = "audio-graph-card"; + label = "UniPhier LD11"; + widgets = "Headphone", "Headphone Jack"; + + dais = <&i2s_port2 + &i2s_port4 + &spdif_port0>; + }; + + spdif-out { + compatible = "linux,spdif-dit"; + #sound-dai-cells = <0>; + + port@0 { + spdif_tx: endpoint { + remote-endpoint = <&spdif_hiecout1>; + }; + }; + }; }; &serial0 { @@ -72,3 +93,7 @@ &nand { status = "okay"; }; + +&spdif_hiecout1 { + remote-endpoint = <&spdif_tx>; +}; diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi index cd7c2d0a1f64..f4eb1c6353a5 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi +++ b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi @@ -187,6 +187,90 @@ <21 217 3>; }; + audio: audio@56000000 { + compatible = "socionext,uniphier-ld11-aio"; + reg = <0x56000000 0x80000>; + interrupts = <0 144 4>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_aout>; + clock-names = "aio"; + clocks = <&sys_clk 40>; + reset-names = "aio"; + resets = <&sys_rst 40>; + #sound-dai-cells = <1>; + + i2s_port0: port@0 { + i2s_hdmi: endpoint { + }; + }; + + i2s_port1: port@1 { + i2s_pcmin2: endpoint { + }; + }; + + i2s_port2: port@2 { + i2s_line: endpoint { + dai-format = "i2s"; + remote-endpoint = <&evea_line>; + }; + }; + + i2s_port3: port@3 { + i2s_hpcmout1: endpoint { + }; + }; + + i2s_port4: port@4 { + i2s_hp: endpoint { + dai-format = "i2s"; + remote-endpoint = <&evea_hp>; + }; + }; + + spdif_port0: port@5 { + spdif_hiecout1: endpoint { + }; + }; + + src_port0: port@6 { + i2s_epcmout2: endpoint { + }; + }; + + src_port1: port@7 { + i2s_epcmout3: endpoint { + }; + }; + + comp_spdif_port0: port@8 { + comp_spdif_hiecout1: endpoint { + }; + }; + }; + + evea: codec@57900000 { + compatible = "socionext,uniphier-evea"; + reg = <0x57900000 0x1000>; + clock-names = "evea", "exiv"; + clocks = <&sys_clk 41>, <&sys_clk 42>; + reset-names = "evea", "exiv", "adamv"; + resets = <&sys_rst 41>, <&sys_rst 42>, <&adamv_rst 0>; + #sound-dai-cells = <1>; + + evea_line_port: port@0 { + evea_line: endpoint { + remote-endpoint = <&i2s_line>; + }; + }; + + evea_hp_port: port@1 { + evea_hp: endpoint { + remote-endpoint = <&i2s_hp>; + }; + }; + }; + adamv@57920000 { compatible = "socionext,uniphier-ld11-adamv", "simple-mfd", "syscon"; @@ -475,3 +559,11 @@ }; #include "uniphier-pinctrl.dtsi" + +&pinctrl_aout { + drive-strength = <4>; /* default: 4mA */ + group_1 { + pins = "AO1ARC"; + drive-strength = <8>; /* 8mA */ + }; +}; diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts index fc2bc9d75d35..2d49163cfde4 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts @@ -37,6 +37,27 @@ device_type = "memory"; reg = <0 0x80000000 0 0xc0000000>; }; + + sound { + compatible = "audio-graph-card"; + label = "UniPhier LD20"; + widgets = "Headphone", "Headphone Jack"; + + dais = <&i2s_port2 + &i2s_port4 + &spdif_port0>; + }; + + spdif-out { + compatible = "linux,spdif-dit"; + #sound-dai-cells = <0>; + + port@0 { + spdif_tx: endpoint { + remote-endpoint = <&spdif_hiecout1>; + }; + }; + }; }; &serial0 { @@ -54,3 +75,7 @@ &nand { status = "okay"; }; + +&spdif_hiecout1 { + remote-endpoint = <&spdif_tx>; +}; diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi index 8a3276ba2da1..9d0f23f100df 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi @@ -287,6 +287,90 @@ <21 217 3>; }; + audio: audio@56000000 { + compatible = "socionext,uniphier-ld20-aio"; + reg = <0x56000000 0x80000>; + interrupts = <0 144 4>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_aout>; + clock-names = "aio"; + clocks = <&sys_clk 40>; + reset-names = "aio"; + resets = <&sys_rst 40>; + #sound-dai-cells = <1>; + + i2s_port0: port@0 { + i2s_hdmi: endpoint { + }; + }; + + i2s_port1: port@1 { + i2s_pcmin2: endpoint { + }; + }; + + i2s_port2: port@2 { + i2s_line: endpoint { + dai-format = "i2s"; + remote-endpoint = <&evea_line>; + }; + }; + + i2s_port3: port@3 { + i2s_hpcmout1: endpoint { + }; + }; + + i2s_port4: port@4 { + i2s_hp: endpoint { + dai-format = "i2s"; + remote-endpoint = <&evea_hp>; + }; + }; + + spdif_port0: port@5 { + spdif_hiecout1: endpoint { + }; + }; + + src_port0: port@6 { + i2s_epcmout2: endpoint { + }; + }; + + src_port1: port@7 { + i2s_epcmout3: endpoint { + }; + }; + + comp_spdif_port0: port@8 { + comp_spdif_hiecout1: endpoint { + }; + }; + }; + + evea: codec@57900000 { + compatible = "socionext,uniphier-evea"; + reg = <0x57900000 0x1000>; + clock-names = "evea", "exiv"; + clocks = <&sys_clk 41>, <&sys_clk 42>; + reset-names = "evea", "exiv", "adamv"; + resets = <&sys_rst 41>, <&sys_rst 42>, <&adamv_rst 0>; + #sound-dai-cells = <1>; + + evea_line_port: port@0 { + evea_line: endpoint { + remote-endpoint = <&i2s_line>; + }; + }; + + evea_hp_port: port@1 { + evea_hp: endpoint { + remote-endpoint = <&i2s_hp>; + }; + }; + }; + adamv@57920000 { compatible = "socionext,uniphier-ld20-adamv", "simple-mfd", "syscon"; @@ -528,3 +612,15 @@ }; #include "uniphier-pinctrl.dtsi" + +&pinctrl_aout { + drive-strength = <4>; /* default: 3.5mA */ + group_1 { + pins = "AO1DACCK"; + drive-strength = <5>; /* 5mA */ + }; + group_2 { + pins = "AO1ARC"; + drive-strength = <11>; /* 11mA */ + }; +}; From patchwork Tue Feb 13 13:01:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Katsuhiro Suzuki X-Patchwork-Id: 128228 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4228838ljc; Tue, 13 Feb 2018 05:02:12 -0800 (PST) X-Google-Smtp-Source: AH8x2276Ksz8iT4E0SuTCuCtU9V4Zyfa7KecjRzVV81ObF7xnD77VY2lwIpoYx5nAVdrNdX5K9QX X-Received: by 10.99.157.193 with SMTP id i184mr943262pgd.197.1518526932506; Tue, 13 Feb 2018 05:02:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518526932; cv=none; d=google.com; s=arc-20160816; b=hve9B5ucTDBwbJ2DHggFhd5P6LEvVXirvPskJ+JajgIYaGzCtpDuCMFXpIkHz2zu8G LYkBkm5RlCZxHFu5X8x6ogx9aK+ZrBJmshAAxqDW8Mxg0eqlirLdcUOubVdresu5G/LU N7yzMa//ckdtYsk/diCT2bzGMh/J8o4gew48hZDM8LbDduhbAg6KXJL2hGCiIRo8TkF7 oRszkeFvp3XMeFrc+3CUYYsRVWOiglYfsiIg6e5c0QEa4UtKFuVLMxbY2CcyxTnPAR+v eujTGpPsIlt0dPKvRX2wOCylBeBJDUFRwBSwGU/n6yd778zqCkAIkBRzHVJNqVJFN7Al D9HA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=i+gIJIBl+rAcl0j0EVcoHLXFBvB1Ffk3ZdBr9qElL24=; b=m1KqSxgKmVfPpmiu0qTgU/XTajS+wRpIbmVtQ384HmTjpvrUEa/7A1a8OCNsocfzTG eb4hncT6GwR2ZuupCxQFPdAFawOA/oe6CAVRO1pgL9/JE2IZsOO+Bl/HHuRsBBfYgI17 PJoLu1HIJ74GHMhm9UeYn0GID3Ytk6kNgR/76Mt0cmFf2x/aoa3EjJiQzBXDQMBtiupx afxI5LDxsKDjQbcQuRI7gG4aCiT/y51TsZFRIumEoL0D5uOwkLsxu2kGnvyBq3P8qsXE 6Wptm+Kd30vK/sL4eNAoocsSrzO3XOwTAsl6k78YdwqvEIuskjvAI3aTFf3a2Htds0eh mfhQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g9-v6si1314882pli.410.2018.02.13.05.02.10; Tue, 13 Feb 2018 05:02:12 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935261AbeBMNCH (ORCPT + 28 others); Tue, 13 Feb 2018 08:02:07 -0500 Received: from mx.socionext.com ([202.248.49.38]:19014 "EHLO mx.socionext.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935119AbeBMNCF (ORCPT ); Tue, 13 Feb 2018 08:02:05 -0500 Received: from unknown (HELO iyokan-ex.css.socionext.com) ([172.31.9.54]) by mx.socionext.com with ESMTP; 13 Feb 2018 22:02:03 +0900 Received: from mail.mfilter.local (m-filter-1 [10.213.24.61]) by iyokan-ex.css.socionext.com (Postfix) with ESMTP id B2027616E9; Tue, 13 Feb 2018 22:02:03 +0900 (JST) Received: from 172.31.9.51 (172.31.9.51) by m-FILTER with ESMTP; Tue, 13 Feb 2018 22:02:25 +0900 Received: from yuzu.css.socionext.com (yuzu [172.31.8.45]) by kinkan.css.socionext.com (Postfix) with ESMTP id 6D3B51A0DEC; Tue, 13 Feb 2018 22:02:03 +0900 (JST) Received: from aegis.e01.socionext.com (unknown [10.213.134.210]) by yuzu.css.socionext.com (Postfix) with ESMTP id 447D41209D6; Tue, 13 Feb 2018 22:02:03 +0900 (JST) From: Katsuhiro Suzuki To: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Masahiro Yamada Cc: alsa-devel@alsa-project.org, Masami Hiramatsu , Jassi Brar , linux-kernel@vger.kernel.org, Katsuhiro Suzuki Subject: [PATCH v3 2/3] arm64: dts: uniphier: add speaker out for UniPhier LD11/LD20 boards Date: Tue, 13 Feb 2018 22:01:55 +0900 Message-Id: <20180213130156.27827-3-suzuki.katsuhiro@socionext.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180213130156.27827-1-suzuki.katsuhiro@socionext.com> References: <20180213130156.27827-1-suzuki.katsuhiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds codec node for TI TAS571x on UniPhier LD11/20 global boards. And adds settings of AIO for speaker out. Signed-off-by: Katsuhiro Suzuki --- Changes in v3: - Use phandle of endpoint directly instead of port node --- .../boot/dts/socionext/uniphier-ld11-global.dts | 21 +++++++++++++++++++++ .../boot/dts/socionext/uniphier-ld20-global.dts | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+) -- 2.15.1 diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts b/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts index fb6bf435dc96..f057ee80f38e 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts +++ b/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts @@ -10,6 +10,7 @@ /dts-v1/; #include "uniphier-ld11.dtsi" +#include "dt-bindings/gpio/uniphier-gpio.h" / { model = "UniPhier LD11 Global Board (REF_LD11_GP)"; @@ -44,6 +45,7 @@ widgets = "Headphone", "Headphone Jack"; dais = <&i2s_port2 + &i2s_port3 &i2s_port4 &spdif_port0>; }; @@ -71,6 +73,20 @@ &i2c0 { status = "okay"; + tas5707a@1d { + compatible = "ti,tas5711"; + reg = <0x1d>; + reset-gpios = <&gpio UNIPHIER_GPIO_PORT(23, 4) GPIO_ACTIVE_LOW>; + pdn-gpios = <&gpio UNIPHIER_GPIO_PORT(23, 5) GPIO_ACTIVE_LOW>; + #sound-dai-cells = <0>; + + port@0 { + tas_speaker: endpoint { + remote-endpoint = <&i2s_hpcmout1>; + }; + }; + }; + eeprom@50 { compatible = "st,24c64", "atmel,24c64"; reg = <0x50>; @@ -94,6 +110,11 @@ status = "okay"; }; +&i2s_hpcmout1 { + dai-format = "i2s"; + remote-endpoint = <&tas_speaker>; +}; + &spdif_hiecout1 { remote-endpoint = <&spdif_tx>; }; diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts index 2d49163cfde4..b2e197bc968c 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts @@ -10,6 +10,7 @@ /dts-v1/; #include "uniphier-ld20.dtsi" +#include "dt-bindings/gpio/uniphier-gpio.h" / { model = "UniPhier LD20 Global Board (REF_LD20_GP)"; @@ -44,6 +45,7 @@ widgets = "Headphone", "Headphone Jack"; dais = <&i2s_port2 + &i2s_port3 &i2s_port4 &spdif_port0>; }; @@ -70,12 +72,31 @@ &i2c0 { status = "okay"; + + tas5707@1b { + compatible = "ti,tas5711"; + reg = <0x1b>; + reset-gpios = <&gpio UNIPHIER_GPIO_PORT(0, 0) GPIO_ACTIVE_LOW>; + pdn-gpios = <&gpio UNIPHIER_GPIO_PORT(0, 1) GPIO_ACTIVE_LOW>; + #sound-dai-cells = <0>; + + port@0 { + tas_speaker: endpoint { + remote-endpoint = <&i2s_hpcmout1>; + }; + }; + }; }; &nand { status = "okay"; }; +&i2s_hpcmout1 { + dai-format = "i2s"; + remote-endpoint = <&tas_speaker>; +}; + &spdif_hiecout1 { remote-endpoint = <&spdif_tx>; }; From patchwork Tue Feb 13 13:01:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Katsuhiro Suzuki X-Patchwork-Id: 128229 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp4229290ljc; Tue, 13 Feb 2018 05:02:32 -0800 (PST) X-Google-Smtp-Source: AH8x226e7tW+4vnialo2OKYuXA3C/ji0jglWogEbsPYpejCLyx+5tCmiMWhllGkETgckrDU9DJi9 X-Received: by 2002:a17:902:5a1:: with SMTP id f30-v6mr1102804plf.124.1518526952298; Tue, 13 Feb 2018 05:02:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518526952; cv=none; d=google.com; s=arc-20160816; b=XWGwCmqMuhmXEZ/H8UiVnLMAPRt+xk2GRU3HTfkahtWGb+SHrksf0DWOsperOMN3uS xrnjKbXCs2Gx5cQ8xa9J7b+7g1ATwfY21GgY4vVsKsc5eifVzz3daZd6aV5mNl6t3AMK hx7b/WOHGWnpVg+l2Qnqz4UTLu2uoE+8v/f6u6YD2AMps5sLqecyUp+lV4dY2R7VoukI Z76kml+40AGkRalfCOBv98tvRFwq4jQqgR3dO/+dXa8ZgwmlFwyVoKW00Qf/qAGpr54L gZTxJNQYN6dDkVg6hwYnx7XgRX3KVspmiujQOFwXBojSvSCD0/pPdi5AHg7Wmc+yGGS+ FC2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=AHTRnYPJgB//eua0a/nZke+O5vjYvWoXoO9Fhf4E5ls=; b=LPiVee7x7OIMf5eGkXvpdyk+lWtdwiQGLwj/+dYgkUur+RIF3QdMGUjvl3E0QTVC7X 7j00K65I9Ch1Z+j3BuEv2kEJEphCn2a5FRfRC4LIrsC91yg890s6Jtffc0h/tN0epS6g 38zOvpXq0/hs4mRye/UWeVYNG3X+sOQkwtqYvcLVq6UAw2XMRKLViVKSaGNOKyOjjFid Uo0qbQvF3TFeJmNAYdAlHLD2LQZihXE62Z9oLXWInkG8d/xQjo2NvyJvShnvpHW/0JnT IRjIwibXuhaiNcz+rZXpnMkyX5NWM9E1uHkuH3vEni1Kcd+2Lm/a8MsWZyeEf6XqNAAh JW3g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k11-v6si1477608pls.294.2018.02.13.05.02.29; Tue, 13 Feb 2018 05:02:32 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935281AbeBMNCZ (ORCPT + 28 others); Tue, 13 Feb 2018 08:02:25 -0500 Received: from mx.socionext.com ([202.248.49.38]:19017 "EHLO mx.socionext.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935187AbeBMNCG (ORCPT ); Tue, 13 Feb 2018 08:02:06 -0500 Received: from unknown (HELO kinkan-ex.css.socionext.com) ([172.31.9.52]) by mx.socionext.com with ESMTP; 13 Feb 2018 22:02:04 +0900 Received: from mail.mfilter.local (m-filter-1 [10.213.24.61]) by kinkan-ex.css.socionext.com (Postfix) with ESMTP id 37297180B65; Tue, 13 Feb 2018 22:02:04 +0900 (JST) Received: from 172.31.9.51 (172.31.9.51) by m-FILTER with ESMTP; Tue, 13 Feb 2018 22:02:26 +0900 Received: from yuzu.css.socionext.com (yuzu [172.31.8.45]) by kinkan.css.socionext.com (Postfix) with ESMTP id 9B17D1A0DEC; Tue, 13 Feb 2018 22:02:03 +0900 (JST) Received: from aegis.e01.socionext.com (unknown [10.213.134.210]) by yuzu.css.socionext.com (Postfix) with ESMTP id 723CD1209D6; Tue, 13 Feb 2018 22:02:03 +0900 (JST) From: Katsuhiro Suzuki To: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Masahiro Yamada Cc: alsa-devel@alsa-project.org, Masami Hiramatsu , Jassi Brar , linux-kernel@vger.kernel.org, Katsuhiro Suzuki Subject: [PATCH v3 3/3] arm64: dts: uniphier: add compress audio out for UniPhier LD11/LD20 Date: Tue, 13 Feb 2018 22:01:56 +0900 Message-Id: <20180213130156.27827-4-suzuki.katsuhiro@socionext.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180213130156.27827-1-suzuki.katsuhiro@socionext.com> References: <20180213130156.27827-1-suzuki.katsuhiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds compress audio node for S/PDIF on UniPhier LD11/20 global boards. And adds settings of AIO for it. Signed-off-by: Katsuhiro Suzuki --- Changes in v3: - Move comp-spdif-out node to root from soc node - Use phandle of endpoint directly instead of port node --- arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts | 18 +++++++++++++++++- arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts | 18 +++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) -- 2.15.1 diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts b/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts index f057ee80f38e..875d05b1356e 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts +++ b/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts @@ -47,7 +47,8 @@ dais = <&i2s_port2 &i2s_port3 &i2s_port4 - &spdif_port0>; + &spdif_port0 + &comp_spdif_port0>; }; spdif-out { @@ -60,6 +61,17 @@ }; }; }; + + comp-spdif-out { + compatible = "linux,spdif-dit"; + #sound-dai-cells = <0>; + + port@0 { + comp_spdif_tx: endpoint { + remote-endpoint = <&comp_spdif_hiecout1>; + }; + }; + }; }; &serial0 { @@ -118,3 +130,7 @@ &spdif_hiecout1 { remote-endpoint = <&spdif_tx>; }; + +&comp_spdif_hiecout1 { + remote-endpoint = <&comp_spdif_tx>; +}; diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts index b2e197bc968c..34537f9dce82 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts @@ -47,7 +47,8 @@ dais = <&i2s_port2 &i2s_port3 &i2s_port4 - &spdif_port0>; + &spdif_port0 + &comp_spdif_port0>; }; spdif-out { @@ -60,6 +61,17 @@ }; }; }; + + comp-spdif-out { + compatible = "linux,spdif-dit"; + #sound-dai-cells = <0>; + + port@0 { + comp_spdif_tx: endpoint { + remote-endpoint = <&comp_spdif_hiecout1>; + }; + }; + }; }; &serial0 { @@ -100,3 +112,7 @@ &spdif_hiecout1 { remote-endpoint = <&spdif_tx>; }; + +&comp_spdif_hiecout1 { + remote-endpoint = <&comp_spdif_tx>; +};