From patchwork Fri Feb 12 19:05:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 8295761 Return-Path: X-Original-To: patchwork-linux-renesas-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4CB409F1E0 for ; Fri, 12 Feb 2016 19:07:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3819C20225 for ; Fri, 12 Feb 2016 19:07:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6E2522025B for ; Fri, 12 Feb 2016 19:07:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751065AbcBLTG6 (ORCPT ); Fri, 12 Feb 2016 14:06:58 -0500 Received: from kirsty.vergenet.net ([202.4.237.240]:41775 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751056AbcBLTG6 (ORCPT ); Fri, 12 Feb 2016 14:06:58 -0500 Received: from penelope.kanocho.kobe.vergenet.net (128-47-71-217.dyn.estpak.ee [217.71.47.128]) by kirsty.vergenet.net (Postfix) with ESMTPSA id 0798A25BEB4; Sat, 13 Feb 2016 06:06:34 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1455303994; bh=7VhCopXWQMMyzP7fuO0g3smwtAyfs4rW5uZkGPEcnZ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TH6LFEH/RyKpKYUkcg38+iwBdFd+QM7rvjKKBtyPGi90+wIB+behAm9Pi9UFSVf8L YbL9RNa8SFt1hYq9K7LtB15FH/9RwPllWl0QLR8VmwMozLgoJec3F4ugxMnO3bJVHn OrLnfsN2N0x0+TcciAWrzgF+cmH0xsGpKj6DcOBk= Received: by penelope.kanocho.kobe.vergenet.net (Postfix, from userid 7100) id D92DD610C4; Sat, 13 Feb 2016 06:06:10 +1100 (AEDT) From: Simon Horman To: linux-renesas-soc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Magnus Damm , Simon Horman Subject: [PATCH 30/68] ARM: dts: gose: Enable sound PIO support in device tree Date: Fri, 12 Feb 2016 20:05:20 +0100 Message-Id: X-Mailer: git-send-email 2.7.0.rc3.207.g0ac5344 In-Reply-To: References: Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Enable sound PIO support in the r8a7793/gose device tree. Based on similar work for the r8a7791/koelsch by Kuninori Morimoto. Cc: Kuninori Morimoto Acked-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- arch/arm/boot/dts/r8a7793-gose.dts | 77 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts index 0b4cc8d99390..395ea63746ac 100644 --- a/arch/arm/boot/dts/r8a7793-gose.dts +++ b/arch/arm/boot/dts/r8a7793-gose.dts @@ -8,6 +8,17 @@ * kind, whether express or implied. */ +/* + * SSI-AK4643 + * + * SW1: 1: AK4643 + * 2: CN22 + * 3: ADV7511 + * + * This command is required when Playback/Capture + * + * amixer set "LINEOUT Mixer DACL" on + */ /dts-v1/; #include "r8a7793.dtsi" #include @@ -130,6 +141,30 @@ }; }; + audio_clock: clock { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <11289600>; + clock-output-names = "audio_clock"; + }; + + rsnd_ak4643: sound { + compatible = "simple-audio-card"; + + simple-audio-card,format = "left_j"; + simple-audio-card,bitclock-master = <&sndcodec>; + simple-audio-card,frame-master = <&sndcodec>; + + sndcpu: simple-audio-card,cpu { + sound-dai = <&rcar_sound>; + }; + + sndcodec: simple-audio-card,codec { + sound-dai = <&ak4643>; + clocks = <&audio_clock>; + }; + }; + hdmi-out { compatible = "hdmi-connector"; type = "a"; @@ -218,6 +253,16 @@ renesas,groups = "qspi_ctrl", "qspi_data4"; renesas,function = "qspi"; }; + + sound_pins: sound { + renesas,groups = "ssi0129_ctrl", "ssi0_data", "ssi1_data"; + renesas,function = "ssi"; + }; + + sound_clk_pins: sound_clk { + renesas,groups = "audio_clk_a"; + renesas,function = "audio_clk"; + }; }; ðer { @@ -300,6 +345,12 @@ status = "okay"; clock-frequency = <100000>; + ak4643: codec@12 { + compatible = "asahi-kasei,ak4643"; + #sound-dai-cells = <0>; + reg = <0x12>; + }; + hdmi@39 { compatible = "adi,adv7511w"; reg = <0x39>; @@ -338,3 +389,29 @@ pagesize = <16>; }; }; + +&rcar_sound { + pinctrl-0 = <&sound_pins &sound_clk_pins>; + pinctrl-names = "default"; + + /* Single DAI */ + #sound-dai-cells = <0>; + + status = "okay"; + + rcar_sound,dai { + dai0 { + playback = <&ssi0>; + capture = <&ssi1>; + }; + }; +}; + +&ssi0 { + pio-transfer; +}; + +&ssi1 { + pio-transfer; + shared-pin; +};