From patchwork Sun Nov 19 17:00:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 10065683 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 98BD0602CB for ; Sun, 19 Nov 2017 17:02:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 821F928F2D for ; Sun, 19 Nov 2017 17:02:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 753DE2916C; Sun, 19 Nov 2017 17:02:01 +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=ham 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 C62E428F2D for ; Sun, 19 Nov 2017 17:02:00 +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=k2bWeqKdE05AmGYuOGJDO1RB479EydqOil5pAH8Me2c=; b=qXS rqWLHVdRae4sU57nKqXyqO99jpKkPemwzHFX9z8H6NuZ3M2N7PEu4dZN/6hCAQcW9T3LILwhVbXu7 R4tZMZap5Ul/l5ImjFuCARpPvUZe1Gn2fvVJDMcINVlBhROjik2I81gPSjM9uGLgYLqT6IM1rOczr DTDVo1WN4a6NY2PgtL7OTI9PAcP+cvQzmSOZfoKJzURrXHW8Tg0jIetZ5aF0+Ufp+4VgDdXv/PL6P 1BWaRfRaOMVoaCmHI9m0DnhYZfJ+Cl5cIokU9/Of1r1sA1UHeSjOD7h8SmfmAkIg9Qd/0JI/9FwmU Ohkpf3qWnKxD5E7GtM+x6phHp2kOP4Q==; 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 1eGSyk-0003XJ-Ry; Sun, 19 Nov 2017 17:01:58 +0000 Received: from mout.kundenserver.de ([212.227.126.133]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eGSyh-0003Lp-F1; Sun, 19 Nov 2017 17:01:57 +0000 Received: from localhost.localdomain ([95.90.209.91]) by mrelayeu.kundenserver.de (mreue007 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MD155-1ePVeu2ayR-009kad; Sun, 19 Nov 2017 18:01:19 +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 RFC] ARM: dts: bcm283x: Fix probing of bcm2835-i2s Date: Sun, 19 Nov 2017 18:00:27 +0100 Message-Id: <1511110827-2726-1-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.7.4 X-Provags-ID: V03:K0:EUNxIv6RDzBVtPCeaAgWzubdVCqY3oH353Wnkij4GSbA5m14NGV ZDL5TQh9s5taXngze5bSM2YF0lYNUQOjjTdkmwnDb6R6IunLSdImL5vPYbVRMkGxU2QhmZF 51EiibCNUqn8Urw4f6l46V5BilsUE0hirqaz2o1ddcXO3VRbIxpnW0is7n/YXBhtS1VZD0k B/Y/qSlMtatWVDC+zX1vw== X-UI-Out-Filterresults: notjunk:1; V01:K0:A25ehobW+jE=:Iw5Zah/o/9DZIOYkjkyr11 I3MIapCZVrxkHU52ggp183eXiAmuKs/0SQZGOxolOl53T6LnKHBHYn4IzdBv6+oFkl7oGwTMe iRHhWc8VZhjzEA5xTqJxyciUtv8CsOqUmg2DmFFbZKWRGqetWyr1yy9oNxeO7pm6dcHGXaaMQ c1box2D1mexElh+uRr1uTU4qRcFYH2OK0Is+LIq700ITyCK2Zoeqs9xW8rLcOv3V5HKNWhcrb zR8utKtVJbAa75kkGejjVyVdj7yM32kCBs8nd/GLn0q00Lot5scau+FwXRYNER4vHNCU+QG6N O/rnBBzLQ/DcXtR7/RrPpVW2mkWJYKx/EiX5CLZFhKX/SJfsCBVvwZ/H+NUrt1RLJ0uRahNQ1 8xuRBXhqRETKCQEvu4N2HlH73PCA8YkfrSyg1NgDCkwsAjgKBR0usS3sVA9l0u3kk9239fbA8 1B8zhwVe8FTF6cnq6vWjgZrG0EzLPa4Rm0t9rcc8rcGFoKcXp/j1S4q7yDs6bFuUVfe9wAd5b Fpjma2RJoI8OdSTHoLNPjXP0U74iGv6bD+p35W2AM5q2zcJx7HY51C7TBN8VTe8w30+OmDeQO 0sa+o49DnVTbdg2L2s4AwpiWQCivqhbGwi2PXbVEPKU8JZ87KawfjJ/NBkI7ELsR1VmNmPLAS ldXzW+yi5fcr41MfKITS2wgdv6b6TqxU9DuNiKNCcrrsEvR5M5BT79Bc0/6xnoHkUkg55Zbt+ gZsOnbw4cLgdElPbyIcyUgIOG9+3k97SBtX9Ew== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171119_090155_834483_A684D843 X-CRM114-Status: GOOD ( 11.65 ) 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. 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(-) Hi, this is only probe tested with a RPi 1B. I don't have the sound hardware to test the drivers function. 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 431dcfc..01733a9 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -391,8 +391,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>;