From patchwork Sun Nov 26 17:25:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 10075455 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B9BA860353 for ; Sun, 26 Nov 2017 17:26:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B38528801 for ; Sun, 26 Nov 2017 17:26:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F45928BA5; Sun, 26 Nov 2017 17:26:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4A40D28801 for ; Sun, 26 Nov 2017 17:26:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=FKWc+23gLiZeQIHygs8ah/qhhemWkgS3WNSV7acBZ6o=; b=S6Y 7yVnmcz94IXncblYnKXyUwV1+dyvPztT10V8JYELw8UtDv3XAEC2pGMVTvKSK55dSO+5Hdd2VbiSm OFJW7CKnhCL9D1B8klmkkaOfUFZNhFFLLxLZ5RljqI8SHK+ZhZGhFEDiUPHlHsHDaaZzY6b9v8mx4 uiJU1H3EI0DenutDB3IGcHEqehTDYfrcdG4q8EmU55iR49JWLZs85HGspKaZHwYA3yJLmb/G0uGuS EvYa+3AfZG0nZzTavslH97ZtULq72PE/qZRQ0XNTfWBRztSjf6F8IbrfNTv80iTXo960kSH4t/V2r ov+of5sVv/QN2QEAkNw9LfycNxrK+AA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eJ0hM-00039a-14; Sun, 26 Nov 2017 17:26:32 +0000 Received: from mout.kundenserver.de ([212.227.126.187]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eJ0hG-00037h-V7; Sun, 26 Nov 2017 17:26:30 +0000 Received: from localhost.localdomain ([95.90.209.138]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LyeIB-1fEmPT1pTj-0164w8; Sun, 26 Nov 2017 18:25:48 +0100 From: Stefan Wahren To: Liam Girdwood , Mark Brown , Eric Anholt , Florian Fainelli , Rob Herring , Mark Rutland , kernel@martin.sperl.org, Matthias Reichl , phil@raspberrypi.org Subject: [PATCH V2] ARM: dts: bcm283x: Fix probing of bcm2835-i2s Date: Sun, 26 Nov 2017 18:25:11 +0100 Message-Id: <1511717111-6055-1-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.7.4 X-Provags-ID: V03:K0:sChSX66YjHDUtL4OIm6/6/XttXg4aKhC5QXs16i0I6QRujSaQKZ AchYkq1zkOD+gCdSyzaC7KuyLvlFnYTI4RH8bJzaTjh9XSCrKqX00fTXCGL2wQjF08uRhvv f2C6YrbTw9llD2N95c2HtJHxXkNFPljTs4on/O0Xi35FqPZ/6G6sdcQCEs0hid80EvgRb6a 84qCdnPINBzUDtzh3hTiw== X-UI-Out-Filterresults: notjunk:1; V01:K0:BmqgKHNOm3Q=:mS2f9Y/5hCTCtCOsHFAkEn hwFWWi9Zg91jZA3HLInIWh3s4cttCDDKgM8Qd8Z8J74Pbb3Fnz6n7rxAdyMINweT/EvDnMjs6 4SFw5MS4lM1GWd5IwUh7z7/+78utK4lgNK5yh85Ps9CCooZPGgRSY/Y0aK/LYpJOQkq7OZt1b VQJJPtGWhFrMFOe9FMEvQOJko9e8XGOfGWKspPagcS2TMTZkznqhsx67N+/buDNuQ8vhxDwlw b0JV9eYNL7SKlK4adPXZ2jPO2Zd/JEujoUy9qntyWfg/SqyrvpVavMYeIMcip1TFH1PFqWKnt WeSffhnqD+GcnPIUdV4uQ4L4hEaHGvm16pUAP/WnkUQIKQUs2tCy/vDTd0+6GJCXrvdtQ2/Ic jq+9OlLEYLS+MkNZFtIbb+qoL8V9BYFdFzYAMyiWD/VXXG04+DXlJMd7WFTz7ZAI8V224dMdq getIvzsIA+kA34E4GnmHrMzJknT0cBduu9g6njng4aQc5/hJtzxWUmwXB2PCdqQq8f9q9h+60 btjNEHcBlpjevOt6YBWjSfYGXFDp53cDACJQHl/XXBQSNMetDKGe8B0Cx7dupYJxELXKSZXyK dlbnFYhNxOL5TIzx/lED3ElM4fA20ZlFXlUXreXsuI5voOCh4qTJTKZ2q2ggaAuO1Gh2hqx2z cOADhhy4RUvgZZ7iU/pYSAmfQcIHDf7w7pr0Fn1tnviYOPXcrWhBsM5z9CpkcNgK25xcsDHhK E2QFbMfnLhU7Ra7wRFOMSQjSMIHfK2j+wBW2cA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171126_092627_373387_37D72487 X-CRM114-Status: GOOD ( 10.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Wahren , alsa-devel@alsa-project.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Since 517e7a1537a ("ASoC: bcm2835: move to use the clock framework") the bcm2835-i2s requires a clock as DT property. Unfortunately the necessary DT change has never been applied. While we are at it also fix the first PCM register range to cover the PCM_GRAY register. This patch also fixes the dt-bindings accordlingly. Fixes: 517e7a1537a ("ASoC: bcm2835: move to use the clock framework") Signed-off-by: Stefan Wahren Reviewed-by: Eric Anholt Tested-by: Matthias Reichl --- Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt | 4 ++-- Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt | 9 ++++----- arch/arm/boot/dts/bcm283x.dtsi | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) Changes in V2: * add Fixes, Reviewed-by and Tested-by tags diff --git a/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt b/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt index baf9b34..b6a8cc0 100644 --- a/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt +++ b/Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt @@ -74,8 +74,8 @@ Example: bcm2835_i2s: i2s@7e203000 { compatible = "brcm,bcm2835-i2s"; - reg = < 0x7e203000 0x20>, - < 0x7e101098 0x02>; + reg = < 0x7e203000 0x24>; + clocks = <&clocks BCM2835_CLOCK_PCM>; dmas = <&dma 2>, <&dma 3>; diff --git a/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt b/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt index 65783de..7bb0362 100644 --- a/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt +++ b/Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt @@ -2,9 +2,8 @@ Required properties: - compatible: "brcm,bcm2835-i2s" -- reg: A list of base address and size entries: - * The first entry should cover the PCM registers - * The second entry should cover the PCM clock registers +- reg: Should contain PCM registers location and length. +- clocks: the (PCM) clock to use - dmas: List of DMA controller phandle and DMA request line ordered pairs. - dma-names: Identifier string for each DMA request line in the dmas property. These strings correspond 1:1 with the ordered pairs in dmas. @@ -16,8 +15,8 @@ Example: bcm2835_i2s: i2s@7e203000 { compatible = "brcm,bcm2835-i2s"; - reg = <0x7e203000 0x20>, - <0x7e101098 0x02>; + reg = <0x7e203000 0x24>; + clocks = <&clocks BCM2835_CLOCK_PCM>; dmas = <&dma 2>, <&dma 3>; diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi index dcde93c..f493761 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -396,8 +396,8 @@ i2s: i2s@7e203000 { compatible = "brcm,bcm2835-i2s"; - reg = <0x7e203000 0x20>, - <0x7e101098 0x02>; + reg = <0x7e203000 0x24>; + clocks = <&clocks BCM2835_CLOCK_PCM>; dmas = <&dma 2>, <&dma 3>;