From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_NONE,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by archive.lwn.net (Postfix) with ESMTPS id 223FD7D910 for ; Wed, 11 Mar 2020 16:25:41 +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=iy6U8B0cqPqz2IcmXMVx6qhNCdtu1tBPF6r3u0mhDZU=; b=sHQ GNQ1v6JSr86jPOjKIccmgR7WwatG5KCOqbRdMgO2XPjh+0Joh2cTtPeUTbzP9DXuKGzGtl8eBevfZ xqGc9EZOg18sL4QVj2xtkLe7ugPGr9ZVAhT2Tr3W+RTqLnBhRdRCMonHROMKACiJDJkoXqtqHwBXf UAYcU9RF7Yqt2Ba5XJGoltrJ1PlZO+4s9yjl8GEl4BKNMjZM8kgxgduCbsdwgOkLwrx/0aHlw9HIN 7vphKrW2OvnSj/1ez1N2B5TSqwLJVlHLqeJ0a+4ORqJKkHN6auqzjPUaHcp7aaJSRJbD/ayGyfBU5 2H2TvqZL2yhjqiKV0J7fWWtBtc9827A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jC4As-0006cd-B0; Wed, 11 Mar 2020 16:25:38 +0000 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jC4Ao-0006Zt-R0; Wed, 11 Mar 2020 16:25:36 +0000 Received: by mail-wm1-x343.google.com with SMTP id 6so2774057wmi.5; Wed, 11 Mar 2020 09:25:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=g92svwYBuSyg8jgfB1ySNd3KartWFgju0AKQL5BNu30=; b=b0RzEB3LUIItSreCToIbiC/rkCpE2jb4oD+C0GmG6jhAcdgWNuq9QCPBt+JayskKHM T4elVkDCsK5DKgWsOPXM6Qyg5UK2B/nifMpbkipfYZtCkXuddjLBeVSQsQ0Vv8mKPxvE YliMbOO4ppc+hhi/YbhokRy94j+SfZ6/zUH53n4nUVfTAkIW5m53XIUc414LPbmwU086 XYla6tjKjsyTUzfWNSnRQvVa11/t2qfsIS/4Y1IUATdsyavWHUfXGSJS/TmJKCHggIQl wbbheNOmOLiMVZjNKA9sgGFekKMvD3eNBMAgVU5yJBcZwxrvhG+IXDAYRUBR88s/9yTf T09w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=g92svwYBuSyg8jgfB1ySNd3KartWFgju0AKQL5BNu30=; b=oo6Ei2xTf9cPvPJR3hZeWZHIDftX4GwO7FXrGHsFXCb1WckWaL9TosZcTen9hX5h+t 50DSv/PtMjHD7udNzMfYgyhpon7Iky7PSKo+8TWZy5BPEVg6SjCLy1pOkGn5+M/VJwRa trfixxvOma9A1xRGnAqptexNWu6Gr5Jpfvi5V0qyqq9a1hI1rc2slXrqy7kjBHTRKCvN 3//IgA8ri2ZSaxus1gcyZKRPub8R/MeeQBcqOpfufrk41XGuJOnvlQ2TCzQOcShzwfDv h38tQljjdnPxg9zXA2AmGZeLCE766GF1Hy1EhVH92zJ4f8AC0XDifvNxagsJZXCtzvaH HJow== X-Gm-Message-State: ANhLgQ0Qn0B7Ueqq6INXS5voyL1pquN+kYJ8/TY4tbq1v4y41AdaxEZ8 H66HAMMvfXHh1NrAJ849l2I= X-Google-Smtp-Source: ADFU+vvs61AYxW8DEMnQEw8rODfkI0Hq6B1WdiR+aSW/ymhbIQSqukGtGfpeakTg74muhZKWjCshIw== X-Received: by 2002:a1c:f60d:: with SMTP id w13mr4587872wmc.171.1583943932278; Wed, 11 Mar 2020 09:25:32 -0700 (PDT) Received: from debian.home (ip51ccf9cd.speed.planet.nl. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id i1sm53624688wrs.18.2020.03.11.09.25.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Mar 2020 09:25:30 -0700 (PDT) From: Johan Jonker To: heiko@sntech.de Subject: [PATCH 1/2] ARM: dts: rockchip: swap clocks and clock-names values for i2s nodes Date: Wed, 11 Mar 2020 17:25:23 +0100 Message-Id: <20200311162524.19748-1-jbx6244@gmail.com> X-Mailer: git-send-email 2.11.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200311_092534_902953_E6A5799A X-CRM114-Status: GOOD ( 14.26 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, robh+dt@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+lwn-linux-arm-kernel=archive.lwn.net@lists.infradead.org Archived-At: List-Archive: Current dts files with 'i2s' nodes are manually verified. In order to automate this process rockchip-i2s.txt has to be converted to yaml. In the new setup dtbs_check with rockchip-i2s.yaml expect clocks and clock-names values in the same order. Fix this for some older Rockchip models. make ARCH=arm dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/sound/rockchip-i2s.yaml Signed-off-by: Johan Jonker --- arch/arm/boot/dts/rk3066a.dtsi | 12 ++++++------ arch/arm/boot/dts/rk3188.dtsi | 4 ++-- arch/arm/boot/dts/rk3288.dtsi | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi index 3d1b02f45..f3fc92e57 100644 --- a/arch/arm/boot/dts/rk3066a.dtsi +++ b/arch/arm/boot/dts/rk3066a.dtsi @@ -160,10 +160,10 @@ #size-cells = <0>; pinctrl-names = "default"; pinctrl-0 = <&i2s0_bus>; + clocks = <&cru SCLK_I2S0>, <&cru HCLK_I2S0>; + clock-names = "i2s_clk", "i2s_hclk"; dmas = <&dmac1_s 4>, <&dmac1_s 5>; dma-names = "tx", "rx"; - clock-names = "i2s_hclk", "i2s_clk"; - clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>; rockchip,playback-channels = <8>; rockchip,capture-channels = <2>; #sound-dai-cells = <0>; @@ -178,10 +178,10 @@ #size-cells = <0>; pinctrl-names = "default"; pinctrl-0 = <&i2s1_bus>; + clocks = <&cru SCLK_I2S1>, <&cru HCLK_I2S1>; + clock-names = "i2s_clk", "i2s_hclk"; dmas = <&dmac1_s 6>, <&dmac1_s 7>; dma-names = "tx", "rx"; - clock-names = "i2s_hclk", "i2s_clk"; - clocks = <&cru HCLK_I2S1>, <&cru SCLK_I2S1>; rockchip,playback-channels = <2>; rockchip,capture-channels = <2>; #sound-dai-cells = <0>; @@ -196,10 +196,10 @@ #size-cells = <0>; pinctrl-names = "default"; pinctrl-0 = <&i2s2_bus>; + clocks = <&cru SCLK_I2S2>, <&cru HCLK_I2S2>; + clock-names = "i2s_clk", "i2s_hclk"; dmas = <&dmac1_s 9>, <&dmac1_s 10>; dma-names = "tx", "rx"; - clock-names = "i2s_hclk", "i2s_clk"; - clocks = <&cru HCLK_I2S2>, <&cru SCLK_I2S2>; rockchip,playback-channels = <2>; rockchip,capture-channels = <2>; #sound-dai-cells = <0>; diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi index 10ede65d9..651ea4e15 100644 --- a/arch/arm/boot/dts/rk3188.dtsi +++ b/arch/arm/boot/dts/rk3188.dtsi @@ -170,10 +170,10 @@ #size-cells = <0>; pinctrl-names = "default"; pinctrl-0 = <&i2s0_bus>; + clocks = <&cru SCLK_I2S0>, <&cru HCLK_I2S0>; + clock-names = "i2s_clk", "i2s_hclk"; dmas = <&dmac1_s 6>, <&dmac1_s 7>; dma-names = "tx", "rx"; - clock-names = "i2s_hclk", "i2s_clk"; - clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>; rockchip,playback-channels = <2>; rockchip,capture-channels = <2>; #sound-dai-cells = <0>; diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 8bcb4a516..f68dcde6c 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -964,10 +964,10 @@ interrupts = ; #address-cells = <1>; #size-cells = <0>; + clocks = <&cru SCLK_I2S0>, <&cru HCLK_I2S0>; + clock-names = "i2s_clk", "i2s_hclk"; dmas = <&dmac_bus_s 0>, <&dmac_bus_s 1>; dma-names = "tx", "rx"; - clock-names = "i2s_hclk", "i2s_clk"; - clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>; pinctrl-names = "default"; pinctrl-0 = <&i2s0_bus>; rockchip,playback-channels = <8>; -- 2.11.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel