From patchwork Wed Mar 14 05:26:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Katsuhiro Suzuki X-Patchwork-Id: 131545 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp425236ljb; Tue, 13 Mar 2018 22:27:04 -0700 (PDT) X-Google-Smtp-Source: AG47ELt5w9lMJ+OYF2L9wrFPehMQuBPh1UaKE9irw2NhIUpQRB/y241eNr+uokOsvocpUEwVGl2g X-Received: by 2002:a17:902:904b:: with SMTP id w11-v6mr2909579plz.11.1521005224252; Tue, 13 Mar 2018 22:27:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521005224; cv=none; d=google.com; s=arc-20160816; b=BaiAQQ0gje8qrJB5NQxFIMMNjbkLzPCBiFfnahXPfWBpXnEh0GB00X4MJZMpCthNX9 VEJQbQxbtHlY3Pq/sy29TP/TepBSEiogD971/bjLcQOx5Sxa4+iwGbGOq0N8f9/YmDN5 SL+lHHXKEPGpsrCGkvkktSGnsEVxxsv+/6D05d14PB10SQSP1hRytisEiAjmYz8g7iFl w62J7l3QU4nh8c+Zk4r00jbdpvhfwCcWAYjYuSYBqfr40GfVIJrjiLhi8QsgJk/0iP6w 6N+19gYqkRgf25cRLmi4I+u0m0jE4P44gSGkg8VOcO6RrJmTApJ8EhtHkugDwf7rFWCB rxDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=Hco266rJ9Bk3plbfGx4PQt8k+zlnWwBsmS23eUpMdHU=; b=OEXhkDO8xy2I01ytnezbXQC1bonmED84eAqlxdw8N5PFa1siyjWGThCpSFcr2Y0mOp 6ucSaxwYCxSsqYqPRggpMEMLPjlf5zzW3H3WZnREGTJcsEUR9nl0hbDHKTaNl+4eaU05 RTlum6T+KPcVnGrFoQZTtTCtO25NzS0iafLMcDCTCiXX6h345j6nULxhMyX6YWFwsItc NiUmQ7dilsd8jDGDnopXNKllik1Tru9V+ry4ESlz9rvL4Vvq1nFA1PsHyxosrbEq5EN/ o0p2cpLtPPMouF7aqGh6PfJt1ufRosPVRb80Gok/vTCfy3ZqG9VZQyQgOUso8N1K0SrR Px2Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-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 y92-v6si1382910plb.213.2018.03.13.22.27.04; Tue, 13 Mar 2018 22:27:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-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 devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750852AbeCNF1C (ORCPT + 6 others); Wed, 14 Mar 2018 01:27:02 -0400 Received: from mx.socionext.com ([202.248.49.38]:50588 "EHLO mx.socionext.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750816AbeCNF1C (ORCPT ); Wed, 14 Mar 2018 01:27:02 -0400 Received: from unknown (HELO kinkan-ex.css.socionext.com) ([172.31.9.52]) by mx.socionext.com with ESMTP; 14 Mar 2018 14:27:00 +0900 Received: from mail.mfilter.local (m-filter-2 [10.213.24.62]) by kinkan-ex.css.socionext.com (Postfix) with ESMTP id C7C70180230; Wed, 14 Mar 2018 14:27:00 +0900 (JST) Received: from 172.31.9.51 (172.31.9.51) by m-FILTER with ESMTP; Wed, 14 Mar 2018 14:28:00 +0900 Received: from yuzu.css.socionext.com (yuzu [172.31.8.45]) by kinkan.css.socionext.com (Postfix) with ESMTP id 5AE621A15BF; Wed, 14 Mar 2018 14:27:00 +0900 (JST) Received: from aegis.e01.socionext.com (unknown [10.213.134.210]) by yuzu.css.socionext.com (Postfix) with ESMTP id 359CE12042A; Wed, 14 Mar 2018 14:27:00 +0900 (JST) From: Katsuhiro Suzuki To: linux-arm-kernel@lists.infradead.org, Masahiro Yamada , devicetree@vger.kernel.org Cc: Masami Hiramatsu , Jassi Brar , linux-kernel@vger.kernel.org, Katsuhiro Suzuki Subject: [PATCH] ARM: dts: uniphier: add sound node for UniPhier PXs2 Date: Wed, 14 Mar 2018 14:26:58 +0900 Message-Id: <20180314052658.6244-1-suzuki.katsuhiro@socionext.com> X-Mailer: git-send-email 2.16.1 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This patch adds audio controller, external codec and simple card node of UniPhier AIO sound system for PXs2 SoCs. Signed-off-by: Katsuhiro Suzuki --- arch/arm/boot/dts/uniphier-pxs2-gentil.dts | 24 +++++++++++++ arch/arm/boot/dts/uniphier-pxs2-vodka.dts | 37 ++++++++++++++++++++ arch/arm/boot/dts/uniphier-pxs2.dtsi | 54 ++++++++++++++++++++++++++++++ 3 files changed, 115 insertions(+) -- 2.16.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts index d09acb8e59a1..782962749bbf 100644 --- a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts +++ b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts @@ -34,6 +34,12 @@ device_type = "memory"; reg = <0x80000000 0x80000000>; }; + + sound { + compatible = "audio-graph-card"; + label = "UniPhier PXs2"; + dais = <&i2s_port2>; + }; }; &serial2 { @@ -52,6 +58,19 @@ &i2c2 { status = "okay"; + + wm8960@1a { + compatible = "wlf,wm8960"; + reg = <0x1a>; + #sound-dai-cells = <0>; + + port@0 { + wm_speaker: endpoint { + dai-format = "i2s"; + remote-endpoint = <&i2s_aux>; + }; + }; + }; }; ð { @@ -64,3 +83,8 @@ reg = <1>; }; }; + +&i2s_aux { + dai-format = "i2s"; + remote-endpoint = <&wm_speaker>; +}; diff --git a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts index 6f13a25b935f..33bcd98c8653 100644 --- a/arch/arm/boot/dts/uniphier-pxs2-vodka.dts +++ b/arch/arm/boot/dts/uniphier-pxs2-vodka.dts @@ -32,6 +32,35 @@ device_type = "memory"; reg = <0x80000000 0x80000000>; }; + + sound { + compatible = "audio-graph-card"; + label = "UniPhier PXs2"; + dais = <&spdif_port0 + &comp_spdif_port0>; + }; + + spdif-out { + compatible = "linux,spdif-dit"; + #sound-dai-cells = <0>; + + port@0 { + spdif_tx: endpoint { + remote-endpoint = <&spdif_hiecout1>; + }; + }; + }; + + comp-spdif-out { + compatible = "linux,spdif-dit"; + #sound-dai-cells = <0>; + + port@0 { + comp_spdif_tx: endpoint { + remote-endpoint = <&comp_spdif_hiecout1>; + }; + }; + }; }; &serial2 { @@ -52,3 +81,11 @@ reg = <1>; }; }; + +&spdif_hiecout1 { + remote-endpoint = <&spdif_tx>; +}; + +&comp_spdif_hiecout1 { + remote-endpoint = <&comp_spdif_tx>; +}; diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi index 18f336e64036..d64ca9d0aef1 100644 --- a/arch/arm/boot/dts/uniphier-pxs2.dtsi +++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi @@ -227,6 +227,60 @@ <21 217 3>; }; + audio@56000000 { + compatible = "socionext,uniphier-pxs2-aio"; + reg = <0x56000000 0x80000>; + interrupts = <0 144 4>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ain1>, + <&pinctrl_ain2>, + <&pinctrl_ainiec1>, + <&pinctrl_aout2>, + <&pinctrl_aout3>, + <&pinctrl_aoutiec1>, + <&pinctrl_aoutiec2>; + 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_line: endpoint { + }; + }; + + i2s_port2: port@2 { + i2s_aux: endpoint { + }; + }; + + spdif_port0: port@3 { + spdif_hiecout1: endpoint { + }; + }; + + spdif_port1: port@4 { + spdif_iecout1: endpoint { + }; + }; + + comp_spdif_port0: port@5 { + comp_spdif_hiecout1: endpoint { + }; + }; + + comp_spdif_port1: port@6 { + comp_spdif_iecout1: endpoint { + }; + }; + }; + i2c0: i2c@58780000 { compatible = "socionext,uniphier-fi2c"; status = "disabled";