From nobody Mon Apr 27 02:05:12 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9785CCA47F for ; Sat, 18 Jun 2022 12:32:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234625AbiFRMcJ (ORCPT ); Sat, 18 Jun 2022 08:32:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234154AbiFRMcD (ORCPT ); Sat, 18 Jun 2022 08:32:03 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA05E1D315 for ; Sat, 18 Jun 2022 05:32:02 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id i10so5053390wrc.0 for ; Sat, 18 Jun 2022 05:32:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=conchuod.ie; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VGm3r1/aMg071qi73xSEXzAaqTqN1Q+VH+odYYMqRVE=; b=M53yntPkwb6rKwStueOhqY4C1t2aG9EbhwHhEkSpZVLk6/Ha9CTunpiN1nH5i1T2ni 5JCiDu8P8qFkOcNjiTBcRPTpJ9KbRiL05AMzyCAFUykl37Rag27eKr6thTN5anQaY1IA d8v/udL/AQi/r/JkuA+rpOwoe0vhrVH5XVbN5PE8ePoNCNnBwCSEPjkZljjFjg/EkxCQ el3IEdR24l5otSXU3Y5fbKJLJLHwns9s3upwUZvehURiZy0BSTnHD/ZEbcy4pgmwT1K8 YyyUjR0YdliUS1un+CNRD26PIMihoSSIzLSN+QUEXCap4g/KGAoFVIX7OS+QN6XqmwZP BCzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VGm3r1/aMg071qi73xSEXzAaqTqN1Q+VH+odYYMqRVE=; b=MnZowbyDQfakCjAi6BznNV9F/1GAOuZDL0K35Jr5OlYYdQt5cm4J/+K9F2fsnsTKBE WXYNw2uIlAVlfrrO1kX5xgIse8Hgk6gb9Qg+m75Z4FXhVp+TEXFBfg+Nm56zuk3aUIsR zpTgFZYsQPw5AWtafmbshaTOhzTOR/HpXJ8UcsutBd2G8RHKUky8W7AUUOpzS6Owfhus qPxyELnJ0rBUqN2vg0O3tq47q4Fq8Hd7PEwL2XvRSIGbuDP+Ouo3AVEimwUnzleMxm+q PsryxcyqgUXgBOpA6E4vsk/l4ztwejjobo56n8mduoPP0EQUAo9aBDk7lI8UV9xwqYJH vk2A== X-Gm-Message-State: AJIora9zApylr4LKvRTORFPhQplDU4hUiSO0/Ic51FB5WsClNw7oLQSn rI3cq+ZSYCQIbJVwTzUKeUubYw== X-Google-Smtp-Source: AGRyM1v68t/Wwno8np+QMYDsHNGouaSLNzMTK0OgH/L3C4APgn3/IkzS+cmwriXRfa4S1osF+ky/Jg== X-Received: by 2002:a5d:65c1:0:b0:210:33b7:4525 with SMTP id e1-20020a5d65c1000000b0021033b74525mr13815784wrw.494.1655555521116; Sat, 18 Jun 2022 05:32:01 -0700 (PDT) Received: from henark71.. ([51.37.234.167]) by smtp.gmail.com with ESMTPSA id az10-20020adfe18a000000b00210396b2eaesm9292305wrb.45.2022.06.18.05.31.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jun 2022 05:32:00 -0700 (PDT) From: Conor Dooley To: David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Thierry Reding , Sam Ravnborg , Eugeniy Paltsev , Vinod Koul , Liam Girdwood , Mark Brown , Serge Semin , Daniel Lezcano , Palmer Dabbelt , Palmer Dabbelt Cc: Thomas Gleixner , Paul Walmsley , Albert Ou , Conor Dooley , Masahiro Yamada , Damien Le Moal , Geert Uytterhoeven , Niklas Cassel , Dillon Min , Heng Sia , Jose Abreu , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, alsa-devel@alsa-project.org, linux-spi@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH 01/14] dt-bindings: display: convert ilitek,ili9341.txt to dt-schema Date: Sat, 18 Jun 2022 13:30:23 +0100 Message-Id: <20220618123035.563070-2-mail@conchuod.ie> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220618123035.563070-1-mail@conchuod.ie> References: <20220618123035.563070-1-mail@conchuod.ie> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Conor Dooley A dt-schema binding for the Ilitek ili9341 was created as panel/ilitek,ili9341.yaml but the txt binding was ignored in the process. Move the remaining items in the txt binding to the yaml one & delete it. The example in the txt binding has a spi-max-frequency which disagrees with the yaml replacement (and its own documentation) so change that to conform with the binding. There are no users in tree of the Adafruit yx240qv29 to check against. Link: https://cdn-learn.adafruit.com/assets/assets/000/046/879/original/SPE= C-YX240QV29-T_Rev.A__1_.pdf Signed-off-by: Conor Dooley Reviewed-by: Rob Herring --- .../bindings/display/ilitek,ili9341.txt | 27 ----------- .../display/panel/ilitek,ili9341.yaml | 48 +++++++++++++------ 2 files changed, 34 insertions(+), 41 deletions(-) delete mode 100644 Documentation/devicetree/bindings/display/ilitek,ili934= 1.txt diff --git a/Documentation/devicetree/bindings/display/ilitek,ili9341.txt b= /Documentation/devicetree/bindings/display/ilitek,ili9341.txt deleted file mode 100644 index 169b32e4ee4e..000000000000 --- a/Documentation/devicetree/bindings/display/ilitek,ili9341.txt +++ /dev/null @@ -1,27 +0,0 @@ -Ilitek ILI9341 display panels - -This binding is for display panels using an Ilitek ILI9341 controller in S= PI -mode. - -Required properties: -- compatible: "adafruit,yx240qv29", "ilitek,ili9341" -- dc-gpios: D/C pin -- reset-gpios: Reset pin - -The node for this driver must be a child node of a SPI controller, hence -all mandatory properties described in ../spi/spi-bus.txt must be specified. - -Optional properties: -- rotation: panel rotation in degrees counter clockwise (0,90,180,270) -- backlight: phandle of the backlight device attached to the panel - -Example: - display@0{ - compatible =3D "adafruit,yx240qv29", "ilitek,ili9341"; - reg =3D <0>; - spi-max-frequency =3D <32000000>; - dc-gpios =3D <&gpio0 9 GPIO_ACTIVE_HIGH>; - reset-gpios =3D <&gpio0 8 GPIO_ACTIVE_HIGH>; - rotation =3D <270>; - backlight =3D <&backlight>; - }; diff --git a/Documentation/devicetree/bindings/display/panel/ilitek,ili9341= .yaml b/Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml index 6058948a9764..94ca92878434 100644 --- a/Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml +++ b/Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml @@ -23,6 +23,7 @@ properties: - enum: # ili9341 240*320 Color on stm32f429-disco board - st,sf-tc240t-9370-t + - adafruit,yx240qv29 - const: ilitek,ili9341 =20 reg: true @@ -47,31 +48,50 @@ properties: vddi-led-supply: description: Voltage supply for the LED driver (1.65 .. 3.3 V) =20 -additionalProperties: false +unevaluatedProperties: false =20 required: - compatible - reg - dc-gpios - - port + +if: + properties: + compatible: + contains: + enum: + - st,sf-tc240t-9370-t +then: + required: + - port =20 examples: - |+ + #include spi { #address-cells =3D <1>; #size-cells =3D <0>; panel: display@0 { - compatible =3D "st,sf-tc240t-9370-t", - "ilitek,ili9341"; - reg =3D <0>; - spi-3wire; - spi-max-frequency =3D <10000000>; - dc-gpios =3D <&gpiod 13 0>; - port { - panel_in: endpoint { - remote-endpoint =3D <&display_out>; - }; - }; - }; + compatible =3D "st,sf-tc240t-9370-t", + "ilitek,ili9341"; + reg =3D <0>; + spi-3wire; + spi-max-frequency =3D <10000000>; + dc-gpios =3D <&gpiod 13 0>; + port { + panel_in: endpoint { + remote-endpoint =3D <&display_out>; + }; + }; + }; + display@1{ + compatible =3D "adafruit,yx240qv29", "ilitek,ili9341"; + reg =3D <1>; + spi-max-frequency =3D <10000000>; + dc-gpios =3D <&gpio0 9 GPIO_ACTIVE_HIGH>; + reset-gpios =3D <&gpio0 8 GPIO_ACTIVE_HIGH>; + rotation =3D <270>; + backlight =3D <&backlight>; }; + }; ... --=20 2.36.1 From nobody Mon Apr 27 02:05:12 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22FA8CCA473 for ; Sat, 18 Jun 2022 12:32:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232215AbiFRMcO (ORCPT ); Sat, 18 Jun 2022 08:32:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234107AbiFRMcF (ORCPT ); Sat, 18 Jun 2022 08:32:05 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 60B41183A0 for ; Sat, 18 Jun 2022 05:32:04 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id m1so1046169wrb.2 for ; Sat, 18 Jun 2022 05:32:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=conchuod.ie; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wA+ekkpjde0Zx9cXanks0YsUmdtDvWig/ia7r5xRwsg=; b=NLP+j4VvWO4pMdDxz+jP2qakHnxjIhWDW5IcIZ6iTjVuR6PvXGlfRvScvAs6fv4LGC tVHzVYgFUHCv1IRJ4Ht4KdNVLD+jSSS5h4H+avCrhP5W5KXZfsniSNzQaIy0Vmjf7cJe 1JtCXoeodTgNGx3zxBouJNSTU+BRjTFYSAg0N4jBQrfeC5wyTPkZscKwWYLFzG+dbNUH VQDUJvWUJkk/fS8UHWuapx2oX/lVLREXGX91trMzLN+PvRD1VA55gaBikAJhJXd6EtNJ TXtuW3AI8LcIC7NdxtxNMfIR5WAfMQnhkZScOGuGAVa6FafYwFTfgLXwxWgUJlRmcjG8 FuBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wA+ekkpjde0Zx9cXanks0YsUmdtDvWig/ia7r5xRwsg=; b=or4YwHWpS8nPxx//C8gSY2zZk3ELF2ZBstx/875WLsOYdfl8A/X1LL5a24Dx8Uh6mV Ora+RMzMc0rgK6kjgOOzCOZEPvYS2ai7aYuWiJzJA/O81JDpg4AtLegwjegV26Lz7729 Ib/MYCfk6JHZ93YFYmn+kqZ/yd0mb2P7RtAqoUJqlPjGG2RuAw6LGUjw0Xr6qVr7b+M9 c9DWfLKyGa0niy6qgoo0Y3IEU4zwGOYxIkuEZlLdEDtZYEnJSPbtO+WrdY5z8TpbjKJY vYIpMYsYSrGc9QF8pWirj/aoikxIIPXVoMWKJJF9ydmII0CmFOxx84s9Wp7/hPRf6lVY fDTg== X-Gm-Message-State: AJIora+fIiqeHczZHc7q5iiIvBEd2ieI4FMNJuDmqKDvqvRfZJRYWr3g OzwnBswM7SM5lVFzSnNqrfP6LQ== X-Google-Smtp-Source: AGRyM1uabX5izdogY/5f2icOXRBDHwfiqcRqU22eeMbzZR7yfphBy2Stjoi6dvehhY38C8EymhY+dA== X-Received: by 2002:adf:ef52:0:b0:21b:81e8:5d0b with SMTP id c18-20020adfef52000000b0021b81e85d0bmr6154762wrp.502.1655555522853; Sat, 18 Jun 2022 05:32:02 -0700 (PDT) Received: from henark71.. ([51.37.234.167]) by smtp.gmail.com with ESMTPSA id az10-20020adfe18a000000b00210396b2eaesm9292305wrb.45.2022.06.18.05.32.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jun 2022 05:32:02 -0700 (PDT) From: Conor Dooley To: David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Thierry Reding , Sam Ravnborg , Eugeniy Paltsev , Vinod Koul , Liam Girdwood , Mark Brown , Serge Semin , Daniel Lezcano , Palmer Dabbelt , Palmer Dabbelt Cc: Thomas Gleixner , Paul Walmsley , Albert Ou , Conor Dooley , Masahiro Yamada , Damien Le Moal , Geert Uytterhoeven , Niklas Cassel , Dillon Min , Heng Sia , Jose Abreu , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, alsa-devel@alsa-project.org, linux-spi@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH 02/14] dt-bindings: display: panel: allow ilitek,ili9341 in isolation Date: Sat, 18 Jun 2022 13:30:24 +0100 Message-Id: <20220618123035.563070-3-mail@conchuod.ie> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220618123035.563070-1-mail@conchuod.ie> References: <20220618123035.563070-1-mail@conchuod.ie> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Conor Dooley The dt-binding for the ilitek,ili9341 does not allow it to be used as a compatible in isolation. This generates a warning for the Canaan kd233 devicetree: arch/riscv/boot/dts/canaan/canaan_kd233.dtb: panel@0: compatible:0: 'ilitek= ,ili9341' is not one of ['st,sf-tc240t-9370-t'] From schema: Documentation/devicetree/bindings/display/panel/ilitek= ,ili9341.yaml arch/riscv/boot/dts/canaan/canaan_kd233.dtb: panel@0: compatible: ['ilitek,= ili9341'] is too short From schema: Documentation/devicetree/bindings/display/panel/ilitek= ,ili9341.yaml Allow ilitek,ili9341 to be selected in isolation. Signed-off-by: Conor Dooley --- .../bindings/display/panel/ilitek,ili9341.yaml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Documentation/devicetree/bindings/display/panel/ilitek,ili9341= .yaml b/Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml index 94ca92878434..c402bedaa37a 100644 --- a/Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml +++ b/Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml @@ -19,12 +19,14 @@ allOf: =20 properties: compatible: - items: - - enum: - # ili9341 240*320 Color on stm32f429-disco board - - st,sf-tc240t-9370-t - - adafruit,yx240qv29 - - const: ilitek,ili9341 + oneOf: + - items: + - const: ilitek,ili9341 + - items: + - enum: + - st,sf-tc240t-9370-t + - adafruit,yx240qv29 + - const: ilitek,ili9341 =20 reg: true =20 --=20 2.36.1 From nobody Mon Apr 27 02:05:12 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 84083C433EF for ; Sat, 18 Jun 2022 12:32:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234974AbiFRMcT (ORCPT ); Sat, 18 Jun 2022 08:32:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52570 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234375AbiFRMcH (ORCPT ); Sat, 18 Jun 2022 08:32:07 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 379B71D318 for ; Sat, 18 Jun 2022 05:32:06 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id c21so8820614wrb.1 for ; Sat, 18 Jun 2022 05:32:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=conchuod.ie; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L+tGP5Kq7UIoKfqvhhTL1feo63GGQB6sV6O4YA0h7fw=; b=FT1arqVk/Zlcb2OUrG6d3Sn9DZeje/ii6sl5Uni+VBpFsvXiKa+0JDIldNCdJotMw7 CRpLTSb3ESJ0HokBPy0el7SGci1FfbxA+8wCxZIJ7ulCcboVF51hooukHRDzmLMbRR0S XBJnx2JFmdByuvY20d6dYTvwK7qC7rx7qIAnRhOsjpxRiPq6vAAXZl0nYIzJrI7Vxq5a 0u9HsombL5Oqr8Yt/nNdt/EdlFxqSnraietS8QZ8XqK44mg3l5R6iYQaeNegXu3wf+A8 QWmt7cEOMYQvDEem63UF12OK4msfj3cqaZZbwH4ynxKqnTmdUxxCtXz6hgblI8B3t413 8dzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L+tGP5Kq7UIoKfqvhhTL1feo63GGQB6sV6O4YA0h7fw=; b=n0aD9qBG7Ef8CL8rmnI728d/NKbSmfAdpIsLDbF1D4m/p4CXCjaPgWOflYSSVifgVM nQf1D8dzMyj8vS+B4BqBYk3M6ArnXP8eBhJIfzmPewGbEGeGsnXbKPni1EH/+GrKsmdI oqMHmhs/+/W1jDXg/CG27huKd34IRoCQTpFyLgiziz2B9MraN6UNa4O+5N4ptt+uEzQ0 Gwns5vv8GnbwOwKWOKHj+jFb7jUt/ZrTBzGDfCHs83w2R1Y2zoSryTkKbQfw44fagkK7 Pixqxi7N7bN9tEITuqPVsJkPeNN7xxd8r02M92U4FkZCuyU/la3LpQo+7e9Ba1VmxwIr axlA== X-Gm-Message-State: AJIora/6krBumyX4q+NyQ7VAo/Vnf6uHBY8BV1vwcrBb6cZlEx0ELmOJ +i2Q3OC01hl+R04ilpR5ArIWjA== X-Google-Smtp-Source: AGRyM1s/yZlVNkGYb597Qf+BVjq6aStv7uTGIe67UVjRHSrjyShDdJGYNTreuTc/Z5+aeiaThr9pvg== X-Received: by 2002:a5d:4a0b:0:b0:21b:88f3:3784 with SMTP id m11-20020a5d4a0b000000b0021b88f33784mr758684wrq.69.1655555524669; Sat, 18 Jun 2022 05:32:04 -0700 (PDT) Received: from henark71.. ([51.37.234.167]) by smtp.gmail.com with ESMTPSA id az10-20020adfe18a000000b00210396b2eaesm9292305wrb.45.2022.06.18.05.32.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jun 2022 05:32:04 -0700 (PDT) From: Conor Dooley To: David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Thierry Reding , Sam Ravnborg , Eugeniy Paltsev , Vinod Koul , Liam Girdwood , Mark Brown , Serge Semin , Daniel Lezcano , Palmer Dabbelt , Palmer Dabbelt Cc: Thomas Gleixner , Paul Walmsley , Albert Ou , Conor Dooley , Masahiro Yamada , Damien Le Moal , Geert Uytterhoeven , Niklas Cassel , Dillon Min , Heng Sia , Jose Abreu , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, alsa-devel@alsa-project.org, linux-spi@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH 03/14] ASoC: dt-bindings: convert designware-i2s to dt-schema Date: Sat, 18 Jun 2022 13:30:25 +0100 Message-Id: <20220618123035.563070-4-mail@conchuod.ie> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220618123035.563070-1-mail@conchuod.ie> References: <20220618123035.563070-1-mail@conchuod.ie> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Conor Dooley Convert the Synopsys DesignWare I2S controller binding to dt-schema. There was no listed maintainer but Jose Abreu was the last editor of the txt binding so add him as maintainer. Signed-off-by: Conor Dooley --- .../bindings/sound/designware-i2s.txt | 35 ------- .../bindings/sound/snps,designware-i2s.yaml | 93 +++++++++++++++++++ 2 files changed, 93 insertions(+), 35 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/designware-i2s.= txt create mode 100644 Documentation/devicetree/bindings/sound/snps,designware= -i2s.yaml diff --git a/Documentation/devicetree/bindings/sound/designware-i2s.txt b/D= ocumentation/devicetree/bindings/sound/designware-i2s.txt deleted file mode 100644 index 6a536d570e29..000000000000 --- a/Documentation/devicetree/bindings/sound/designware-i2s.txt +++ /dev/null @@ -1,35 +0,0 @@ -DesignWare I2S controller - -Required properties: - - compatible : Must be "snps,designware-i2s" - - reg : Must contain the I2S core's registers location and length - - clocks : Pairs of phandle and specifier referencing the controller's - clocks. The controller expects one clock: the clock used as the sampling - rate reference clock sample. - - clock-names : "i2sclk" for the sample rate reference clock. - - dmas: Pairs of phandle and specifier for the DMA channels that are used= by - the core. The core expects one or two dma channels: one for transmit and - one for receive. - - dma-names : "tx" for the transmit channel, "rx" for the receive channel. - -Optional properties: - - interrupts: The interrupt line number for the I2S controller. Add this - parameter if the I2S controller that you are using does not support DMA. - -For more details on the 'dma', 'dma-names', 'clock' and 'clock-names' -properties please check: - * resource-names.txt - * clock/clock-bindings.txt - * dma/dma.txt - -Example: - - soc_i2s: i2s@7ff90000 { - compatible =3D "snps,designware-i2s"; - reg =3D <0x0 0x7ff90000 0x0 0x1000>; - clocks =3D <&scpi_i2sclk 0>; - clock-names =3D "i2sclk"; - #sound-dai-cells =3D <0>; - dmas =3D <&dma0 5>; - dma-names =3D "tx"; - }; diff --git a/Documentation/devicetree/bindings/sound/snps,designware-i2s.ya= ml b/Documentation/devicetree/bindings/sound/snps,designware-i2s.yaml new file mode 100644 index 000000000000..5ac9c00157bf --- /dev/null +++ b/Documentation/devicetree/bindings/sound/snps,designware-i2s.yaml @@ -0,0 +1,93 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/snps,designware-i2s.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: DesignWare I2S controller + +maintainers: + - Jose Abreu + +properties: + compatible: + oneOf: + - items: + - const: canaan,k210-i2s + - const: snps,designware-i2s + - enum: + - snps,designware-i2s + + reg: + maxItems: 1 + + interrupts: + description: | + The interrupt line number for the I2S controller. Add this + parameter if the I2S controller that you are using does not + support DMA. + maxItems: 1 + + clocks: + description: Sampling rate reference clock + + clock-names: + const: i2sclk + + resets: + maxItems: 1 + + dmas: + items: + - description: TX DMA Channel + - description: RX DMA Channel + minItems: 1 + + dma-names: + items: + - const: tx + - const: rx + minItems: 1 + +if: + properties: + compatible: + contains: + const: canaan,k210-i2s + +then: + properties: + "#sound-dai-cells": + const: 1 + +else: + properties: + "#sound-dai-cells": + const: 0 + +required: + - compatible + - reg + - clocks + - clock-names + +oneOf: + - required: + - dmas + - dma-names + - required: + - interrupts + +unevaluatedProperties: false + +examples: + - | + soc_i2s: i2s@7ff90000 { + compatible =3D "snps,designware-i2s"; + reg =3D <0x7ff90000 0x1000>; + clocks =3D <&scpi_i2sclk 0>; + clock-names =3D "i2sclk"; + #sound-dai-cells =3D <0>; + dmas =3D <&dma0 5>; + dma-names =3D "tx"; + }; --=20 2.36.1 From nobody Mon Apr 27 02:05:12 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 05FAFC433EF for ; Sat, 18 Jun 2022 12:32:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235133AbiFRMc0 (ORCPT ); Sat, 18 Jun 2022 08:32:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234412AbiFRMcI (ORCPT ); Sat, 18 Jun 2022 08:32:08 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D84C3183A0 for ; Sat, 18 Jun 2022 05:32:06 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id i10so5053390wrc.0 for ; Sat, 18 Jun 2022 05:32:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=conchuod.ie; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=n9g/PqG7lJoC3tmWnVa7QkZ4DkjcrfTJ4GH+uywTgjo=; b=YKP/o6CNE+lQ/JvutgsR0jZOXfHfDWCY/dQhqMKd5OzvitLi7mgxOOlC22neXUi3t3 BN9TvFhMfSVyIRalfKp0Va337xJ573OA/jlHmNvKMC9gL9WCqqIk9PYa0TsCVpUjtR8B tbSkAAYjMwonv2CjEuI0NKpP3MKNtmcrz4U2Kau04jp49doWSVikIYXLNtIJ0CbxpRRk ACyFnBPLFEDO8mQ9dOPY47H5osv138u3PU28fgbHfr0fyUMw+29W9vwD1hyvLo5Y4+V/ UZtdS0DFsqY5lgkZ/53LD/FQ/OdBPmTBXN7bsmN9ILMpN1rxcP2HcJnRbBzUtni7FWjs qlYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=n9g/PqG7lJoC3tmWnVa7QkZ4DkjcrfTJ4GH+uywTgjo=; b=krMHx0gwwszUWyv7Xa3wf5ALj8NGnVeDlshojp1UJd+LxLtZSPgR5zzlZgMfigEvu2 WCuBBAMpUeQr6kzOxlY+eCZ7EBuRnYKUP/Dq8PMElE87SEVXuqQAKhp/lFnE9XYoNtZ+ ZqByBpIvVxdpJXaklS3F+JPUDmcbTPID6Bfn+W+hbD2eMfFCIS7IkUqlEh9wZK0sn5XJ re1b/7Nbb1lGkgsELL7vignncPV7JI2URK/8QGnIezOQaXB3IMOnbwpy7CYIY52EG+1S HU+JJUqmOw4ot0xSMYmQjaqxUVGfeilOerDE/V8cVb8gpksFU0W6LA0HkTrK7K2dR1M0 QnBg== X-Gm-Message-State: AJIora/JAxlXHpD+/ZS7Y6lfsmTD2rCKrS5TyJOhj9hfdLSVabrpfh3u alwutPH1sgRCDTi+baXr8WbEAw== X-Google-Smtp-Source: AGRyM1uLcJx1fdLcx/uXs4UMpQTYdcZbfApX1+t2jE32dzxYMzfs1UyeNBdv+e0Fp23i7qfwRgxtPQ== X-Received: by 2002:a5d:4251:0:b0:21b:885b:2fcc with SMTP id s17-20020a5d4251000000b0021b885b2fccmr1452539wrr.52.1655555526382; Sat, 18 Jun 2022 05:32:06 -0700 (PDT) Received: from henark71.. ([51.37.234.167]) by smtp.gmail.com with ESMTPSA id az10-20020adfe18a000000b00210396b2eaesm9292305wrb.45.2022.06.18.05.32.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jun 2022 05:32:05 -0700 (PDT) From: Conor Dooley To: David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Thierry Reding , Sam Ravnborg , Eugeniy Paltsev , Vinod Koul , Liam Girdwood , Mark Brown , Serge Semin , Daniel Lezcano , Palmer Dabbelt , Palmer Dabbelt Cc: Thomas Gleixner , Paul Walmsley , Albert Ou , Conor Dooley , Masahiro Yamada , Damien Le Moal , Geert Uytterhoeven , Niklas Cassel , Dillon Min , Heng Sia , Jose Abreu , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, alsa-devel@alsa-project.org, linux-spi@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH 04/14] dt-bindings: dma: add Canaan k210 to Synopsys DesignWare DMA Date: Sat, 18 Jun 2022 13:30:26 +0100 Message-Id: <20220618123035.563070-5-mail@conchuod.ie> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220618123035.563070-1-mail@conchuod.ie> References: <20220618123035.563070-1-mail@conchuod.ie> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Conor Dooley The Canaan k210 apparently has a Sysnopsys Designware AXI DMA controller, but according to the documentation & devicetree it has 6 interrupts rather than the standard one. Add a custom compatible that supports the 6 interrupt configuration which falls back to the standard binding which is currently the one in use in the devicetree entry. Link: https://canaan-creative.com/wp-content/uploads/2020/03/kendryte_stand= alone_programming_guide_20190311144158_en.pdf #Page 58 Signed-off-by: Conor Dooley --- .../bindings/dma/snps,dw-axi-dmac.yaml | 35 ++++++++++++++----- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml b/= Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml index 4324a94b26b2..bc85598151ef 100644 --- a/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml +++ b/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml @@ -18,9 +18,13 @@ allOf: =20 properties: compatible: - enum: - - snps,axi-dma-1.01a - - intel,kmb-axi-dma + oneOf: + - items: + - const: canaan,k210-axi-dma + - const: snps,axi-dma-1.01a + - enum: + - snps,axi-dma-1.01a + - intel,kmb-axi-dma =20 reg: minItems: 1 @@ -33,9 +37,6 @@ properties: - const: axidma_ctrl_regs - const: axidma_apb_regs =20 - interrupts: - maxItems: 1 - clocks: items: - description: Bus Clock @@ -92,6 +93,22 @@ properties: minimum: 1 maximum: 256 =20 +if: + properties: + compatible: + contains: + const: canaan,k210-axi-dma + +then: + properties: + interrupts: + maxItems: 6 + +else: + properties: + interrupts: + maxItems: 1 + required: - compatible - reg @@ -105,7 +122,7 @@ required: - snps,priority - snps,block-size =20 -additionalProperties: false +unevaluatedProperties: false =20 examples: - | @@ -113,12 +130,12 @@ examples: #include /* example with snps,dw-axi-dmac */ dmac: dma-controller@80000 { - compatible =3D "snps,axi-dma-1.01a"; + compatible =3D "canaan,k210-axi-dma", "snps,axi-dma-1.01a"; reg =3D <0x80000 0x400>; clocks =3D <&core_clk>, <&cfgr_clk>; clock-names =3D "core-clk", "cfgr-clk"; interrupt-parent =3D <&intc>; - interrupts =3D <27>; + interrupts =3D <27>, <28>, <29>, <30>, <31>, <32>; #dma-cells =3D <1>; dma-channels =3D <4>; snps,dma-masters =3D <2>; --=20 2.36.1 From nobody Mon Apr 27 02:05:12 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C6C7CCA483 for ; Sat, 18 Jun 2022 12:32:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236009AbiFRMc3 (ORCPT ); Sat, 18 Jun 2022 08:32:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234715AbiFRMcL (ORCPT ); Sat, 18 Jun 2022 08:32:11 -0400 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94B361DA4F for ; Sat, 18 Jun 2022 05:32:09 -0700 (PDT) Received: by mail-wr1-x435.google.com with SMTP id e25so4939408wrc.13 for ; Sat, 18 Jun 2022 05:32:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=conchuod.ie; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MzCNuZqg5sJhSSZ4d8it+v4YJ89K4kJOhMYbzqau3T0=; b=Q/DW33pApkzDugaxPE3P0mBkLxqeHFjsQF8z1VV2ne8TRKuN2bIqDfzxsSTkLEjBrA wpdDJgUWP+1wDHdQ9JS4O1x4Gq88lL49JAWRWB4H62ef/kDIyGqiJWklnIhvj7t3gOgQ m1btN41fR+l8tqU5xRyuBWhlJfRunVaRxbUCkNPjxFxCR7fgJ76b5iLyDoxgvaEFgta2 Y7jzvGqyxY8ynrhbm2wsHOUw8jsjq4R2c+1hs16sLw8LkR/A8wnX+Rcz+CEvY4HTn+12 wA1hi5h2lS6EglrFG2mc1iaWo2T8RWK90k4OmUe37mNSSxwVnWaTmTTERIaDVuiKnqg6 uvGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MzCNuZqg5sJhSSZ4d8it+v4YJ89K4kJOhMYbzqau3T0=; b=Q3ra4YWUTbZaYm/dIrgSPIXji3m8o9xZ7tUI2lHSfQ1R1rTdMD0yF/+Z5+EkN2RV/H rPYAZHPzrK4BmxJ79TSM2yyW534pPr5VNSdIKETMSURM906QkobECNM54/T+XL3ZL4XD D4bhi9CL+1gCxK/ZOVmSOC55BV8dReQwHO2P4XBjhceoHOjFbYxHHCq3Ip7UZ4nukKdX 4K3YnjGYpRqjr4c+XNbhtrGvDZZSi1tDjI77oYmTI3EIaXULiB+fPRLF1px/LIJaV4pb foHOoVCd3yiMcHzI1utcE8rdOQAFaRYQ7il4f+zFImI/pEPlJMX5B6QDzb/yh47Lb1pk 6Y2w== X-Gm-Message-State: AJIora9FN4oKxaQU503EONq+qJHBNN/d3xLxyHtD9V3sJJGTMUOAbAlX 2NAmLwtv7FrlQO0B10Ps0tplSg== X-Google-Smtp-Source: AGRyM1sSSQqHjZc3Rjokw1+aDQhZh51cPdEwrDgxvVJw3mbh+xunRoRwhQyu4jAgaA6W5FK27IHXAg== X-Received: by 2002:a5d:598e:0:b0:219:ea16:5a2a with SMTP id n14-20020a5d598e000000b00219ea165a2amr13955140wri.343.1655555528086; Sat, 18 Jun 2022 05:32:08 -0700 (PDT) Received: from henark71.. ([51.37.234.167]) by smtp.gmail.com with ESMTPSA id az10-20020adfe18a000000b00210396b2eaesm9292305wrb.45.2022.06.18.05.32.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jun 2022 05:32:07 -0700 (PDT) From: Conor Dooley To: David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Thierry Reding , Sam Ravnborg , Eugeniy Paltsev , Vinod Koul , Liam Girdwood , Mark Brown , Serge Semin , Daniel Lezcano , Palmer Dabbelt , Palmer Dabbelt Cc: Thomas Gleixner , Paul Walmsley , Albert Ou , Conor Dooley , Masahiro Yamada , Damien Le Moal , Geert Uytterhoeven , Niklas Cassel , Dillon Min , Heng Sia , Jose Abreu , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, alsa-devel@alsa-project.org, linux-spi@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH 05/14] dt-bindings: timer: add Canaan k210 to Synopsys DesignWare timer Date: Sat, 18 Jun 2022 13:30:27 +0100 Message-Id: <20220618123035.563070-6-mail@conchuod.ie> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220618123035.563070-1-mail@conchuod.ie> References: <20220618123035.563070-1-mail@conchuod.ie> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Conor Dooley The Canaan k210 apparently has a Sysnopsys Designware timer but according to the documentation & devicetree it has 2 interrupts rather than the standard one. Add a custom compatible that supports the 2 interrupt configuration and falls back to the standard binding (which is currently the one in use in the devicetree entry). Link: https://canaan-creative.com/wp-content/uploads/2020/03/kendryte_stand= alone_programming_guide_20190311144158_en.pdf #Page 58 Signed-off-by: Conor Dooley --- .../bindings/timer/snps,dw-apb-timer.yaml | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/Documentation/devicetree/bindings/timer/snps,dw-apb-timer.yaml= b/Documentation/devicetree/bindings/timer/snps,dw-apb-timer.yaml index d33c9205a909..9a76acc7a66f 100644 --- a/Documentation/devicetree/bindings/timer/snps,dw-apb-timer.yaml +++ b/Documentation/devicetree/bindings/timer/snps,dw-apb-timer.yaml @@ -12,6 +12,9 @@ maintainers: properties: compatible: oneOf: + - items: + - const: canaan,k210-apb-timer + - const: snps,dw-apb-timer - const: snps,dw-apb-timer - enum: - snps,dw-apb-timer-sp @@ -21,9 +24,6 @@ properties: reg: maxItems: 1 =20 - interrupts: - maxItems: 1 - resets: maxItems: 1 =20 @@ -41,7 +41,23 @@ properties: =20 clock-frequency: true =20 -additionalProperties: false +unevaluatedProperties: false + +if: + properties: + compatible: + contains: + const: canaan,k210-apb-timer + +then: + properties: + interrupts: + maxItems: 2 + +else: + properties: + interrupts: + maxItems: 1 =20 required: - compatible @@ -60,8 +76,8 @@ oneOf: examples: - | timer@ffe00000 { - compatible =3D "snps,dw-apb-timer"; - interrupts =3D <0 170 4>; + compatible =3D "canaan,k210-apb-timer", "snps,dw-apb-timer"; + interrupts =3D <0 170 4>, <0 170 4>; reg =3D <0xffe00000 0x1000>; clocks =3D <&timer_clk>, <&timer_pclk>; clock-names =3D "timer", "pclk"; --=20 2.36.1 From nobody Mon Apr 27 02:05:12 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AFC74C433EF for ; Sat, 18 Jun 2022 12:32:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235151AbiFRMcu (ORCPT ); Sat, 18 Jun 2022 08:32:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234444AbiFRMcL (ORCPT ); Sat, 18 Jun 2022 08:32:11 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 524C81D315 for ; Sat, 18 Jun 2022 05:32:10 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id q9so8799732wrd.8 for ; Sat, 18 Jun 2022 05:32:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=conchuod.ie; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Xc3yLaPJl3fJMhU7mLPNTXUDP5YmMspTrPH6skgYH5k=; b=WWI5aigpx63NXABwWobIVtxzeWyDWABcTlqhEd7p5galGx1leb4l0QUX6DRW4V7R2/ 7tCNkKvAuMxDi861SOauKvR8OiOrKRFQWKbf/UOyK4ZoNWlOxvSKeVmw3Pjw/ViKSDBb bJGQhxOX2sak4JARX2cUY3oHghGpdM5DQO1bngmpG9k9r1Q9YO+8El+G/rDrBCypfz88 jYj4Hwbu5WXw7XC7sEypXuV849AqQEAwqdgU0LsiCYfp++8WMxNxdrDQLMOhAiSs1NIp AxnI+k8juFNCyik85P9Aotl91uS4CXhVavQDoNI3Z5E9qqRGU5RemiTnsiZNhX6+GfbW +y3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Xc3yLaPJl3fJMhU7mLPNTXUDP5YmMspTrPH6skgYH5k=; b=sc3PzBtHtrRmbuz+tXAc8ffwHqBHztKv3JcCVUxWIrI1JxF2QPs0sMBi5wWLGePTZZ G2nbNUgfORzb74uY8KoSSxrCpg+9qbLWUBe+DMDFcauzK5cWstdIjPI1u/Cyw2aSjzM2 c+1MXrW6XCpgRtj726euCXluDVHrlon4Gv64POIncc3TYmXlgXlmEK4K1ZG9lX2GZuWU iGGhhvODwufhhO1EEVpvMFbUh8uMA4/VToiHib8uHocRJkOVXweULPxgY9XVGUmfgXuZ gRceqiKiq/efOB3+q4VRN+VsvJgg94IoF+PLXBlomqs5voO8XbCWIfkdzzYA2M+EbfSS vrug== X-Gm-Message-State: AJIora83vR5DCVW0FrXtoDdDyhn226+6Osvn6F7x49IE4StpOaGO1EYW DAC/j8r6FkhMrsNsa8VfblbLjQ== X-Google-Smtp-Source: AGRyM1vjUOgV8azxYb57OQztWrqMQYhc0lprasxXMnlkIZhmfHP3nu/9sasVI2/ycyhjwJt5Z7ma0Q== X-Received: by 2002:a05:6000:1789:b0:219:2aa8:7159 with SMTP id e9-20020a056000178900b002192aa87159mr13617696wrg.474.1655555529797; Sat, 18 Jun 2022 05:32:09 -0700 (PDT) Received: from henark71.. ([51.37.234.167]) by smtp.gmail.com with ESMTPSA id az10-20020adfe18a000000b00210396b2eaesm9292305wrb.45.2022.06.18.05.32.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jun 2022 05:32:09 -0700 (PDT) From: Conor Dooley To: David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Thierry Reding , Sam Ravnborg , Eugeniy Paltsev , Vinod Koul , Liam Girdwood , Mark Brown , Serge Semin , Daniel Lezcano , Palmer Dabbelt , Palmer Dabbelt Cc: Thomas Gleixner , Paul Walmsley , Albert Ou , Conor Dooley , Masahiro Yamada , Damien Le Moal , Geert Uytterhoeven , Niklas Cassel , Dillon Min , Heng Sia , Jose Abreu , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, alsa-devel@alsa-project.org, linux-spi@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH 06/14] spi: dt-bindings: dw-apb-ssi: update spi-{r,t}x-bus-width for dwc-ssi Date: Sat, 18 Jun 2022 13:30:28 +0100 Message-Id: <20220618123035.563070-7-mail@conchuod.ie> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220618123035.563070-1-mail@conchuod.ie> References: <20220618123035.563070-1-mail@conchuod.ie> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Conor Dooley snps,dwc-ssi-1.01a has a single user - the Canaan k210, which uses a width of 4 for spi-{r,t}x-bus-width. Update the binding to reflect this. Signed-off-by: Conor Dooley --- .../bindings/spi/snps,dw-apb-ssi.yaml | 48 ++++++++++++++----- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml b/D= ocumentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml index e25d44c218f2..f2b9e3f062cd 100644 --- a/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml +++ b/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml @@ -135,19 +135,41 @@ properties: of the designware controller, and the upper limit is also subject to controller configuration. =20 -patternProperties: - "^.*@[0-9a-f]+$": - type: object - properties: - reg: - minimum: 0 - maximum: 3 - - spi-rx-bus-width: - const: 1 - - spi-tx-bus-width: - const: 1 +if: + properties: + compatible: + contains: + const: snps,dwc-ssi-1.01a + +then: + patternProperties: + "^.*@[0-9a-f]+$": + type: object + properties: + reg: + minimum: 0 + maximum: 3 + + spi-rx-bus-width: + const: 4 + + spi-tx-bus-width: + const: 4 + +else: + patternProperties: + "^.*@[0-9a-f]+$": + type: object + properties: + reg: + minimum: 0 + maximum: 3 + + spi-rx-bus-width: + const: 1 + + spi-tx-bus-width: + const: 1 =20 unevaluatedProperties: false =20 --=20 2.36.1 From nobody Mon Apr 27 02:05:12 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 198D2C433EF for ; Sat, 18 Jun 2022 12:32:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235638AbiFRMcz (ORCPT ); Sat, 18 Jun 2022 08:32:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234375AbiFRMcU (ORCPT ); Sat, 18 Jun 2022 08:32:20 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A28D1DA51 for ; Sat, 18 Jun 2022 05:32:12 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id o8so8815224wro.3 for ; Sat, 18 Jun 2022 05:32:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=conchuod.ie; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qmSWtWUd+mMy8ZYoZTgQjYDztLIGNDdvta+tk149+dY=; b=dM4LDKg5XtY0Inv2LgZSsQ50IPuzGfCzEsvHlFQ/2NLIm/6++fbLLGSB9koJgwMTjp 07IF9XMy4P4HaeMA1yfSnaPY3CYXQ+u0Kv6ZrDa4GjATk93Wx2p5DeaQw29BenmArCiz I6simFjZ6ZTWhMpFS4z5vR9LZUvOOE+DqLAunuoSePBDY5dNABj/iCXgooJ7JUM1Gx2w oJTVRWFtg+XkkdFP3+9IwXZt69jucggKlNwGuChB7WxmXKdl5k9lj8f8ITLIpfckoFQS YaBPUVjvUVp7mpO9D9wZzFoEi6tceysbIOAoKo4R7lpk7QqiW4+Bkh5CqE2X/nDML5P4 Wj6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qmSWtWUd+mMy8ZYoZTgQjYDztLIGNDdvta+tk149+dY=; b=fllj/Z9iB4Nelkd9Q3tsZb0vfY2mQS84uLJ7nDZIHWjQW2F16j+wREKcJxZAMmbmsn E1MgY9BycYBZNFvmc1i47seaPHh1qql5ZPvJOCxdTvySl3eSE9a523zGbPb9kCZDdgF1 GbndGzqJwnZ/MI8BtwZbG0TBP5xXgATyEu3PhE1Y/Dz5nm0hZPKrbQ28XDDa6HEj/mpr t3Mhp81i+/H8wddPJh5HBFRaIUs9Bt3PN2Cuie5DehL16Cg1FsLN7HW7CzgAlzZbSXKh 65s2RgOPhcn8ThjwTlobXIw+dVLnMF2bniqmzn6bwzc68Wfe+aT1SQs4eS1l0WgPjBw7 WjnQ== X-Gm-Message-State: AJIora8TKUJKziftGIrlJZoHiJ9KKdctLbLhTSALYHYrBJ2UJdCIXJww S5p9fTZMUrkiuiSJuUiupJVkWA== X-Google-Smtp-Source: AGRyM1sfPQ5XTH8REWSlcNVbh+KVLu6pjXz8b6gchhSbSGxDuCamFh0CMH0mba5q/rzWCUN22eIJUA== X-Received: by 2002:a05:6000:1b03:b0:210:3372:2bd9 with SMTP id f3-20020a0560001b0300b0021033722bd9mr14215037wrz.704.1655555531747; Sat, 18 Jun 2022 05:32:11 -0700 (PDT) Received: from henark71.. ([51.37.234.167]) by smtp.gmail.com with ESMTPSA id az10-20020adfe18a000000b00210396b2eaesm9292305wrb.45.2022.06.18.05.32.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jun 2022 05:32:11 -0700 (PDT) From: Conor Dooley To: David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Thierry Reding , Sam Ravnborg , Eugeniy Paltsev , Vinod Koul , Liam Girdwood , Mark Brown , Serge Semin , Daniel Lezcano , Palmer Dabbelt , Palmer Dabbelt Cc: Thomas Gleixner , Paul Walmsley , Albert Ou , Conor Dooley , Masahiro Yamada , Damien Le Moal , Geert Uytterhoeven , Niklas Cassel , Dillon Min , Heng Sia , Jose Abreu , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, alsa-devel@alsa-project.org, linux-spi@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH 07/14] riscv: dts: canaan: fix the k210's memory node Date: Sat, 18 Jun 2022 13:30:29 +0100 Message-Id: <20220618123035.563070-8-mail@conchuod.ie> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220618123035.563070-1-mail@conchuod.ie> References: <20220618123035.563070-1-mail@conchuod.ie> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Conor Dooley The k210 memory node has a compatible string that does not match with any driver or dt-binding & has several non standard properties. Replace the reg names with a comment and delete the rest. Signed-off-by: Conor Dooley --- --- arch/riscv/boot/dts/canaan/k210.dtsi | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/riscv/boot/dts/canaan/k210.dtsi b/arch/riscv/boot/dts/can= aan/k210.dtsi index 44d338514761..287ea6eebe47 100644 --- a/arch/riscv/boot/dts/canaan/k210.dtsi +++ b/arch/riscv/boot/dts/canaan/k210.dtsi @@ -69,15 +69,9 @@ cpu1_intc: interrupt-controller { =20 sram: memory@80000000 { device_type =3D "memory"; - compatible =3D "canaan,k210-sram"; reg =3D <0x80000000 0x400000>, <0x80400000 0x200000>, <0x80600000 0x200000>; - reg-names =3D "sram0", "sram1", "aisram"; - clocks =3D <&sysclk K210_CLK_SRAM0>, - <&sysclk K210_CLK_SRAM1>, - <&sysclk K210_CLK_AI>; - clock-names =3D "sram0", "sram1", "aisram"; }; =20 clocks { --=20 2.36.1 From nobody Mon Apr 27 02:05:12 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 62888C43334 for ; Sat, 18 Jun 2022 12:33:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236252AbiFRMdC (ORCPT ); Sat, 18 Jun 2022 08:33:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235391AbiFRMcX (ORCPT ); Sat, 18 Jun 2022 08:32:23 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 53D581E3D3 for ; Sat, 18 Jun 2022 05:32:15 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id s21-20020a1cf215000000b0039ee8149524so2033158wmc.5 for ; Sat, 18 Jun 2022 05:32:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=conchuod.ie; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yCkvd1rq89W/6SrEihtrV93zPOh8bp4EvU/AesUDp5c=; b=aHjW5VkiLOJuMraDAkim12MSrvxYtcnkUa+6XugCv/phW+l8JDcGEqmFOjtiPLghjo iDjWHIMizesLDejsxE38i+OtY7WWj3x11BBfb0BRUdXpK4pu3MkmLgAa5dvPF4Y79U7L UBw2DK7UQ4hfNaYZxuStYUEYkp5i7TbAmelLvl2Ui/7w8TkzozVKIQaX5ZY57N429Zl0 xgWDMpxIW3ayHXhWUHqQjQuXwVBfy/ElkaLVd2hLdCEkKi4zy0N/eTrZ8OwQ4dltk65u J4kCuiGGXyE3akVz8UzRk2HQ3opmwMzKwoXk0plpXwMqySPXygB+SYToa/Kb5HF8Q3nD BP+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yCkvd1rq89W/6SrEihtrV93zPOh8bp4EvU/AesUDp5c=; b=LHW/8odfcJ6fSM5Gn365Kl7DehKrCzSoBthLuQ+fJH8yGZ6Qs4G/72eF0mRRIK7wpD XpGw5LJPiGwvJD+2vnF9+nTOuDHSxvI5Qm98gHMy9k5FKT/z+2WH9pCmKh7w0FqgNPoH l79H1nNpPBZoNepvVFDqSYkxEd+Yr/VKtw42GOCpQY/ECnFuS4+8+WhYq04ttCHZ1WYT NNZgPAD5D/JCDS54oGUOl9J/7PhTnwbW8yIEEx4Pnr7/DSZ3ByHUJYScfUclZon5Zd5h VxT9ZzMU3WELz5Rty4aqKYcSGRvSwldi939NN4ddsGmsyao0JAF/Z2dgW07YVFhdTdO1 z84w== X-Gm-Message-State: AJIora8sjj4sd4mD2SOu0z3ZShvgIdfIuAZQYtpyPqzNE3B0oUS9R8Xc xpmWJOBfS5YnCRwW/k8Bztsx3g== X-Google-Smtp-Source: AGRyM1s4BntBiZAtPtsynxF7uq+efiHJQnjp6f4ztefKsZzCsrAEC1MDiI+wsPar7tnOzz3WAfpCIg== X-Received: by 2002:a05:600c:1906:b0:39c:8573:f330 with SMTP id j6-20020a05600c190600b0039c8573f330mr15063952wmq.5.1655555533520; Sat, 18 Jun 2022 05:32:13 -0700 (PDT) Received: from henark71.. ([51.37.234.167]) by smtp.gmail.com with ESMTPSA id az10-20020adfe18a000000b00210396b2eaesm9292305wrb.45.2022.06.18.05.32.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jun 2022 05:32:12 -0700 (PDT) From: Conor Dooley To: David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Thierry Reding , Sam Ravnborg , Eugeniy Paltsev , Vinod Koul , Liam Girdwood , Mark Brown , Serge Semin , Daniel Lezcano , Palmer Dabbelt , Palmer Dabbelt Cc: Thomas Gleixner , Paul Walmsley , Albert Ou , Conor Dooley , Masahiro Yamada , Damien Le Moal , Geert Uytterhoeven , Niklas Cassel , Dillon Min , Heng Sia , Jose Abreu , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, alsa-devel@alsa-project.org, linux-spi@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH 08/14] riscv: dts: canaan: add a specific compatible for k210's dma Date: Sat, 18 Jun 2022 13:30:30 +0100 Message-Id: <20220618123035.563070-9-mail@conchuod.ie> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220618123035.563070-1-mail@conchuod.ie> References: <20220618123035.563070-1-mail@conchuod.ie> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Conor Dooley The DMAC on the k210 has a non standard interrupt configuration, which leads to dtbs_check warnings: k210_generic.dtb: dma-controller@50000000: interrupts: [[27], [28], [29], [= 30], [31], [32]] is too long From schema: linux/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.y= aml Update the binding to use a custom compatible to avoid the warning. Signed-off-by: Conor Dooley --- arch/riscv/boot/dts/canaan/k210.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/boot/dts/canaan/k210.dtsi b/arch/riscv/boot/dts/can= aan/k210.dtsi index 287ea6eebe47..314f6da5d7f6 100644 --- a/arch/riscv/boot/dts/canaan/k210.dtsi +++ b/arch/riscv/boot/dts/canaan/k210.dtsi @@ -135,7 +135,7 @@ gpio0: gpio-controller@38001000 { }; =20 dmac0: dma-controller@50000000 { - compatible =3D "snps,axi-dma-1.01a"; + compatible =3D "canaan,k210-axi-dma", "snps,axi-dma-1.01a"; reg =3D <0x50000000 0x1000>; interrupts =3D <27>, <28>, <29>, <30>, <31>, <32>; #dma-cells =3D <1>; --=20 2.36.1 From nobody Mon Apr 27 02:05:12 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4DB4BC43334 for ; Sat, 18 Jun 2022 12:33:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236195AbiFRMc7 (ORCPT ); Sat, 18 Jun 2022 08:32:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235398AbiFRMcX (ORCPT ); Sat, 18 Jun 2022 08:32:23 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB8F21E3D4 for ; Sat, 18 Jun 2022 05:32:15 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id n1so8558800wrg.12 for ; Sat, 18 Jun 2022 05:32:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=conchuod.ie; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ANXJKxbxI6u0tRhbN1AR4RFN+HN2j5iiePXGo5syCSs=; b=ErRXmSLorMjbdC5xWyP7urzRERR22/20eLl2XT0de71YUvLq9olsxJGpQ3PYt53udC MVVWn2OjFLzgo73dqk3/65ggchSO1J6/nfMBeW38N005pku7I4zSrpTv/zuaPfLKqJXk qjB07OxZX64wGSSlEDl91/abWVL2GYNDo4+scSLK83C9i4JROcieRdmp2gRhc8Fbnv7b b+9kOPXlfRJAEYkP1FzaLttvE+ReKggwoO5cB1Sf7ynv7N/LnmCtOMTXn+ccH3yxMsLw zDc7cjrPkXazBBOkKzNLuqxuVA3FOYoudEVTiel9Zmf2Ygdp7uXNnHjAvJ2fnRfqPbuk SpFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ANXJKxbxI6u0tRhbN1AR4RFN+HN2j5iiePXGo5syCSs=; b=yi+8qC4tAvDgX2s38+Lu9XLS+NZSWtTLmNxCFE9x6OPJdoVuXsjUgs8pOuHd1jSE5c aIu8wBbvYmX0DECJ8oJLsX/nEy2JiO2hG8DsnZYTQL+f5ncvLSDCLRrPfn3GIOnBD7Hd tQCxyHjQSesci3jHBVvieAwlqqqHTmE/QJ1rw66SlDk+SKrzGQPGr/AOHccpuS35GN0W An7eRdQhj1GMrZCg/nK1QEjNuJbXJgsxsmBWXW1JI/tsQCJhnfDkPUs2HOlp7SOYg8rB mC4cja8wdhLpVK+TlMB5B/0+WYix2kuWSkS9Jvx6QLBswrCzlXZ4SkedTlxnMwnA23Qy tFbg== X-Gm-Message-State: AJIora/sOi7Zwl6fOrMGk74LHzZktkvYCssQ8/zM9/vXRxAD+bDd9DlY 3Bu3oPNo7cg92cQqMuXeiuHJDA== X-Google-Smtp-Source: AGRyM1tbrkXYGfjWsBsEjmtzpjiA7Ap83fqu9IJcwCnfQzpYaSuFuxLt2MogvQUzBnMlTPtFn6izqg== X-Received: by 2002:a5d:584d:0:b0:216:a2a9:5f2c with SMTP id i13-20020a5d584d000000b00216a2a95f2cmr14168978wrf.184.1655555535278; Sat, 18 Jun 2022 05:32:15 -0700 (PDT) Received: from henark71.. ([51.37.234.167]) by smtp.gmail.com with ESMTPSA id az10-20020adfe18a000000b00210396b2eaesm9292305wrb.45.2022.06.18.05.32.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jun 2022 05:32:14 -0700 (PDT) From: Conor Dooley To: David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Thierry Reding , Sam Ravnborg , Eugeniy Paltsev , Vinod Koul , Liam Girdwood , Mark Brown , Serge Semin , Daniel Lezcano , Palmer Dabbelt , Palmer Dabbelt Cc: Thomas Gleixner , Paul Walmsley , Albert Ou , Conor Dooley , Masahiro Yamada , Damien Le Moal , Geert Uytterhoeven , Niklas Cassel , Dillon Min , Heng Sia , Jose Abreu , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, alsa-devel@alsa-project.org, linux-spi@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH 09/14] riscv: dts: canaan: add a specific compatible for k210's timers Date: Sat, 18 Jun 2022 13:30:31 +0100 Message-Id: <20220618123035.563070-10-mail@conchuod.ie> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220618123035.563070-1-mail@conchuod.ie> References: <20220618123035.563070-1-mail@conchuod.ie> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Conor Dooley The timers on the k210 have non standard interrupt configurations, which leads to dtbs_check warnings: k210_generic.dtb: timer@502d0000: interrupts: [[14], [15]] is too long From schema: Documentation/devicetree/bindings/timer/snps,dw-apb-timer.yaml Change to using the newly added canaan k210 specific binding to avoid the warning. Signed-off-by: Conor Dooley --- arch/riscv/boot/dts/canaan/k210.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/riscv/boot/dts/canaan/k210.dtsi b/arch/riscv/boot/dts/can= aan/k210.dtsi index 314f6da5d7f6..ef46ddf3c00c 100644 --- a/arch/riscv/boot/dts/canaan/k210.dtsi +++ b/arch/riscv/boot/dts/canaan/k210.dtsi @@ -310,7 +310,7 @@ fpioa: pinmux@502b0000 { }; =20 timer0: timer@502d0000 { - compatible =3D "snps,dw-apb-timer"; + compatible =3D "canaan,k210-apb-timer", "snps,dw-apb-timer"; reg =3D <0x502D0000 0x100>; interrupts =3D <14>, <15>; clocks =3D <&sysclk K210_CLK_TIMER0>, @@ -320,7 +320,7 @@ timer0: timer@502d0000 { }; =20 timer1: timer@502e0000 { - compatible =3D "snps,dw-apb-timer"; + compatible =3D "canaan,k210-apb-timer", "snps,dw-apb-timer"; reg =3D <0x502E0000 0x100>; interrupts =3D <16>, <17>; clocks =3D <&sysclk K210_CLK_TIMER1>, @@ -330,7 +330,7 @@ timer1: timer@502e0000 { }; =20 timer2: timer@502f0000 { - compatible =3D "snps,dw-apb-timer"; + compatible =3D "canaan,k210-apb-timer", "snps,dw-apb-timer"; reg =3D <0x502F0000 0x100>; interrupts =3D <18>, <19>; clocks =3D <&sysclk K210_CLK_TIMER2>, --=20 2.36.1 From nobody Mon Apr 27 02:05:12 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2BA2CC43334 for ; Sat, 18 Jun 2022 12:33:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236348AbiFRMdL (ORCPT ); Sat, 18 Jun 2022 08:33:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235554AbiFRMcZ (ORCPT ); Sat, 18 Jun 2022 08:32:25 -0400 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB1841EAC0 for ; Sat, 18 Jun 2022 05:32:18 -0700 (PDT) Received: by mail-wm1-x32c.google.com with SMTP id j5-20020a05600c1c0500b0039c5dbbfa48so5555065wms.5 for ; Sat, 18 Jun 2022 05:32:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=conchuod.ie; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hRUbJk2nRy4s5CIJwi9VsR0jeyH/n7EOc4sICxWxXyQ=; b=bhD31hG1IqRZiTVI7PGE75Ozpn0ZL75oApBble/77rs/x6j7Yj0P44fPfNnU7vhVUY nCjZMXxWsTk0A61dgIyHtvcMlkUKqozbRvB64rHl/1QTd2jL/SWVTA2Y2ndXS0ZqhK4S r9aFcMkRXpG9sUoBVLmgJheYo4olnTUwQPZVfeHRImZxUkokJecGSOgHC/rYW/i1Ng8a J62jSu9bj5d3BTplW1G7IvlHfdW0zGfdAEhQ8IJXKKHoaeeUEsv3cwY2C56pbw+EFDRT Px2zfYaeM76WmKCsR+FKXUs2W3XDiaxFj/ATwEYBX9PdDmUTbV3rwLoFdXHfn/aL4RDD bpaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hRUbJk2nRy4s5CIJwi9VsR0jeyH/n7EOc4sICxWxXyQ=; b=cb+WsYJMZUty7vK/CFBI8Tw3Z1LTgvndCITWBZufcpYsHvigMya/zCL60dim2nNR5G dftNpDOKJ9PLvxH7MfpxvR1Mx3aclmqK+E43YwSLP+MjoPCo1mFxwaXHzHVeLoGOtahT Jy+Tcoi25UvVtOyRnH2WZfUg0bIKNIjV/Le4wio7bp4zt4dOc9QZPM9OnhGqmL/uEN5y kR5+zG/ayPMhIOg+qenrFw6xJXgA8uqR9T1ipW2g1LKyWpBphfG1dwmPa4d29rpSRuUG cbPoAwTeztTJBxPADXLaINkS4TWY4o7E3t9NNxf/Fv5ylmV3gmm8f2QBDE+DQY17o8Uz 3gqw== X-Gm-Message-State: AJIora8qoTnkuB2zG0qBY0/ERzPAXpcs3FbDbZJqSzO5TqzhWttIcVav LZfDkgi0TBm8wJ/GmGWSBgx+TA== X-Google-Smtp-Source: AGRyM1vrfCLD3Ztbth3Hr/dYyMBMcGJMbeidx+6HhuS1VFlnoKH5xZoqGBvj1wkYgukALt4oQZ1Dvg== X-Received: by 2002:a05:600c:3ba8:b0:39c:5bba:5406 with SMTP id n40-20020a05600c3ba800b0039c5bba5406mr15029119wms.120.1655555537181; Sat, 18 Jun 2022 05:32:17 -0700 (PDT) Received: from henark71.. ([51.37.234.167]) by smtp.gmail.com with ESMTPSA id az10-20020adfe18a000000b00210396b2eaesm9292305wrb.45.2022.06.18.05.32.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jun 2022 05:32:16 -0700 (PDT) From: Conor Dooley To: David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Thierry Reding , Sam Ravnborg , Eugeniy Paltsev , Vinod Koul , Liam Girdwood , Mark Brown , Serge Semin , Daniel Lezcano , Palmer Dabbelt , Palmer Dabbelt Cc: Thomas Gleixner , Paul Walmsley , Albert Ou , Conor Dooley , Masahiro Yamada , Damien Le Moal , Geert Uytterhoeven , Niklas Cassel , Dillon Min , Heng Sia , Jose Abreu , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, alsa-devel@alsa-project.org, linux-spi@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH 10/14] riscv: dts: canaan: fix mmc node names Date: Sat, 18 Jun 2022 13:30:32 +0100 Message-Id: <20220618123035.563070-11-mail@conchuod.ie> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220618123035.563070-1-mail@conchuod.ie> References: <20220618123035.563070-1-mail@conchuod.ie> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Conor Dooley The newly-converted-to-dt-schema binding expects the mmc node name to be '^mmc(@.*)?$' so align the devicetree with the schema. Signed-off-by: Conor Dooley --- arch/riscv/boot/dts/canaan/canaan_kd233.dts | 2 +- arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts | 2 +- arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts | 2 +- arch/riscv/boot/dts/canaan/sipeed_maix_go.dts | 2 +- arch/riscv/boot/dts/canaan/sipeed_maixduino.dts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/riscv/boot/dts/canaan/canaan_kd233.dts b/arch/riscv/boot/= dts/canaan/canaan_kd233.dts index 039b92abf046..40992d495aa8 100644 --- a/arch/riscv/boot/dts/canaan/canaan_kd233.dts +++ b/arch/riscv/boot/dts/canaan/canaan_kd233.dts @@ -142,7 +142,7 @@ &spi1 { cs-gpios =3D <&gpio0 16 GPIO_ACTIVE_LOW>; status =3D "okay"; =20 - slot@0 { + mmc@0 { compatible =3D "mmc-spi-slot"; reg =3D <0>; voltage-ranges =3D <3300 3300>; diff --git a/arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts b/arch/riscv/bo= ot/dts/canaan/sipeed_maix_bit.dts index b9e30df127fe..5e809d0e11fb 100644 --- a/arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts +++ b/arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts @@ -189,7 +189,7 @@ &spi1 { cs-gpios =3D <&gpio0 13 GPIO_ACTIVE_LOW>; status =3D "okay"; =20 - slot@0 { + mmc@0 { compatible =3D "mmc-spi-slot"; reg =3D <0>; voltage-ranges =3D <3300 3300>; diff --git a/arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts b/arch/riscv/b= oot/dts/canaan/sipeed_maix_dock.dts index 8d23401b0bbb..4be5ffac6b4a 100644 --- a/arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts +++ b/arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts @@ -191,7 +191,7 @@ &spi1 { cs-gpios =3D <&gpio0 13 GPIO_ACTIVE_LOW>; status =3D "okay"; =20 - slot@0 { + mmc@0 { compatible =3D "mmc-spi-slot"; reg =3D <0>; voltage-ranges =3D <3300 3300>; diff --git a/arch/riscv/boot/dts/canaan/sipeed_maix_go.dts b/arch/riscv/boo= t/dts/canaan/sipeed_maix_go.dts index 24fd83b43d9d..5c63f79b18ec 100644 --- a/arch/riscv/boot/dts/canaan/sipeed_maix_go.dts +++ b/arch/riscv/boot/dts/canaan/sipeed_maix_go.dts @@ -199,7 +199,7 @@ &spi1 { cs-gpios =3D <&gpio0 13 GPIO_ACTIVE_LOW>; status =3D "okay"; =20 - slot@0 { + mmc@0 { compatible =3D "mmc-spi-slot"; reg =3D <0>; voltage-ranges =3D <3300 3300>; diff --git a/arch/riscv/boot/dts/canaan/sipeed_maixduino.dts b/arch/riscv/b= oot/dts/canaan/sipeed_maixduino.dts index 25341f38292a..59f7eaf74655 100644 --- a/arch/riscv/boot/dts/canaan/sipeed_maixduino.dts +++ b/arch/riscv/boot/dts/canaan/sipeed_maixduino.dts @@ -164,7 +164,7 @@ &spi1 { cs-gpios =3D <&gpio1_0 2 GPIO_ACTIVE_LOW>; status =3D "okay"; =20 - slot@0 { + mmc@0 { compatible =3D "mmc-spi-slot"; reg =3D <0>; voltage-ranges =3D <3300 3300>; --=20 2.36.1 From nobody Mon Apr 27 02:05:12 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 478A8C43334 for ; Sat, 18 Jun 2022 12:33:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237210AbiFRMdZ (ORCPT ); Sat, 18 Jun 2022 08:33:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235652AbiFRMc0 (ORCPT ); Sat, 18 Jun 2022 08:32:26 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3ED241EADA for ; Sat, 18 Jun 2022 05:32:20 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id m1so1046169wrb.2 for ; Sat, 18 Jun 2022 05:32:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=conchuod.ie; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1RrlYN7xRo44UoZQ9vXu2CHD6ouZYfkPgpPQl3XW2/Q=; b=BPAP4EOMpcTLtigvaPPAmrkhyUhM2es3mn99xXabOD36beL2UV5x4oZfV2njhaHRDu 6CJGk2QVhn6oPqlOR2djhrL2247MI0pKKag+FDbmQ4H1hZD3+mmDz6hqN32wihfedwv8 0JY3Dc3Cdrb0deOAs1Y2GOWa/xJwK81U2UBuCQMBHxKmg45ip5zSneSbL7BpIz3+F9U/ HD9dL2+AWfZ418nW0lUl3ciiJOF84+lcioBfjjBShBTDpTsuwqj7tIBkBiNbmNeX1w9i bBklT1NVM2cTV5b3a0VEOCSBXAlFbb9ESoUAC/KWlmIDjjTCsZX275Q9n2aNWJYhq+7O e64Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1RrlYN7xRo44UoZQ9vXu2CHD6ouZYfkPgpPQl3XW2/Q=; b=es66CRWHm7/IMy+gtcjZaky4Ae1C3vKc1EliWqFkQeOyWsvITEt0Is9x/AFWJJeAa5 CABoW65H+a+rIY3t+fchzhSQVgSHbC3f0ldisXbCO6setDn7oYiQ7Lo+x4TLjI2xSC5Y kRdL9j3Swg9VM00Vm+6OyYO89A38R478Qe1ITn7QyirjsmnKfAh6Yy+XT1/Xht7Rz6dv O46ouw78v+pQUZYCd1UvhWAR9Kmn5+Jm7NDrDIPq8T2CZfUvkQOVV/ZCznR9u2qsVrX5 Kw+yDL0ggQkxwDWAfYafTpv48gkCTqgBvqcneJIYZCh+JDILsbc9Cg/sk0qVPXGTE/vn EEMw== X-Gm-Message-State: AJIora/bKdneYcMucgco7mlpT/KkvZ1RoE8Psi4jFu1+WqKDOZBqCc/H rqHvmGNPskTfKsCupvoBNz1Hcg== X-Google-Smtp-Source: AGRyM1uZgNeRAWVSfV/hT8p8ffzeOsYwkUHkdfjgJGx3PbBuSC2KESMglEYy9aDYjH9MqXxklw0uUQ== X-Received: by 2002:a05:6000:695:b0:21a:3a1a:7b60 with SMTP id bo21-20020a056000069500b0021a3a1a7b60mr10579808wrb.441.1655555539583; Sat, 18 Jun 2022 05:32:19 -0700 (PDT) Received: from henark71.. ([51.37.234.167]) by smtp.gmail.com with ESMTPSA id az10-20020adfe18a000000b00210396b2eaesm9292305wrb.45.2022.06.18.05.32.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jun 2022 05:32:18 -0700 (PDT) From: Conor Dooley To: David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Thierry Reding , Sam Ravnborg , Eugeniy Paltsev , Vinod Koul , Liam Girdwood , Mark Brown , Serge Semin , Daniel Lezcano , Palmer Dabbelt , Palmer Dabbelt Cc: Thomas Gleixner , Paul Walmsley , Albert Ou , Conor Dooley , Masahiro Yamada , Damien Le Moal , Geert Uytterhoeven , Niklas Cassel , Dillon Min , Heng Sia , Jose Abreu , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, alsa-devel@alsa-project.org, linux-spi@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH 11/14] riscv: dts: canaan: fix kd233 display spi frequency Date: Sat, 18 Jun 2022 13:30:33 +0100 Message-Id: <20220618123035.563070-12-mail@conchuod.ie> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220618123035.563070-1-mail@conchuod.ie> References: <20220618123035.563070-1-mail@conchuod.ie> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Conor Dooley The binding for the ili9341 specifies a const spi-max-frequency of 10 MHz but the kd233 devicetree entry has it listed at 15 Mhz. Align the devicetree with the value in the binding. Signed-off-by: Conor Dooley --- arch/riscv/boot/dts/canaan/canaan_kd233.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/boot/dts/canaan/canaan_kd233.dts b/arch/riscv/boot/= dts/canaan/canaan_kd233.dts index 40992d495aa8..4a540158f287 100644 --- a/arch/riscv/boot/dts/canaan/canaan_kd233.dts +++ b/arch/riscv/boot/dts/canaan/canaan_kd233.dts @@ -130,7 +130,7 @@ panel@0 { compatible =3D "ilitek,ili9341"; reg =3D <0>; dc-gpios =3D <&gpio0 21 GPIO_ACTIVE_HIGH>; - spi-max-frequency =3D <15000000>; + spi-max-frequency =3D <10000000>; status =3D "disabled"; }; }; --=20 2.36.1 From nobody Mon Apr 27 02:05:12 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D6E4CCA480 for ; Sat, 18 Jun 2022 12:35:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234601AbiFRMfT (ORCPT ); Sat, 18 Jun 2022 08:35:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235834AbiFRMc0 (ORCPT ); Sat, 18 Jun 2022 08:32:26 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1B541EAEE for ; Sat, 18 Jun 2022 05:32:21 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id o16so8802665wra.4 for ; Sat, 18 Jun 2022 05:32:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=conchuod.ie; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xINpJVKkZcc5JKohFXfQpBMJJJBAJkhRdFvXLAdWINc=; b=V5PCq8ERofmOM5w5PRA0gL0n8OYBdm40lWb/asUOIntNfey82bGRsIn/7z+pxrNbjf 4HTP30/j7DUAESFSB807hhF4Bn26V6IuYZIKFHoYEcp2foIsgjbMA8wAurn/dzRXLewU 52ItLX9xQP38z8uMvLEfCM20A/gU6lUTh3j5F2TLw9cN7r3egdv+mFSv6ttkSKGiktCM 4cZy3+rmKIWV13Hk4eddQtK9JA4//kbz9TiLmNmn6H/45fTkDeYaDf5zd/9LWbt7E4MA qvUYvHicfErpLqf59Y2120u88J/KmXmj/YaQstAYe0YdqaXfHU8uztd1zwCarccd64Pm J8+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xINpJVKkZcc5JKohFXfQpBMJJJBAJkhRdFvXLAdWINc=; b=3g27wCF0AA4jMr3OgoBlkiYaqeR8NI/awvw3Mm+ElTbg9uMUDJ8nDkpYo0T/MwG0Cq sQ5qTnQX5RJiJ4Hf5vEIX58rSs3oMSB3JdwEbYvaObY4Kj3TNHx3GBs5tkZu59MdGjYm 67wFi243GPmcWu9+q8OcsiwbgIW2IEw07nVggiuIIIPqBSl9V5TOb1zDDAukcVCQ3EJE IKOKt9xUl9NhMFsV1XKopdoGwLPzuSgeVtfYkmg0W+Cvv/Qsc//BdzdQ+GxHB0wqqLL2 e8UxOzLrclJjKGJRbWeKxX/MhCbus1Tn7ZxKPqqzfyZ0Vt8/mfQomzJejhrwRvf9dxi7 QLLw== X-Gm-Message-State: AJIora8nGe1v7PgeF49cqaEC0XuhF3y1z1VSMoBQ17CM4axuN9p4/MDV 42S0jMsEmNhaNWlxIzb/+iV3WA== X-Google-Smtp-Source: AGRyM1v9n76uzuiNQWIsMBMB4JQ7qpatVYHsEQGM4nI7CyfeZc8UgP+B/KjNDavOA6Fd5fJcVw4QCQ== X-Received: by 2002:a05:6000:1b03:b0:216:43b4:82f1 with SMTP id f3-20020a0560001b0300b0021643b482f1mr13888381wrz.232.1655555541458; Sat, 18 Jun 2022 05:32:21 -0700 (PDT) Received: from henark71.. ([51.37.234.167]) by smtp.gmail.com with ESMTPSA id az10-20020adfe18a000000b00210396b2eaesm9292305wrb.45.2022.06.18.05.32.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jun 2022 05:32:20 -0700 (PDT) From: Conor Dooley To: David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Thierry Reding , Sam Ravnborg , Eugeniy Paltsev , Vinod Koul , Liam Girdwood , Mark Brown , Serge Semin , Daniel Lezcano , Palmer Dabbelt , Palmer Dabbelt Cc: Thomas Gleixner , Paul Walmsley , Albert Ou , Conor Dooley , Masahiro Yamada , Damien Le Moal , Geert Uytterhoeven , Niklas Cassel , Dillon Min , Heng Sia , Jose Abreu , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, alsa-devel@alsa-project.org, linux-spi@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH 12/14] riscv: dts: canaan: use custom compatible for k210 i2s Date: Sat, 18 Jun 2022 13:30:34 +0100 Message-Id: <20220618123035.563070-13-mail@conchuod.ie> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220618123035.563070-1-mail@conchuod.ie> References: <20220618123035.563070-1-mail@conchuod.ie> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Conor Dooley The devicetrees using the Canaan k210 all have a sound-dai-cells value of 1, whereas the standard binding example for the DesignWare i2s and other use cases suggest 0. Use a k210 specific compatible which supports this difference. Signed-off-by: Conor Dooley --- arch/riscv/boot/dts/canaan/k210.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/riscv/boot/dts/canaan/k210.dtsi b/arch/riscv/boot/dts/can= aan/k210.dtsi index ef46ddf3c00c..5eb6b69c1170 100644 --- a/arch/riscv/boot/dts/canaan/k210.dtsi +++ b/arch/riscv/boot/dts/canaan/k210.dtsi @@ -243,7 +243,7 @@ spi2: spi@50240000 { }; =20 i2s0: i2s@50250000 { - compatible =3D "snps,designware-i2s"; + compatible =3D "canaan,k210-i2s", "snps,designware-i2s"; reg =3D <0x50250000 0x200>; interrupts =3D <5>; clocks =3D <&sysclk K210_CLK_I2S0>; @@ -252,7 +252,7 @@ i2s0: i2s@50250000 { }; =20 i2s1: i2s@50260000 { - compatible =3D "snps,designware-i2s"; + compatible =3D "canaan,k210-i2s", "snps,designware-i2s"; reg =3D <0x50260000 0x200>; interrupts =3D <6>; clocks =3D <&sysclk K210_CLK_I2S1>; @@ -261,7 +261,7 @@ i2s1: i2s@50260000 { }; =20 i2s2: i2s@50270000 { - compatible =3D "snps,designware-i2s"; + compatible =3D "canaan,k210-i2s", "snps,designware-i2s"; reg =3D <0x50270000 0x200>; interrupts =3D <7>; clocks =3D <&sysclk K210_CLK_I2S2>; --=20 2.36.1 From nobody Mon Apr 27 02:05:12 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03D87C43334 for ; Sat, 18 Jun 2022 12:33:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236538AbiFRMd4 (ORCPT ); Sat, 18 Jun 2022 08:33:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235217AbiFRMcn (ORCPT ); Sat, 18 Jun 2022 08:32:43 -0400 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 095901EC40 for ; Sat, 18 Jun 2022 05:32:24 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id x6-20020a1c7c06000000b003972dfca96cso3548916wmc.4 for ; Sat, 18 Jun 2022 05:32:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=conchuod.ie; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Pg5EtL0V3UHrid7YbhvB+3zhrduzQGisX4A0SVhhM0E=; b=Pu1M106xN55HI9pfnOZNoRrDpjX1i4VH9bR0a4BhQ0DJdKnxN33JrDSsp8oMDBO6jp LVQ1VI+4atrButRPKUPNqCrIEigfT0IM8RSE/TM7b+yFCd8/4+xiDRZ3O7NsK9REtRLv 84xM29eeccO+uGrixFZq0EZFXZEdycBvA0ECOB3ZQETpwQOJCmoI57SPRa91RH4Ybiwn DHwH4ld25Q7R0o4T9qzfzLsKmjYB53l8b9saZnSz3GnJD24tqYxXVFcv/kp23HP9PpCH I+j/f4rZISdty/aA/Vg0TKDsifyuWEt2DZv8kvr86VvPeWNfHBmzINiITLTKs1DLpX1a cUAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Pg5EtL0V3UHrid7YbhvB+3zhrduzQGisX4A0SVhhM0E=; b=efxV0iMXaKQh1nDPaJA+UDDn7CqhdCHlxXXzx7S6aQQ+KyYVaV90ew9SogWzQsmrbD nekKCoEDf/EGGGGYMiGvx+p0ozczBd8kPvZjveRomOfuF/NeOqp97pwV3HZxTyJquK7L VPFNtFlUGHIvI83Z37bnSZBOtPo429Rb54vgzoYHPl2QtnSTK23hlfH7pVjMbPm0TZQK XGaYZflNsvKLd4VqIXbB/8wAZIb7fm824gqRiaso7uhXFAhIM9MURpaz3XFb3IoLMFBO 63nZ3w19Df3l7WTR2IZLAeDN62Fj0nn9OjKSmHlOwDr0Qa8Eu9pMMW9IKOTv+iUySzOg PpoA== X-Gm-Message-State: AJIora/u4FllZ//VAw6+bxgH6w0d/u1aAt3QtWjKMcXehGw1Jk1MqQKD BolGNBVCmQVSuR0K6y8E8H+EWw== X-Google-Smtp-Source: AGRyM1t+D1hSYvVv2lyhJXTM8fnBYLleL1Z3z4M3dP8UVmVZwbcohvWxMo8SxFiBx5Zo6H6ulo6zQw== X-Received: by 2002:a05:600c:3553:b0:39c:63a3:f54a with SMTP id i19-20020a05600c355300b0039c63a3f54amr15447271wmq.61.1655555543356; Sat, 18 Jun 2022 05:32:23 -0700 (PDT) Received: from henark71.. ([51.37.234.167]) by smtp.gmail.com with ESMTPSA id az10-20020adfe18a000000b00210396b2eaesm9292305wrb.45.2022.06.18.05.32.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jun 2022 05:32:22 -0700 (PDT) From: Conor Dooley To: David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Thierry Reding , Sam Ravnborg , Eugeniy Paltsev , Vinod Koul , Liam Girdwood , Mark Brown , Serge Semin , Daniel Lezcano , Palmer Dabbelt , Palmer Dabbelt Cc: Thomas Gleixner , Paul Walmsley , Albert Ou , Conor Dooley , Masahiro Yamada , Damien Le Moal , Geert Uytterhoeven , Niklas Cassel , Dillon Min , Heng Sia , Jose Abreu , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, alsa-devel@alsa-project.org, linux-spi@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH 13/14] riscv: dts: canaan: remove spi-max-frequency from controllers Date: Sat, 18 Jun 2022 13:30:35 +0100 Message-Id: <20220618123035.563070-14-mail@conchuod.ie> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220618123035.563070-1-mail@conchuod.ie> References: <20220618123035.563070-1-mail@conchuod.ie> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Conor Dooley spi-max-frequency is a device, not a controller property and should be removed. Link: https://lore.kernel.org/lkml/20220526014141.2872567-1-robh@kernel.org/ Signed-off-by: Conor Dooley --- arch/riscv/boot/dts/canaan/k210.dtsi | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/riscv/boot/dts/canaan/k210.dtsi b/arch/riscv/boot/dts/can= aan/k210.dtsi index 5eb6b69c1170..ec290db4705c 100644 --- a/arch/riscv/boot/dts/canaan/k210.dtsi +++ b/arch/riscv/boot/dts/canaan/k210.dtsi @@ -413,7 +413,6 @@ spi0: spi@52000000 { clock-names =3D "ssi_clk", "pclk"; resets =3D <&sysrst K210_RST_SPI0>; reset-names =3D "spi"; - spi-max-frequency =3D <25000000>; num-cs =3D <4>; reg-io-width =3D <4>; }; @@ -429,7 +428,6 @@ spi1: spi@53000000 { clock-names =3D "ssi_clk", "pclk"; resets =3D <&sysrst K210_RST_SPI1>; reset-names =3D "spi"; - spi-max-frequency =3D <25000000>; num-cs =3D <4>; reg-io-width =3D <4>; }; @@ -445,8 +443,7 @@ spi3: spi@54000000 { clock-names =3D "ssi_clk", "pclk"; resets =3D <&sysrst K210_RST_SPI3>; reset-names =3D "spi"; - /* Could possibly go up to 200 MHz */ - spi-max-frequency =3D <100000000>; + num-cs =3D <4>; reg-io-width =3D <4>; }; --=20 2.36.1 From nobody Mon Apr 27 02:05:12 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4937DC43334 for ; Sat, 18 Jun 2022 12:33:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235438AbiFRMdu (ORCPT ); Sat, 18 Jun 2022 08:33:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234641AbiFRMcq (ORCPT ); Sat, 18 Jun 2022 08:32:46 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A6F01DA76 for ; Sat, 18 Jun 2022 05:32:25 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id e25so4939360wrc.13 for ; Sat, 18 Jun 2022 05:32:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=conchuod.ie; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hvr7KGApLNCGFBglHD3dnfCRd3yjQwODkG+M5NRKmQI=; b=DDJ6xBBbhzIGoPiqSpo5MnWPGVLzU4ERv8vLSiBnnPAynNwKjWM49EcnFIFQEkgm/l doK52smtoMBCAMnt3+oFGMyw4xhf6W+5pMee3IBtco7DlzBypqqFxGPePkxlqPEw5tri SDLBm2agXeKviAcJotwY5RL1uBwFcjHga0K6SkH6mQCE6NwwTJxpZV0bQ6udBQCQ8t5X /ugUETlZEHQBi+kUxi5RSWCIVIQtoVjqwtn8FqK1wrZYFA5exI/WKKix1Zp5xujFsjOq WhKYuvAAICTLiFyGacSvPtjx9GD78ZZmFV4S8UwSg41UB0EBKvQ+vCEP9thO5HxmtSKW MnvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hvr7KGApLNCGFBglHD3dnfCRd3yjQwODkG+M5NRKmQI=; b=1vQaD2leVYcsghX4LnzskCDKPhPzUsi7WKs0h7jaq5sscYTUemRFxP0uPckHCqpqvQ uBdBuryVGGo1xy9YGMp9kfPFWP+4mRTPoRKGr9PdN64O61hAeAjdOGuNRxXFK/tL4VJV IU/7UQ2Dz3xEZ/SOQAGO86+M7NB+cAOOlOxbAF7Gxos8KAzSB8CtBehVPzkgBT6tAegu ffmHcoXCSeRa3lyl1kU9LmKv1eVrj/F4ZnQXEr4a10jPDJ70KBMNUh9uWWBVsV7NxsiD Mf5qo8Z5vX5DNU6AwfscEcDq8zWZbMWxKM+myeYP36D04BPbRTimOW9oZRWFcuJXRe5W 4HlA== X-Gm-Message-State: AJIora/17qtKFbhe+x9NrSjiMYsoYbS+rRlvcl7gxiQRdmc5CnvVaHUm m/g0KFYsW/gaeHrSxZm7zNvFwQ== X-Google-Smtp-Source: AGRyM1sRT/G1/Zc62fYFm4YsukPkHZCuylsLgzzu2NtDF1otkPHXpMjCG/oHMIlIy5/3wMzfMLCUWA== X-Received: by 2002:a05:6000:147:b0:214:7d6e:cb1d with SMTP id r7-20020a056000014700b002147d6ecb1dmr13471356wrx.650.1655555545465; Sat, 18 Jun 2022 05:32:25 -0700 (PDT) Received: from henark71.. ([51.37.234.167]) by smtp.gmail.com with ESMTPSA id az10-20020adfe18a000000b00210396b2eaesm9292305wrb.45.2022.06.18.05.32.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jun 2022 05:32:24 -0700 (PDT) From: Conor Dooley To: David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Thierry Reding , Sam Ravnborg , Eugeniy Paltsev , Vinod Koul , Liam Girdwood , Mark Brown , Serge Semin , Daniel Lezcano , Palmer Dabbelt , Palmer Dabbelt Cc: Thomas Gleixner , Paul Walmsley , Albert Ou , Conor Dooley , Masahiro Yamada , Damien Le Moal , Geert Uytterhoeven , Niklas Cassel , Dillon Min , Heng Sia , Jose Abreu , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, alsa-devel@alsa-project.org, linux-spi@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH 14/14] riscv: dts: canaan: build all devicetress if SOC_CANAAN Date: Sat, 18 Jun 2022 13:30:36 +0100 Message-Id: <20220618123035.563070-15-mail@conchuod.ie> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220618123035.563070-1-mail@conchuod.ie> References: <20220618123035.563070-1-mail@conchuod.ie> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Conor Dooley Testing & checking the Canaan devicetrees is inconvenient as only the devicetree corresponding to SOC_CANAAN_K210_DTB_BUILTIN will be built. Change the Makefile so that all devicetrees are built by default if SOC_CANAAN but only the one specified by SOC_CANAAN_K210_DTB_BUILTIN gets built as an object. Signed-off-by: Conor Dooley --- I don't have any Canaan hardware, but I build tested it and the log looked correct with arch/riscv/boot/dts/canaan/k210_generic.dtb.o getting successfully built. --- arch/riscv/boot/dts/canaan/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/riscv/boot/dts/canaan/Makefile b/arch/riscv/boot/dts/cana= an/Makefile index c61b08ac8554..befe4eb7527b 100644 --- a/arch/riscv/boot/dts/canaan/Makefile +++ b/arch/riscv/boot/dts/canaan/Makefile @@ -1,3 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 -dtb-$(CONFIG_SOC_CANAAN_K210_DTB_BUILTIN) +=3D $(addsuffix .dtb, $(CONFIG_= SOC_CANAAN_K210_DTB_SOURCE)) -obj-$(CONFIG_SOC_CANAAN_K210_DTB_BUILTIN) +=3D $(addsuffix .o, $(dtb-y)) +dtb-$(CONFIG_SOC_CANAAN) +=3D canaan_kd233.dtb +dtb-$(CONFIG_SOC_CANAAN) +=3D k210_generic.dtb +dtb-$(CONFIG_SOC_CANAAN) +=3D sipeed_maix_bit.dtb +dtb-$(CONFIG_SOC_CANAAN) +=3D sipeed_maix_dock.dtb +dtb-$(CONFIG_SOC_CANAAN) +=3D sipeed_maix_go.dtb +dtb-$(CONFIG_SOC_CANAAN) +=3D sipeed_maixduino.dtb + +obj-$(CONFIG_SOC_CANAAN_K210_DTB_BUILTIN) +=3D $(addsuffix .dtb.o, $(CONFI= G_SOC_CANAAN_K210_DTB_SOURCE)) --=20 2.36.1