From patchwork Thu Apr 21 11:04:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 66362 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp73284qge; Thu, 21 Apr 2016 04:05:20 -0700 (PDT) X-Received: by 10.98.25.15 with SMTP id 15mr11888336pfz.60.1461236718800; Thu, 21 Apr 2016 04:05:18 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j9si700287paf.186.2016.04.21.04.05.18; Thu, 21 Apr 2016 04:05:18 -0700 (PDT) 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; dkim=pass header.i=@linaro.org; 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; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752331AbcDULFH (ORCPT + 29 others); Thu, 21 Apr 2016 07:05:07 -0400 Received: from mail-wm0-f46.google.com ([74.125.82.46]:38609 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752291AbcDULFB (ORCPT ); Thu, 21 Apr 2016 07:05:01 -0400 Received: by mail-wm0-f46.google.com with SMTP id u206so126284921wme.1 for ; Thu, 21 Apr 2016 04:05:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6Y5arIXWh8dncgpBDpWQVvhPxx8NFZtaAm95k0L6PUA=; b=iKxdoLyUl+vflFcoLJ4ZoYtd/a76V1pEN+wyaNjf81Kxo3VBco7kU9u2meWXr1Ye02 RNU94XLsNrI+s+fFX25ru39RjMnwe6oYucCxoDGFLSh2dHcDmYiJqGdV4c3o6WMri6Dr BQhTsYuM+ZvxKpD9coDRmv3ri+DZlkDYQ8fvI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6Y5arIXWh8dncgpBDpWQVvhPxx8NFZtaAm95k0L6PUA=; b=iIYJDU6CZkI1ENdgRYnJuEbrXv9HRP6B3zWTaqlbFAMQmAYeARGrIalfCuQ4s4hTLM ESINT/ZTvsfxI4rGohcwWGGlL75+njSxPJ3m/Sts1vYzJwrqmYb6+Nak9rBWIw+34AM9 bQyT3Ckhucp7rAKzdnrGGEFz6s/SHxbyz890WQQvy+UyYYhnBIwxQuRb5P1FVY4cpOTG 8ifB7kboh2IOacK521xxQDmwsNakQlnfYNGtDPO8uHn7xpeqAem86kmT1edzcMtuTnFl 1s5UsHvH4C2Gb+GZ/uibsSStPgebh1T1cJwTIVrFntFtcY6YMG9t8V7Pre7QOa1SpkUF WY5A== X-Gm-Message-State: AOPr4FUbutWe/wiYzV60QX1bqFRelXTEP4suNIvH9Ghg+RwXghkk7Sh1/wqE0yJ/IgtoTYz4 X-Received: by 10.28.27.87 with SMTP id b84mr2722078wmb.7.1461236700232; Thu, 21 Apr 2016 04:05:00 -0700 (PDT) Received: from localhost.localdomain (cpc84787-aztw28-2-0-cust15.18-1.cable.virginm.net. [82.37.140.16]) by smtp.gmail.com with ESMTPSA id v143sm9184279wmv.4.2016.04.21.04.04.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Apr 2016 04:04:58 -0700 (PDT) From: Peter Griffin To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, srinivas.kandagatla@gmail.com, maxime.coquelin@st.com, patrice.chotard@st.com, vinod.koul@intel.com Cc: peter.griffin@linaro.org, lee.jones@linaro.org, dmaengine@vger.kernel.org, devicetree@vger.kernel.org, arnd@arndb.de, broonie@kernel.org, ludovic.barre@st.com, arnaud.pouliquen@st.com Subject: [PATCH 10/18] ASoC: sti: Update example to include assigned-clocks and mclk-fs Date: Thu, 21 Apr 2016 12:04:27 +0100 Message-Id: <1461236675-10176-11-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461236675-10176-1-git-send-email-peter.griffin@linaro.org> References: <1461236675-10176-1-git-send-email-peter.griffin@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Update the examples, as otherwise driver errors with an incorrect mclk ratio at runtime. Signed-off-by: Peter Griffin Cc: arnaud.pouliquen@st.com --- Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt | 8 ++++++++ 1 file changed, 8 insertions(+) -- 1.9.1 diff --git a/Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt b/Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt index ef2e0c6..e6ef96a8 100644 --- a/Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt +++ b/Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt @@ -62,6 +62,9 @@ Example: #sound-dai-cells = <0>; st,syscfg = <&syscfg_core>; clocks = <&clk_s_d0_flexgen CLK_PCM_2>; + assigned-clocks = <&clk_s_d0_flexgen CLK_PCM_2>; + assigned-clock-parents = <&clk_s_d0_quadfs 2>; + assigned-clock-rates = <50000000>; reg = <0x8D82000 0x158>; interrupts = ; dmas = <&fdma0 4 0 1>; @@ -78,6 +81,9 @@ Example: #sound-dai-cells = <0>; st,syscfg = <&syscfg_core>; clocks = <&clk_s_d0_flexgen CLK_SPDIFF>; + assigned-clocks = <&clk_s_d0_flexgen CLK_SPDIFF>; + assigned-clock-parents = <&clk_s_d0_quadfs 3>; + assigned-clock-rates = <50000000>; reg = <0x8D85000 0x158>; interrupts = ; dmas = <&fdma0 7 0 1>; @@ -133,6 +139,7 @@ Example of audio card declaration: /* DAC */ format = "i2s"; dai-tdm-slot-width = <32>; + mclk-fs = <256>; cpu { sound-dai = <&sti_uni_player2>; }; @@ -144,6 +151,7 @@ Example of audio card declaration: simple-audio-card,dai-link@1 { /* SPDIF */ format = "left_j"; + mclk-fs = <128>; cpu { sound-dai = <&sti_uni_player3>; };