From patchwork Mon Jan 23 10:09:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 47088 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1524574wrn; Mon, 23 Jan 2023 02:10:46 -0800 (PST) X-Google-Smtp-Source: AMrXdXsHvvc/nuklD0KcaVqT3L2LJgBHIJQRXDSTwcIV8NgAdra2ZvkbV6B4/wgABWg3AnoqBn1q X-Received: by 2002:a17:907:c29c:b0:84d:2171:d79 with SMTP id tk28-20020a170907c29c00b0084d21710d79mr25031257ejc.54.1674468646329; Mon, 23 Jan 2023 02:10:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674468646; cv=none; d=google.com; s=arc-20160816; b=JTJiKUlT05j9Z3QsyOkNBFbRRpjxwbFGqv8VL6W+Jt0julPhhkhgBf91zXT/V3jDLI 2wW1oN62dgbr2hsH1wvxNaX2neg5VGIqErzaIbsqnINUBIdrl05DgL0SGXdtVsjtmhR+ KAyyTprsPnZzKatfAxhM446jwJBpkYYjTyIPCEr2lU/NT9kvz95u9T5EXUT1HtJCzzHk 16dXSrC21AM/mvf1kyiPVEMzIazKgfqHqBkgig4hQLdGA6lhkm9W1MRrLhC42geIsmCS lmgnBqn3InIdxhGbRsFQM+hORBgWlKArZiwLLMQce73YqA56KdSeO2ZRwR8DkPV9dV9t +2vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=lmEi8wNJscjPO+bec5z+80AcbDQKdl+RtO68ZSQp6ss=; b=mwmFKFh99cLlarioV/XNkuuUeFafqO+Rgt5WpzUQzMavHo5cDdJEp5w+4oSC1rtiMG kw5xLPET1V+tBGP9gM2PPQOieWqoRlBKFLSTCaobEYJb/UyD2Y1C4xJSpfqfIQVzKPZS nYx1f6IVYFEyilObLONf+vYSjsA1FJPb3dGzuFyJMCOTgvEJ5br3i4+A6kkgU2KhxNsA bq4LOLuwQc6ELAJBgQEBt2rhew0bVGViTdUVSA0K+JuKQEvBTsLBwww67TC6qFVnGzGl ycfgfpLjZkuSNDaytIAS9JN0zLw952sR/ewelNyt3vC8tlzGip2Xv+3UIG9cDG7XE+Dq S/QQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ndSG6Ywu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r15-20020aa7cfcf000000b00499d41d2ef1si6687197edy.440.2023.01.23.02.10.22; Mon, 23 Jan 2023 02:10:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ndSG6Ywu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231738AbjAWKKL (ORCPT + 99 others); Mon, 23 Jan 2023 05:10:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231709AbjAWKKH (ORCPT ); Mon, 23 Jan 2023 05:10:07 -0500 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8DB3CFF1F for ; Mon, 23 Jan 2023 02:10:03 -0800 (PST) Received: by mail-wr1-x42d.google.com with SMTP id y1so5755362wru.2 for ; Mon, 23 Jan 2023 02:10:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=lmEi8wNJscjPO+bec5z+80AcbDQKdl+RtO68ZSQp6ss=; b=ndSG6YwuKGUm1NBBI5B2jrBEPmsadx3GhgXVtdQLFuTTIKzv3a+092eRqnmoizygnu 6K2WY8xrHmMdhe1zjHYD5rxceTGCddHjU0Uutwbumopsv2JgOzB+sftmjkobCnwRGKNS yOUEaWRKRbcpFUh1Kp57/juCnhSaxbjSjYdoeasNcT16mGwH14TDfXipkSPrZcjiQCdP 7mklc2riDlU3X+rN5zPycg2zIZ4+k5+Ss5EnCYwyZq3AGZaN56GtxGg0/z71+dFOLAhB fRYExkqmJuM63t2yQxToWbBPMz6lTGD3lZEFd+F7oO2FV0baGA6f44+gmDl4TSjB7Jsy Hjvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lmEi8wNJscjPO+bec5z+80AcbDQKdl+RtO68ZSQp6ss=; b=x8TVhFd61jPCRSiZPjxHjDuuMBVNLE94+tTP2eKvZ9epDAtgwZljVOHc+AtJgrSLFt AB7z5QKkjsQkw6hCoFtQFFzpYPkqXIbL61Ni4Cq0rHvo+m69FgCgPpXaL0+euY4B8SKa i1GUp9JdTu1G8UKtnoqI4MXOREk4JDbtrOMHBRjQTqwGgfHA89sDNFbTvzZxinKW8JXB 0eEkrCqY9zaM3tvO5QWgW2bmtPKXnWgC5py/zNuPs63VRA2lQyaDrZuQzx7eYJblUsqr 7wtDi3e6tHpBxH3mG67oFs3y3QXd00j+cy5pG1b933M2tekN0osqd0HBC+WIHOZWn1i8 VQDA== X-Gm-Message-State: AFqh2kr/9xuP9sc5LZKrDqHz8UOjoEwh2Rh293Cl7lKgnzOVD1Rg8rEB uOmhu6PxdMCtNGFgTaFKqeWWmQ== X-Received: by 2002:a5d:4e04:0:b0:2bb:31dc:2d62 with SMTP id p4-20020a5d4e04000000b002bb31dc2d62mr19830641wrt.67.1674468601723; Mon, 23 Jan 2023 02:10:01 -0800 (PST) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id m9-20020a056000024900b002bdec340a1csm22670403wrz.110.2023.01.23.02.10.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 02:10:01 -0800 (PST) From: Neil Armstrong Date: Mon, 23 Jan 2023 11:09:58 +0100 Subject: [PATCH v3 1/7] dt-bindings: nvmem: convert amlogic-efuse.txt to dt-schema MIME-Version: 1.0 Message-Id: <20221117-b4-amlogic-bindings-convert-v3-1-e28dd31e3bed@linaro.org> References: <20221117-b4-amlogic-bindings-convert-v3-0-e28dd31e3bed@linaro.org> In-Reply-To: <20221117-b4-amlogic-bindings-convert-v3-0-e28dd31e3bed@linaro.org> To: Srinivas Kandagatla , Rob Herring , Krzysztof Kozlowski , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Wim Van Sebroeck , Guenter Roeck , Mauro Carvalho Chehab , Daniel Lezcano , Thomas Gleixner , Ulf Hansson , Bjorn Helgaas , Lorenzo Pieralisi , Rob Herring , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org, linux-media@vger.kernel.org, linux-mmc@vger.kernel.org, linux-pci@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.12.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755807634859667611?= X-GMAIL-MSGID: =?utf-8?q?1755807634859667611?= Convert the Amlogic Meson GX eFuse bindings to dt-schema. Take in account the used variant with amlogic,meson-gx-efuse. Reviewed-by: Krzysztof Kozlowski Reviewed-by: Martin Blumenstingl Signed-off-by: Neil Armstrong --- .../bindings/nvmem/amlogic,meson-gxbb-efuse.yaml | 57 ++++++++++++++++++++++ .../devicetree/bindings/nvmem/amlogic-efuse.txt | 48 ------------------ 2 files changed, 57 insertions(+), 48 deletions(-) diff --git a/Documentation/devicetree/bindings/nvmem/amlogic,meson-gxbb-efuse.yaml b/Documentation/devicetree/bindings/nvmem/amlogic,meson-gxbb-efuse.yaml new file mode 100644 index 000000000000..e49c2754ff55 --- /dev/null +++ b/Documentation/devicetree/bindings/nvmem/amlogic,meson-gxbb-efuse.yaml @@ -0,0 +1,57 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/nvmem/amlogic,meson-gxbb-efuse.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Amlogic Meson GX eFuse + +maintainers: + - Neil Armstrong + +allOf: + - $ref: nvmem.yaml# + +properties: + compatible: + oneOf: + - const: amlogic,meson-gxbb-efuse + - items: + - const: amlogic,meson-gx-efuse + - const: amlogic,meson-gxbb-efuse + + clocks: + maxItems: 1 + + secure-monitor: + description: phandle to the secure-monitor node + $ref: /schemas/types.yaml#/definitions/phandle + +required: + - compatible + - clocks + - secure-monitor + +unevaluatedProperties: false + +examples: + - | + efuse: efuse { + compatible = "amlogic,meson-gxbb-efuse"; + clocks = <&clk_efuse>; + #address-cells = <1>; + #size-cells = <1>; + secure-monitor = <&sm>; + + sn: sn@14 { + reg = <0x14 0x10>; + }; + + eth_mac: mac@34 { + reg = <0x34 0x10>; + }; + + bid: bid@46 { + reg = <0x46 0x30>; + }; + }; diff --git a/Documentation/devicetree/bindings/nvmem/amlogic-efuse.txt b/Documentation/devicetree/bindings/nvmem/amlogic-efuse.txt deleted file mode 100644 index f7b3ed74db54..000000000000 --- a/Documentation/devicetree/bindings/nvmem/amlogic-efuse.txt +++ /dev/null @@ -1,48 +0,0 @@ -= Amlogic Meson GX eFuse device tree bindings = - -Required properties: -- compatible: should be "amlogic,meson-gxbb-efuse" -- clocks: phandle to the efuse peripheral clock provided by the - clock controller. -- secure-monitor: phandle to the secure-monitor node - -= Data cells = -Are child nodes of eFuse, bindings of which as described in -bindings/nvmem/nvmem.txt - -Example: - - efuse: efuse { - compatible = "amlogic,meson-gxbb-efuse"; - clocks = <&clkc CLKID_EFUSE>; - #address-cells = <1>; - #size-cells = <1>; - secure-monitor = <&sm>; - - sn: sn@14 { - reg = <0x14 0x10>; - }; - - eth_mac: eth_mac@34 { - reg = <0x34 0x10>; - }; - - bid: bid@46 { - reg = <0x46 0x30>; - }; - }; - - sm: secure-monitor { - compatible = "amlogic,meson-gxbb-sm"; - }; - -= Data consumers = -Are device nodes which consume nvmem data cells. - -For example: - - eth_mac { - ... - nvmem-cells = <ð_mac>; - nvmem-cell-names = "eth_mac"; - }; From patchwork Mon Jan 23 10:09:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 47089 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1524615wrn; Mon, 23 Jan 2023 02:10:55 -0800 (PST) X-Google-Smtp-Source: AMrXdXtEf3K1ktSq4VD38dmorCWgU4LfvXEn5yPKXn6JzULe2cl6jXjVdDlnLy5LEWmVPNJzX9v6 X-Received: by 2002:a50:e610:0:b0:49e:c16:2c0f with SMTP id y16-20020a50e610000000b0049e0c162c0fmr23922401edm.1.1674468655000; Mon, 23 Jan 2023 02:10:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674468654; cv=none; d=google.com; s=arc-20160816; b=By5cRLI2x2D4fjADFvbxZgOI7o817UpjQTYCj6UmTt0/L15LJ0NkfUn/AQLhzOxhhW FlaC4Er6OB5U17PYwVZIWJzKRETaA2O3LAgxbmIkwjZHSo481xGRcyi7AOV8rUzJtKph BQcH96SEHJIvX2RMqXz+XlQUOqWhXsh6C+mkh33bSlYdMvQAo6T4vLcGp0x7Q19DyxMF NOtg7oasSTwysp9gfhm7yDVZEEcsWYec7K/n3ZepMMoork4Mjfibpc22JlL4j7hp186M QN2Ak0AUn8rutWUl8owZu6tVsXUgkfl/R/fzG1cZ30VyLpMrf4aena4mvZJufBuIfDDj T4jA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=Vk3/4zGC4vaP3JAISpcs7adXGbsqb5n1p++8mkCPqRs=; b=lRrzypPm4WKySQTY49lTvCE10aUR21rv+miaCGHWskipYyN4v643Jlc3O+cJNmu3CM lMeYEG50+gNv/bHsIFjwEBQIvWHlLKboaV77PR+zlLcx2HYdYgDsRX69tkbuQb+CrAcF qHodTLetSWcvGjPwcbflIKHyQaPgXKcuAHy2DoclUgYs3FN20LErBgylcEOJS+Qknuzs f73c7nGkxMZbE/sOGsMAZdqX73aUT8Fz/eNDz7IicH4IkCecAp2mds4zgZ0oAffW+DsH Q1H0zPOkm6CFkBle7dHfRnYX1U5TP/8aigghfMVTzNgpos553ZAHfzzgultMsWS0ZTu4 3Ksg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MMPgOtfo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t21-20020aa7d4d5000000b0049e0440d493si11946024edr.15.2023.01.23.02.10.31; Mon, 23 Jan 2023 02:10:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MMPgOtfo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231709AbjAWKKP (ORCPT + 99 others); Mon, 23 Jan 2023 05:10:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231718AbjAWKKI (ORCPT ); Mon, 23 Jan 2023 05:10:08 -0500 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F277E3A1 for ; Mon, 23 Jan 2023 02:10:05 -0800 (PST) Received: by mail-wr1-x42b.google.com with SMTP id t5so10278482wrq.1 for ; Mon, 23 Jan 2023 02:10:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Vk3/4zGC4vaP3JAISpcs7adXGbsqb5n1p++8mkCPqRs=; b=MMPgOtfoI2j+ih+wcRxk5PFgCEJn/T+1p4w/72XLAt6gLMnjYIUTq6ZY0iKWnnEtvL L2f1u5tV27sJIuMPP4IJFqfvXBJspspnQP7lnfBqaylFPQmzp5xy7zSBadyGILWRqQqx CFu8wgExZsMHN1YqRLpStNy1TBS+NTFvo9SdUY94ttWU1UNG2SmBCOqzTbit5BgD2o88 l2zQY6mmbeLVq+VEFbJoMjmSHlNjcP3DwPenlhJC1eyvwvYr1gRBRzDLHPqcR+DV84TO Tp/dBxlIDCGl3PvlGqeHj+N0DHQe2Lp0cGO8aj+4XcI870TCZODQ1uoE+34YiXzbjXz/ EF7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Vk3/4zGC4vaP3JAISpcs7adXGbsqb5n1p++8mkCPqRs=; b=hGD/HXr/iDbwGSMyygp8cCNdOlYir6lJ+z3upfR9HSxI1UazN07nyyoUZeT1eDCw4x 0y+Gmufl18pNmOJ8dlhkj9FNSEdRk2QPdWe9suwCgs4gFY9H62Z27ZlK1QnzCKVRJZlN LwjkvmYLDJhe8SXnaWBI2srtqQDVRlJdnXELxfXqSDaHWKWrZOxVFkh6zJNTz/Sot3pm /i8oJwv7Wz4D37uI8JBGSdipCXg5i0KrghDrSbKkfovie2DxTmz+Dx6vqcklDeF4BUPH Kqj55/CPhQfi/szlLfDuSjXms+JPnm/oHdkwavAisc6WEQqAT2PNztBDXmJOLmYj3YFj li1A== X-Gm-Message-State: AFqh2komVmr7mL1qBOlPKqeb84q81nLsQYl2FaTvNzWoh3ho6MCMEQHX OEiP7EQxZAE4bZ1Ka1TFTRLIRA== X-Received: by 2002:adf:f150:0:b0:2bf:963e:f9ac with SMTP id y16-20020adff150000000b002bf963ef9acmr8918210wro.18.1674468603610; Mon, 23 Jan 2023 02:10:03 -0800 (PST) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id m9-20020a056000024900b002bdec340a1csm22670403wrz.110.2023.01.23.02.10.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 02:10:02 -0800 (PST) From: Neil Armstrong Date: Mon, 23 Jan 2023 11:09:59 +0100 Subject: [PATCH v3 2/7] dt-bindings: nvmem: convert amlogic-meson-mx-efuse.txt to dt-schema MIME-Version: 1.0 Message-Id: <20221117-b4-amlogic-bindings-convert-v3-2-e28dd31e3bed@linaro.org> References: <20221117-b4-amlogic-bindings-convert-v3-0-e28dd31e3bed@linaro.org> In-Reply-To: <20221117-b4-amlogic-bindings-convert-v3-0-e28dd31e3bed@linaro.org> To: Srinivas Kandagatla , Rob Herring , Krzysztof Kozlowski , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Wim Van Sebroeck , Guenter Roeck , Mauro Carvalho Chehab , Daniel Lezcano , Thomas Gleixner , Ulf Hansson , Bjorn Helgaas , Lorenzo Pieralisi , Rob Herring , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org, linux-media@vger.kernel.org, linux-mmc@vger.kernel.org, linux-pci@vger.kernel.org X-Mailer: b4 0.12.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755807644294017634?= X-GMAIL-MSGID: =?utf-8?q?1755807644294017634?= Convert the Amlogic Meson6 eFuse bindings to dt-schema. Signed-off-by: Neil Armstrong Reviewed-by: Krzysztof Kozlowski --- .../bindings/nvmem/amlogic,meson6-efuse.yaml | 57 ++++++++++++++++++++++ .../bindings/nvmem/amlogic-meson-mx-efuse.txt | 22 --------- 2 files changed, 57 insertions(+), 22 deletions(-) diff --git a/Documentation/devicetree/bindings/nvmem/amlogic,meson6-efuse.yaml b/Documentation/devicetree/bindings/nvmem/amlogic,meson6-efuse.yaml new file mode 100644 index 000000000000..84b3dfd21e09 --- /dev/null +++ b/Documentation/devicetree/bindings/nvmem/amlogic,meson6-efuse.yaml @@ -0,0 +1,57 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/nvmem/amlogic,meson6-efuse.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Amlogic Meson6 eFuse + +maintainers: + - Neil Armstrong + - Martin Blumenstingl + +allOf: + - $ref: nvmem.yaml# + +properties: + compatible: + enum: + - amlogic,meson6-efuse + - amlogic,meson8-efuse + - amlogic,meson8b-efuse + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + + clock-names: + const: core + +required: + - compatible + - reg + - clocks + - clock-names + +unevaluatedProperties: false + +examples: + - | + efuse: efuse@0 { + compatible = "amlogic,meson6-efuse"; + reg = <0x0 0x2000>; + clocks = <&clk_efuse>; + clock-names = "core"; + #address-cells = <1>; + #size-cells = <1>; + + ethernet_mac_address: mac@1b4 { + reg = <0x1b4 0x6>; + }; + + temperature_calib: calib@1f4 { + reg = <0x1f4 0x4>; + }; + }; diff --git a/Documentation/devicetree/bindings/nvmem/amlogic-meson-mx-efuse.txt b/Documentation/devicetree/bindings/nvmem/amlogic-meson-mx-efuse.txt deleted file mode 100644 index a3c63954a1a4..000000000000 --- a/Documentation/devicetree/bindings/nvmem/amlogic-meson-mx-efuse.txt +++ /dev/null @@ -1,22 +0,0 @@ -Amlogic Meson6/Meson8/Meson8b efuse - -Required Properties: -- compatible: depending on the SoC this should be one of: - - "amlogic,meson6-efuse" - - "amlogic,meson8-efuse" - - "amlogic,meson8b-efuse" -- reg: base address and size of the efuse registers -- clocks: a reference to the efuse core gate clock -- clock-names: must be "core" - -All properties and sub-nodes as well as the consumer bindings -defined in nvmem.txt in this directory are also supported. - - -Example: - efuse: nvmem@0 { - compatible = "amlogic,meson8-efuse"; - reg = <0x0 0x2000>; - clocks = <&clkc CLKID_EFUSE>; - clock-names = "core"; - }; From patchwork Mon Jan 23 10:10:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 47091 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1524642wrn; Mon, 23 Jan 2023 02:10:58 -0800 (PST) X-Google-Smtp-Source: AMrXdXtXaS3zzJy85fMo7ijW2iWuZPOXfGgbMnbKX6vUirhAOU9/CL3LKKTJmdQdNJche07NfyGm X-Received: by 2002:a05:6402:1107:b0:493:a6eb:874e with SMTP id u7-20020a056402110700b00493a6eb874emr25537776edv.5.1674468658694; Mon, 23 Jan 2023 02:10:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674468658; cv=none; d=google.com; s=arc-20160816; b=dXO9J55wwwluW0Ccq5NZADh2mI1Xuq3qTpuqPDWogww9qOHl0bR66g0yX3tGY0lx/f n/iIERX8asuITCeqwj5rl+bSo0/nKOzGk40MHeS4AR/dQPu2eptJTF+x6NBSps7o0zeo 1z8e/3qvVHweowlA6aagzPdRn8ikEQKpu9EjWWV0H1jhHQAZLE0tWTiWjuy1vjlKcvGu IcYQIn0zRC2SRXFmk/qkEnZft7QojAGpHL4cuQR+yWsVFcRmTlBvG44wLsPtPDjx+lfS BzqmijfX47Y/IFOaYOEPSLdYJhWmlSYeFLUD4/L4zajYbVRkihCanQ0zEslZsFrC93zT RDUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=qBPBzdh3eujGMqwSAewcH2FPtNMnZTECjtcDhfAnWzg=; b=xKirXwoxCah6cjV8RuJAHHMBgD2GRA8zzGF82fsMl/dic0h7v5i5OJiYz1Raijli+L /zvD5k8BrNyogJoseJON0iKQH8F+Uc3Ws/Mky7p2dFPqxn3E5P4bnMBnXXG9DKv7zLZ7 SP7T6oTxqTKgwjWJ1OjsxTH3nX1ChhmvBVEnS1hTVRFeRA7RXQe65sjMbO3/KOo0glqB NezcoctevYOMaK7esox90ZcspfdmZDIuLB/xyzfhKG8OaFXYK5MaqCEAYw3u4gKo+9cu Skg7VqVJqvJtQvmstlwU6bOKPFPM3yD3wlynpBpJs4X41nrQ/3cgRTNhRCXC+owceqy0 Uobg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ymzD+yGX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t12-20020a056402524c00b00487d1731603si60556706edd.230.2023.01.23.02.10.35; Mon, 23 Jan 2023 02:10:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ymzD+yGX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231838AbjAWKKT (ORCPT + 99 others); Mon, 23 Jan 2023 05:10:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231781AbjAWKKQ (ORCPT ); Mon, 23 Jan 2023 05:10:16 -0500 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 EDF32E3BF for ; Mon, 23 Jan 2023 02:10:06 -0800 (PST) Received: by mail-wr1-x436.google.com with SMTP id h12so6255874wrv.10 for ; Mon, 23 Jan 2023 02:10:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=qBPBzdh3eujGMqwSAewcH2FPtNMnZTECjtcDhfAnWzg=; b=ymzD+yGXpHJi0tfrmqPtik9lx2Mlk/0PNwaPiH9Q9khXzZxqU5PGx0viHREBD7vxeJ q1jin0Wjjzpbd7v+GCY5aZJwOhSktEsAu9W+P/PVDPtCX/4tc0d5gCTOUC+IQ6Rk3htI lwD9ECIVq22K0aIpwCpQq7GEqnblHxzQ7ffWzHEwPP2XKbLI4Lt8oWOKFWeC9zxvRV7h pM/ZsvDiK4JYGOUf7Cdh5JCggARPgDrV6ow/G17RRV9WVe9gtdlqkrJtrffzbT7LhE2K X2F1kRP29Aw6VFF7bOCkAnPg+90D3OEItWeiOfvp63XYJ3MqX9697GTwMrD7Z1JPqwHo rG6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qBPBzdh3eujGMqwSAewcH2FPtNMnZTECjtcDhfAnWzg=; b=tXX7hb7IE5CmsS+s3ccO0vYrAbqMg+yezQAC0C5jIFh6GNLITxq0F1szJqlTW5YF0O be8fbQ8u8EVsRw2UbGTV7Ryo2d8ShKSxQJDP+Zio2BZWpR+txKeqaiGd01dD3l54Rve8 fX4jh2SHPY5KPdq60AkqEzh4pusTCR17wt/Rd1sltmKDpVM7X3Ih6th9JLRZdV82pb+Q 9JPtwt9NIGE82vICfmCF8KUPZo/WRcoItHQYukjsUyNbq7l6yySbWtZG116O9cMU/j2J WkozPZR5GObwn+BkHcarA2QL1/NC9fkJpM3c3mY0vzvCICk8uIg8i2HUM4PW1IBnqKka 4zJA== X-Gm-Message-State: AFqh2koE/zVr+tuI7RlS+4Kba/yRLyo43moEWeYfmXKTqGk44TZlwwI8 ASK3qAIcSaD4lC/V99LkhbOlGQ== X-Received: by 2002:adf:d22c:0:b0:2bd:f95d:4457 with SMTP id k12-20020adfd22c000000b002bdf95d4457mr19441166wrh.69.1674468604815; Mon, 23 Jan 2023 02:10:04 -0800 (PST) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id m9-20020a056000024900b002bdec340a1csm22670403wrz.110.2023.01.23.02.10.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 02:10:04 -0800 (PST) From: Neil Armstrong Date: Mon, 23 Jan 2023 11:10:00 +0100 Subject: [PATCH v3 3/7] dt-bindings: watchdog: convert meson-wdt.txt to dt-schema MIME-Version: 1.0 Message-Id: <20221117-b4-amlogic-bindings-convert-v3-3-e28dd31e3bed@linaro.org> References: <20221117-b4-amlogic-bindings-convert-v3-0-e28dd31e3bed@linaro.org> In-Reply-To: <20221117-b4-amlogic-bindings-convert-v3-0-e28dd31e3bed@linaro.org> To: Srinivas Kandagatla , Rob Herring , Krzysztof Kozlowski , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Wim Van Sebroeck , Guenter Roeck , Mauro Carvalho Chehab , Daniel Lezcano , Thomas Gleixner , Ulf Hansson , Bjorn Helgaas , Lorenzo Pieralisi , Rob Herring , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org, linux-media@vger.kernel.org, linux-mmc@vger.kernel.org, linux-pci@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.12.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755807648100189770?= X-GMAIL-MSGID: =?utf-8?q?1755807648100189770?= Convert the Amlogic Meson6 SoCs Watchdog timer bindings to dt-schema. Take in account the used interrupts property. The "amlogic,meson8-wdt" representation has been simplified since there's no users of this compatible used along the "amlogic,meson6-wdt". Reviewed-by: Krzysztof Kozlowski Reviewed-by: Martin Blumenstingl Signed-off-by: Neil Armstrong Reviewed-by: Guenter Roeck --- .../bindings/watchdog/amlogic,meson6-wdt.yaml | 50 ++++++++++++++++++++++ .../devicetree/bindings/watchdog/meson-wdt.txt | 21 --------- 2 files changed, 50 insertions(+), 21 deletions(-) diff --git a/Documentation/devicetree/bindings/watchdog/amlogic,meson6-wdt.yaml b/Documentation/devicetree/bindings/watchdog/amlogic,meson6-wdt.yaml new file mode 100644 index 000000000000..84732cb58ec4 --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/amlogic,meson6-wdt.yaml @@ -0,0 +1,50 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/watchdog/amlogic,meson6-wdt.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Amlogic Meson6 SoCs Watchdog timer + +maintainers: + - Neil Armstrong + - Martin Blumenstingl + +allOf: + - $ref: watchdog.yaml# + +properties: + compatible: + oneOf: + - enum: + - amlogic,meson6-wdt + - amlogic,meson8-wdt + - amlogic,meson8b-wdt + - items: + - const: amlogic,meson8m2-wdt + - const: amlogic,meson8b-wdt + + interrupts: + maxItems: 1 + + reg: + maxItems: 1 + +required: + - compatible + - interrupts + - reg + +unevaluatedProperties: false + +examples: + - | + #include + #include + + wdt: watchdog@c1109900 { + compatible = "amlogic,meson6-wdt"; + reg = <0xc1109900 0x8>; + interrupts = ; + timeout-sec = <10>; + }; diff --git a/Documentation/devicetree/bindings/watchdog/meson-wdt.txt b/Documentation/devicetree/bindings/watchdog/meson-wdt.txt deleted file mode 100644 index 7588cc3971bf..000000000000 --- a/Documentation/devicetree/bindings/watchdog/meson-wdt.txt +++ /dev/null @@ -1,21 +0,0 @@ -Meson SoCs Watchdog timer - -Required properties: - -- compatible : depending on the SoC this should be one of: - "amlogic,meson6-wdt" on Meson6 SoCs - "amlogic,meson8-wdt" and "amlogic,meson6-wdt" on Meson8 SoCs - "amlogic,meson8b-wdt" on Meson8b SoCs - "amlogic,meson8m2-wdt" and "amlogic,meson8b-wdt" on Meson8m2 SoCs -- reg : Specifies base physical address and size of the registers. - -Optional properties: -- timeout-sec: contains the watchdog timeout in seconds. - -Example: - -wdt: watchdog@c1109900 { - compatible = "amlogic,meson6-wdt"; - reg = <0xc1109900 0x8>; - timeout-sec = <10>; -}; From patchwork Mon Jan 23 10:10:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 47092 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1524691wrn; Mon, 23 Jan 2023 02:11:09 -0800 (PST) X-Google-Smtp-Source: AMrXdXudyZpCLjDr0tntmzMPVO5q1y76/S3CfKhxRJHd8i8RdmdAXU4rQdDVy21uUzFKICUGUUx9 X-Received: by 2002:a05:6402:27d3:b0:499:b3db:6aa3 with SMTP id c19-20020a05640227d300b00499b3db6aa3mr31265194ede.1.1674468669138; Mon, 23 Jan 2023 02:11:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674468669; cv=none; d=google.com; s=arc-20160816; b=n7ZOhycUm+ar3fRI74ltdCcg3nyznR5da1ETFrIU/M+v+QRxh1u0UPKpF2JvfDze0X xCk6EjU0TGOdX2pAZawGTUJ6iaKw4GfSULfoD3e3yz105A/DXyrJVxVMgkJfdmTeO7bI fLCx2Hi5okDiIGCbKueepI7MWrLYZAoYZbVgToR/LB84JZxiaJjfOTXKwIXyWsZrMFem auAGckdEMs/LwQ5oHyUzJILxSlxX78LMG4ZwoMHnhBvX2djcxntUx4RX+stRi0S6ajRn MFznzTt7bMwMO7uF3rnigbK6GCPc1sE55Petwlz1Q/8CCqKDA/Elvta7I7ApeVQuQPdg sl3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=GGsfIAFzoH7ggFb2voxRa7ZKIwz9PZMg5nKhBB1/kDo=; b=dlXNyPA6sdpBFEtzVcJF8JuCSbomZ5yQzaDUGtENmsAXltiIYrknH3b4gE8D/Y2d9n 88qlR6ieYw/En7vK9fSStoEHlJwkgncsnUc0RWpEnACdvz5tFN6xEYKMtIkzvWNrIIQD gdYsQFpVhovHKMLA8GQLeTZS3mgHyPrH7rrvbKG3vsykSso5XBSr8IunJzUnQHGsUATq b+f706ILCV0nqGb1gW6l3JGsnt2ByByS+lIi1EjmEcASv2WwTogERoSYsloCiiMhb913 Xwu2+UBDL8hpDNTvkxbuD90kz8Wx7hEEwCEfxxGuYQ8HQq1oX7lrLbfX8fVolyYZD9Ay jZdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Xym58FVi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id du1-20020a17090772c100b008776a49e941si15229721ejc.22.2023.01.23.02.10.45; Mon, 23 Jan 2023 02:11:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Xym58FVi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231808AbjAWKKW (ORCPT + 99 others); Mon, 23 Jan 2023 05:10:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231789AbjAWKKQ (ORCPT ); Mon, 23 Jan 2023 05:10:16 -0500 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 8D70E13DFB for ; Mon, 23 Jan 2023 02:10:07 -0800 (PST) Received: by mail-wr1-x430.google.com with SMTP id h12so6255944wrv.10 for ; Mon, 23 Jan 2023 02:10:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=GGsfIAFzoH7ggFb2voxRa7ZKIwz9PZMg5nKhBB1/kDo=; b=Xym58FVi/DyBHzoH5aFBOh1zqQtKsbxeJoh30xeVcts5R8r+TNBO0kMt4zeXDHFr8F HKIOtA5Te56KxdrZp+PwbV6jqqz4IIr6ek1oCdi1wqakg3VeTdmNYXT8AV4hA4FkpUwb RJwSLPpcTSTE1iL2LmxubojKsnoVwPOkEvL8xIyrNYVmfM3eNSguXyLunrnjCOZuXIpO S3cAutOmEpI4Da153O1lCX4NPzliTH4PuxQ1jUA5FCri/UXHpRrGYcXfe6FMpB/Wa7md DuJBl/ASQWwUnYopd/CuLLOH9ZGT9reXwj44KOqpuMmDs2SBWu9KPLoBRNjiPuxqLJj1 Ewww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GGsfIAFzoH7ggFb2voxRa7ZKIwz9PZMg5nKhBB1/kDo=; b=UcisCkGJa0ZYs/GYqAcS63fztoa83hlrlmwDkfxp0wLikGVPqOgmHbg9lMHmblWcCl XOMDrLtqry0ZijViy6ALyC6R3ZwojUwIUKbq4Dk5+eiOGY53n8EjGcCoWhrpdGktVXFh pRWZEOzdKSOgIsS0Zd13Sx3YWC0i1tGe4WLo1gNU4QUB5xtqHe47BQR6pC4zCL8VwBAK gWxv+OgNq8jPtpXUcYsyYl19Y3sg56+3N/aDaMWK4BspVnyPVhYwe5dAh0cklmUsoWRQ 0s2WT1Mx+N4AP0NNnl8wVTfxaH1xZAZ+pyyvI9/3yzu20iIxxQ8lxMlD6dTPg2ya7MVY 10mg== X-Gm-Message-State: AFqh2koCP7CypVNQqeyaQSOsTgvjv6Vhn1dpDVMDnXUf166HLHGV6n2G ThUU8lS/ZWw0gB6lfkZ2QUahWMKWclwBWmFaSyY= X-Received: by 2002:adf:e44d:0:b0:2bd:f31e:3460 with SMTP id t13-20020adfe44d000000b002bdf31e3460mr19527988wrm.2.1674468606016; Mon, 23 Jan 2023 02:10:06 -0800 (PST) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id m9-20020a056000024900b002bdec340a1csm22670403wrz.110.2023.01.23.02.10.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 02:10:05 -0800 (PST) From: Neil Armstrong Date: Mon, 23 Jan 2023 11:10:01 +0100 Subject: [PATCH v3 4/7] dt-bindings: media: convert meson-ir.txt to dt-schema MIME-Version: 1.0 Message-Id: <20221117-b4-amlogic-bindings-convert-v3-4-e28dd31e3bed@linaro.org> References: <20221117-b4-amlogic-bindings-convert-v3-0-e28dd31e3bed@linaro.org> In-Reply-To: <20221117-b4-amlogic-bindings-convert-v3-0-e28dd31e3bed@linaro.org> To: Srinivas Kandagatla , Rob Herring , Krzysztof Kozlowski , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Wim Van Sebroeck , Guenter Roeck , Mauro Carvalho Chehab , Daniel Lezcano , Thomas Gleixner , Ulf Hansson , Bjorn Helgaas , Lorenzo Pieralisi , Rob Herring , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org, linux-media@vger.kernel.org, linux-mmc@vger.kernel.org, linux-pci@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.12.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755807659320847730?= X-GMAIL-MSGID: =?utf-8?q?1755807659320847730?= Convert the Amlogic Meson IR remote control receiver bindings to dt-schema. Take in account the used variant with amlogic,meson-gx-ir. Reviewed-by: Martin Blumenstingl Reviewed-by: Krzysztof Kozlowski Signed-off-by: Neil Armstrong --- .../bindings/media/amlogic,meson6-ir.yaml | 47 ++++++++++++++++++++++ .../devicetree/bindings/media/meson-ir.txt | 20 --------- 2 files changed, 47 insertions(+), 20 deletions(-) diff --git a/Documentation/devicetree/bindings/media/amlogic,meson6-ir.yaml b/Documentation/devicetree/bindings/media/amlogic,meson6-ir.yaml new file mode 100644 index 000000000000..3f9fa92703bb --- /dev/null +++ b/Documentation/devicetree/bindings/media/amlogic,meson6-ir.yaml @@ -0,0 +1,47 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/amlogic,meson6-ir.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Amlogic Meson IR remote control receiver + +maintainers: + - Neil Armstrong + +allOf: + - $ref: rc.yaml# + +properties: + compatible: + oneOf: + - enum: + - amlogic,meson6-ir + - amlogic,meson8b-ir + - amlogic,meson-gxbb-ir + - items: + - const: amlogic,meson-gx-ir + - const: amlogic,meson-gxbb-ir + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + +required: + - compatible + - reg + - interrupts + +unevaluatedProperties: false + +examples: + - | + #include + #include + ir-receiver@c8100480 { + compatible = "amlogic,meson6-ir"; + reg = <0xc8100480 0x20>; + interrupts = ; + }; diff --git a/Documentation/devicetree/bindings/media/meson-ir.txt b/Documentation/devicetree/bindings/media/meson-ir.txt deleted file mode 100644 index efd9d29a8f10..000000000000 --- a/Documentation/devicetree/bindings/media/meson-ir.txt +++ /dev/null @@ -1,20 +0,0 @@ -* Amlogic Meson IR remote control receiver - -Required properties: - - compatible : depending on the platform this should be one of: - - "amlogic,meson6-ir" - - "amlogic,meson8b-ir" - - "amlogic,meson-gxbb-ir" - - reg : physical base address and length of the device registers - - interrupts : a single specifier for the interrupt from the device - -Optional properties: - - linux,rc-map-name: see rc.txt file in the same directory. - -Example: - - ir-receiver@c8100480 { - compatible= "amlogic,meson6-ir"; - reg = <0xc8100480 0x20>; - interrupts = <0 15 1>; - }; From patchwork Mon Jan 23 10:10:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 47094 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1525255wrn; Mon, 23 Jan 2023 02:12:47 -0800 (PST) X-Google-Smtp-Source: AMrXdXuxKyVdYbBjfZunIB2gYuMqtX5bCTIeK7Yc8lz/SVY06kg6Q5G/h5EMgl2Yo62x3ldgztXT X-Received: by 2002:a05:6a20:7048:b0:b8:915c:477f with SMTP id i8-20020a056a20704800b000b8915c477fmr23453247pza.19.1674468766690; Mon, 23 Jan 2023 02:12:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674468766; cv=none; d=google.com; s=arc-20160816; b=urgZYJPZEPqxniQlPM+VsS+n4pYY23bmbkJI+DB2AHsNAiywDLbSDMftTyPrdylksc DUzKqZY4jiISNnuQsEDHIPT5Q28Az2u4aHmJQMhUbau2dIu9MzNElGMhZlaX1l8ToGkJ bOnFIYFK0bUm8OZ7gvMrKepqG7Oc+pYaTM9dgPL9rxs4lhv8Yqlwc341w5DIXb4HHssm wh/fkmtQ8YXi6iwjSOxsTojM4G3uVnaqPIX2Aqbr6d2XEsLiIKJSjjrVCTr/6rX/f81e S9x6Hkg7gd8v5RcwPBvVTsWs5M9OWs0E82H5y9CSySA2iDW28VBy11ENGfe5iMZDooeP SfPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=RRiMwFjCYTBiVehS5Zjzxk4QhzySk5Q8XvQ2DTwvGYo=; b=rWTh90v7SpP3OPYMW9Ny9atZBJYt7pDgZDcV+uiFr9ysNmeU7R2hMhrLANBpUXH89r 8gXDMhN0BAMi4i/6SQmKAUsW8HXxwljtp20CQovk3Fx0LDpAdnivkkCYe/S0V0hLVZ04 301HUOK0b/M2xbGpPYVkHd9/qr015qOxTLetVJD3fMoQixT6NJXZG0p8yWrY8sDSq9J1 +i/YGBZPgQfciPOPQAq+cFUsqOrli/ccqyi/R4110rrkRuw5OZ+SxlDQkXZpBL/8Y23j kU8Vw81Ercka9S1eAX8uaPsrLVQJPrRVRrp7Lh5hUXxt+Spu86gIunun5qJvamoYy4mj qEDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=I8MMPFh1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j21-20020a634a55000000b0047693f9d264si48810652pgl.833.2023.01.23.02.12.34; Mon, 23 Jan 2023 02:12:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=I8MMPFh1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231961AbjAWKKa (ORCPT + 99 others); Mon, 23 Jan 2023 05:10:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231862AbjAWKKU (ORCPT ); Mon, 23 Jan 2023 05:10:20 -0500 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 09996E393 for ; Mon, 23 Jan 2023 02:10:08 -0800 (PST) Received: by mail-wr1-x42f.google.com with SMTP id y1so5755647wru.2 for ; Mon, 23 Jan 2023 02:10:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=RRiMwFjCYTBiVehS5Zjzxk4QhzySk5Q8XvQ2DTwvGYo=; b=I8MMPFh1TcWsNd+WWe0k3fRxXgSCZ5bzuKgp1jF0Oscrp5+wIJdNqG+oCnhILfT2C7 AMfhxG4J1w38PSAjeX8Ng26VvukBrp2AUraxmRu/TjlcbKRUbUk6QdKPkju8/0J3GcEg EtNMesusXeLgEhK4ffFf2VEUmacT+9ALA16WCi6o6JAc4mwqlaXhIPe19L/rF24jGCb3 jy7uXjrKQo23Nc6dXu/RbsbVK9jJC11rWLLmYq4mJhRSUidzaCSsvEnRBoZK1+BCnKFR t9KV/fGbXrmSSZNQt2Xkx6SEhxnRcmWkTxOGOWiulPtkS8LZZgPmF+8K4dMq+u/lm7y/ OV8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RRiMwFjCYTBiVehS5Zjzxk4QhzySk5Q8XvQ2DTwvGYo=; b=SWgQYZzLBvKnStQny9xWaZOoDMcFSaJADjTKlVigDPrP4Utv8e7uukGmsJLZR66Uk2 erssBxV2RG+id9hBg7gFfh9XkJcyzQrCI5Wvem4xFT1OWS8t9H9nwpliwMhtxdPOvpxq ZzRz8GB9RcBGKlSHAlSBOsnvh1bTNR/Zh1WTN/NpDzafly0xIgGVY0y4fCHtR9DOaiNW cITFWrFTho1PZgroyaHqHVU52TLmuRUr1P8Uw1tPr33Rbg97tM6fHu1OzdYOXB8KOVtw 5pZQfr4LsfNCHi34jbn1oZ7bWDftpkWVcPDkXkPygUdoq2vN0PdYb+Gl8a2k+JwKKEbd Wu3Q== X-Gm-Message-State: AFqh2kp+UxH0wFh16I+cdDRqMwqSohzq+64iwiOH1JbwsoIbJHjnN9DB mbljFIJdHP7a9vVT+xvZT+87nQ== X-Received: by 2002:a5d:4f90:0:b0:2bd:d542:e01e with SMTP id d16-20020a5d4f90000000b002bdd542e01emr21607229wru.10.1674468607166; Mon, 23 Jan 2023 02:10:07 -0800 (PST) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id m9-20020a056000024900b002bdec340a1csm22670403wrz.110.2023.01.23.02.10.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 02:10:06 -0800 (PST) From: Neil Armstrong Date: Mon, 23 Jan 2023 11:10:02 +0100 Subject: [PATCH v3 5/7] dt-bindings: timer: convert timer/amlogic,meson6-timer.txt to dt-schema MIME-Version: 1.0 Message-Id: <20221117-b4-amlogic-bindings-convert-v3-5-e28dd31e3bed@linaro.org> References: <20221117-b4-amlogic-bindings-convert-v3-0-e28dd31e3bed@linaro.org> In-Reply-To: <20221117-b4-amlogic-bindings-convert-v3-0-e28dd31e3bed@linaro.org> To: Srinivas Kandagatla , Rob Herring , Krzysztof Kozlowski , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Wim Van Sebroeck , Guenter Roeck , Mauro Carvalho Chehab , Daniel Lezcano , Thomas Gleixner , Ulf Hansson , Bjorn Helgaas , Lorenzo Pieralisi , Rob Herring , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org, linux-media@vger.kernel.org, linux-mmc@vger.kernel.org, linux-pci@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.12.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755807761504777373?= X-GMAIL-MSGID: =?utf-8?q?1755807761504777373?= Convert the Amlogic Meson6 SoCs Timer Controller bindings to dt-schema. Reviewed-by: Krzysztof Kozlowski Reviewed-by: Martin Blumenstingl Signed-off-by: Neil Armstrong --- .../bindings/timer/amlogic,meson6-timer.txt | 22 --------- .../bindings/timer/amlogic,meson6-timer.yaml | 54 ++++++++++++++++++++++ 2 files changed, 54 insertions(+), 22 deletions(-) diff --git a/Documentation/devicetree/bindings/timer/amlogic,meson6-timer.txt b/Documentation/devicetree/bindings/timer/amlogic,meson6-timer.txt deleted file mode 100644 index a9da22bda912..000000000000 --- a/Documentation/devicetree/bindings/timer/amlogic,meson6-timer.txt +++ /dev/null @@ -1,22 +0,0 @@ -Amlogic Meson6 SoCs Timer Controller - -Required properties: - -- compatible : should be "amlogic,meson6-timer" -- reg : Specifies base physical address and size of the registers. -- interrupts : The four interrupts, one for each timer event -- clocks : phandles to the pclk (system clock) and XTAL clocks -- clock-names : must contain "pclk" and "xtal" - -Example: - -timer@c1109940 { - compatible = "amlogic,meson6-timer"; - reg = <0xc1109940 0x14>; - interrupts = , - , - , - ; - clocks = <&xtal>, <&clk81>; - clock-names = "xtal", "pclk"; -}; diff --git a/Documentation/devicetree/bindings/timer/amlogic,meson6-timer.yaml b/Documentation/devicetree/bindings/timer/amlogic,meson6-timer.yaml new file mode 100644 index 000000000000..8381a5404ef7 --- /dev/null +++ b/Documentation/devicetree/bindings/timer/amlogic,meson6-timer.yaml @@ -0,0 +1,54 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/timer/amlogic,meson6-timer.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Amlogic Meson6 SoCs Timer Controller + +maintainers: + - Neil Armstrong + - Martin Blumenstingl + +properties: + compatible: + const: amlogic,meson6-timer + + reg: + maxItems: 1 + + interrupts: + maxItems: 4 + description: per-timer event interrupts + + clocks: + maxItems: 2 + + clock-names: + items: + - const: xtal + - const: pclk + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + +additionalProperties: false + +examples: + - | + #include + #include + timer@c1109940 { + compatible = "amlogic,meson6-timer"; + reg = <0xc1109940 0x14>; + interrupts = , + , + , + ; + clocks = <&xtal>, <&clk81>; + clock-names = "xtal", "pclk"; + }; From patchwork Mon Jan 23 10:10:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 47093 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1525134wrn; Mon, 23 Jan 2023 02:12:22 -0800 (PST) X-Google-Smtp-Source: AMrXdXtMr1RXc954z9XCE5CkZJ3LxQTI57Ybf4CfHKPTfo1Aq1geStifuUTKCVN7d48od0JdDnnL X-Received: by 2002:a05:6a20:2a21:b0:b5:ae83:2ba4 with SMTP id e33-20020a056a202a2100b000b5ae832ba4mr46753504pzh.56.1674468742017; Mon, 23 Jan 2023 02:12:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674468741; cv=none; d=google.com; s=arc-20160816; b=fBuwMCdOfk63fBVxlbb0awR6ymEVdRnwRfJWzrXAApmJc7qUu3bpbRUR49HCuaXshD bXQsqZufJ5GaCc+ZnySDAv/jcjENZoPw0l0XgPAAg1JclWcdEqIs9k84iXh/GCYuq6aa vP7GDcVY5JHGb4YqAqe0LNFKvvHpsJbEWTYac5E/fdU5dSXe3ks1oMi+TJ0K/sMKROTF 8E9pPdkhTTLaxXDYsTw4QYrLp/IsdAdvnj1XiCPnFTR+hyo1IKo0ZL4ZKByFpYXyHsqG 4iC5T6z251hdcoCFWhgl+5bC+9aCaEzYBA6MR5GXFKl4VJ+suZyN+87s3T02jPX6bxjG c8Tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=7QnuhptbipJYdHWSiiqtgEE8IRm3fj6CX7C8k1jBDlQ=; b=hC3DH8RvQvuyTZd98Me6TOvzuLxlmONlx9ucahIHpUh28iluHTg/KKVWmztbdv2ndd NYehC8q94ddFKLXTHCq0Zi3goHPkLAW9sr2UlbcL8EtM2XAE6dYKBbjCub/AoqYvrGsi 3J3EcUvqjJdRCi1VA9Csissp6cWapwdLuNKKsJEx2TRpP0049Fky5xds9Kjr6chrFoGB 912MSYB5/qI8K8R+u1TlwG9QrCSa3Sj0kmWsbTdom9AvDPhaW2BzT49v4xGjZmWdCheS zYEJQ3cTYnpjWBKhfg4x6vc9PFk1eIk3Qxpy1/qoeaSsLZs0pxDIzPF2/boa+DHnTrOW gx9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=D2y6U13j; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a2-20020a63e402000000b004a2f26de947si50588935pgi.224.2023.01.23.02.12.09; Mon, 23 Jan 2023 02:12:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=D2y6U13j; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231809AbjAWKK0 (ORCPT + 99 others); Mon, 23 Jan 2023 05:10:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231845AbjAWKKT (ORCPT ); Mon, 23 Jan 2023 05:10:19 -0500 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D37B8E3A1 for ; Mon, 23 Jan 2023 02:10:08 -0800 (PST) Received: by mail-wm1-x335.google.com with SMTP id c10-20020a05600c0a4a00b003db0636ff84so8146821wmq.0 for ; Mon, 23 Jan 2023 02:10:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=7QnuhptbipJYdHWSiiqtgEE8IRm3fj6CX7C8k1jBDlQ=; b=D2y6U13jAntOiII5Aj+46tSWmTvxoLNv6sysz+VOmfozTTtUplEHw/9zJLa/WQFN4b z6MDrnXxEpjFTbleI8OQga5JOVXSc5MQrAHEjm4F5lIELUOklfl2pVTVWBqYLTpAZWnq +gHsMkk8a0sgdaCXNIh4/hLYh2fGtRSNjYfNBqqmHn/+PYmkBuOt7Dag3uuoruiOpF5G +/6ZCncD01okOf0tQRspFteJ1WszTHPskrSwrNboikKlj0lOxNhwwWA+uZ5gJjKhebZ6 dKD0KuLRHj63x0REhkpGva8rSPkVla8xTKleOMeKYrIk2jgClPNA/DyLOBdsF3+ZXgIt SHXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7QnuhptbipJYdHWSiiqtgEE8IRm3fj6CX7C8k1jBDlQ=; b=hs90yEKXK7lFMy7mEqEULSF4qbLTpKj/VbgfSID5rN7LO1vxpKUyuVlTsH1pqXdQpU g8nJyhNEQxRDoS69e37XfSdalJ34loxEWydnmYTFBBCj5QfmoeFSLgYDEzKNTZMV3o3T xUid4hnzVNqIl8Dn76lFaBnXkiwVNdUfhd2JtGAs0SRN4329D20xjqGEI3m/84RfrkJT 3o5+W9fakeSVU6Ckm6OGQRj2u4W4l/C3r3uow7EwsqLnvrhecDnzoye0jXM8EkHK2zdu mofaJw0zn43Agl7MSg/eVlIvd4dL8oDs9YPVwl273RsPdfr5Hv025pYFNuYhuo95AqRf mXiw== X-Gm-Message-State: AFqh2krPLJVlTOplflTF4628f9CmEBUuepZXidtM6kvPskL2Fa/fMvC/ R6BM7Wv/4UWdYiwxnJFUGn81hw== X-Received: by 2002:a05:600c:2284:b0:3d3:5c21:dd9d with SMTP id 4-20020a05600c228400b003d35c21dd9dmr23604933wmf.19.1674468608355; Mon, 23 Jan 2023 02:10:08 -0800 (PST) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id m9-20020a056000024900b002bdec340a1csm22670403wrz.110.2023.01.23.02.10.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 02:10:08 -0800 (PST) From: Neil Armstrong Date: Mon, 23 Jan 2023 11:10:03 +0100 Subject: [PATCH v3 6/7] dt-bindings: mmc: convert amlogic,meson-gx.txt to dt-schema MIME-Version: 1.0 Message-Id: <20221117-b4-amlogic-bindings-convert-v3-6-e28dd31e3bed@linaro.org> References: <20221117-b4-amlogic-bindings-convert-v3-0-e28dd31e3bed@linaro.org> In-Reply-To: <20221117-b4-amlogic-bindings-convert-v3-0-e28dd31e3bed@linaro.org> To: Srinivas Kandagatla , Rob Herring , Krzysztof Kozlowski , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Wim Van Sebroeck , Guenter Roeck , Mauro Carvalho Chehab , Daniel Lezcano , Thomas Gleixner , Ulf Hansson , Bjorn Helgaas , Lorenzo Pieralisi , Rob Herring , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org, linux-media@vger.kernel.org, linux-mmc@vger.kernel.org, linux-pci@vger.kernel.org X-Mailer: b4 0.12.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755807735421921538?= X-GMAIL-MSGID: =?utf-8?q?1755807735421921538?= Convert the Amlogic SD / eMMC controller for S905/GXBB family SoCs to dt-schema. Take in account the used variant with amlogic,meson-gx-mmc. Signed-off-by: Neil Armstrong Reviewed-by: Krzysztof Kozlowski --- .../bindings/mmc/amlogic,meson-gx-mmc.yaml | 73 ++++++++++++++++++++++ .../devicetree/bindings/mmc/amlogic,meson-gx.txt | 39 ------------ 2 files changed, 73 insertions(+), 39 deletions(-) diff --git a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml new file mode 100644 index 000000000000..46e235bf228b --- /dev/null +++ b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml @@ -0,0 +1,73 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mmc/amlogic,meson-gx-mmc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Amlogic SD / eMMC controller for S905/GXBB family SoCs + +description: + The MMC 5.1 compliant host controller on Amlogic provides the + interface for SD, eMMC and SDIO devices + +maintainers: + - Neil Armstrong + +allOf: + - $ref: mmc-controller.yaml# + +properties: + compatible: + oneOf: + - const: amlogic,meson-axg-mmc + - items: + - const: amlogic,meson-gx-mmc + - const: amlogic,meson-gxbb-mmc + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + maxItems: 3 + + clock-names: + items: + - const: core + - const: clkin0 + - const: clkin1 + + resets: + maxItems: 1 + + amlogic,dram-access-quirk: + type: boolean + description: + set when controller's internal DMA engine cannot access the DRAM memory, + like on the G12A dedicated SDIO controller. + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - resets + +unevaluatedProperties: false + +examples: + - | + #include + #include + mmc@70000 { + compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc"; + reg = <0x70000 0x2000>; + interrupts = ; + clocks = <&clk_mmc>, <&xtal>, <&clk_div>; + clock-names = "core", "clkin0", "clkin1"; + pinctrl-0 = <&emm_pins>; + resets = <&reset_mmc>; + }; diff --git a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt deleted file mode 100644 index ccc5358db131..000000000000 --- a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt +++ /dev/null @@ -1,39 +0,0 @@ -Amlogic SD / eMMC controller for S905/GXBB family SoCs - -The MMC 5.1 compliant host controller on Amlogic provides the -interface for SD, eMMC and SDIO devices. - -This file documents the properties in addition to those available in -the MMC core bindings, documented by mmc.txt. - -Required properties: -- compatible : contains one of: - - "amlogic,meson-gx-mmc" - - "amlogic,meson-gxbb-mmc" - - "amlogic,meson-gxl-mmc" - - "amlogic,meson-gxm-mmc" - - "amlogic,meson-axg-mmc" -- clocks : A list of phandle + clock-specifier pairs for the clocks listed in clock-names. -- clock-names: Should contain the following: - "core" - Main peripheral bus clock - "clkin0" - Parent clock of internal mux - "clkin1" - Other parent clock of internal mux - The driver has an internal mux clock which switches between clkin0 and clkin1 depending on the - clock rate requested by the MMC core. -- resets : phandle of the internal reset line - -Optional properties: -- amlogic,dram-access-quirk: set when controller's internal DMA engine cannot access the - DRAM memory, like on the G12A dedicated SDIO controller. - -Example: - - sd_emmc_a: mmc@70000 { - compatible = "amlogic,meson-gxbb-mmc"; - reg = <0x0 0x70000 0x0 0x2000>; - interrupts = < GIC_SPI 216 IRQ_TYPE_EDGE_RISING>; - clocks = <&clkc CLKID_SD_EMMC_A>, <&xtal>, <&clkc CLKID_FCLK_DIV2>; - clock-names = "core", "clkin0", "clkin1"; - pinctrl-0 = <&emmc_pins>; - resets = <&reset RESET_SD_EMMC_A>; - }; From patchwork Mon Jan 23 10:10:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 47095 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1525415wrn; Mon, 23 Jan 2023 02:13:10 -0800 (PST) X-Google-Smtp-Source: AMrXdXsSkptcK1eklR3V8UeZPvn0+PO0sJp3UYQLUIfy4hmjK2IEx2SkxNSCgaIV/PwPqYjSoL16 X-Received: by 2002:a17:903:181:b0:194:a859:3e0 with SMTP id z1-20020a170903018100b00194a85903e0mr31488174plg.58.1674468789916; Mon, 23 Jan 2023 02:13:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674468789; cv=none; d=google.com; s=arc-20160816; b=quiQU/TSsPwg1eWRtI9KWQNwsugSBO4XxQ3AN2Rtr1g+LM3r49NETfmlpsSIZxZyO4 TSVp/6Aa+9htnk+ROOtt+lSro9LO3swbQJtgkTUZLNRsqXOoqCqGR/CHmDtI4Sie6fzT XYhHUZg2ZlWC1GJZQsqOfEsDiRNHD5RfG/SkGH6vrwrCWDkyf/RYeQdpmOmmjUV7HciT FKUD243n6NzYol04MmE6U/vnnQfmpzkpgG7GiYzxk2OskPa7xVAC6NJi+6hCjY43t6Hy a3BJcH6nVgURIIOEyatkCJcUXTA3Jpt69oQmvL6PaE3Ck4ca/cETc+0OXIeQJI71UZT+ zwYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=/pQr6KmTdUgnaHE8iXfJ0bvx2pGOLcHh3rodgiE7+Kk=; b=JQu4ON/EkTNzy61k4OikJOlXTbHYW7i0jY268lXxGJ1uuVV9UsvHgAJhIBrjAErOIo xi5IqiIo45LcRax0DWWW6Cv9spLV8+FdhD2IkIeeQhuykXe4P/p1DKsbNQsFz5yGSvEZ vW6XWnLk1bcm2ZvuQmvxnt+Mq4Y2YK1PEU8Iiq3FHIw/3fSamuIyUmN8XOeo569UIEsG EZStcy7WGd1dHTBnpW/UlZLAZvUDVtotjGh2EK42wyNBgZC0mqTjuN5ZBwLcssYDv+1M 5RDHINePBRw4yw6yT7TJsVmpM+td5sJQmQZUdCsdZvzHAfbm8PtCpMd9+T/Dj2WmVu7Z BMmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fNsjAacd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q18-20020a170902dad200b00186b6a32284si37186365plx.548.2023.01.23.02.12.57; Mon, 23 Jan 2023 02:13:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fNsjAacd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231987AbjAWKKf (ORCPT + 99 others); Mon, 23 Jan 2023 05:10:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231938AbjAWKKW (ORCPT ); Mon, 23 Jan 2023 05:10:22 -0500 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31B331ABF0 for ; Mon, 23 Jan 2023 02:10:10 -0800 (PST) Received: by mail-wr1-x434.google.com with SMTP id z5so10256006wrt.6 for ; Mon, 23 Jan 2023 02:10:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=/pQr6KmTdUgnaHE8iXfJ0bvx2pGOLcHh3rodgiE7+Kk=; b=fNsjAacdBPOR5DiDkCUpjezb9Dvezn7/R1FOw2oZ6QwPNBVsWcDPdfYkSTPbKULF5H L6X8evzYtigZvdTanLyQe7YKEypW1MmUWAFSXc/OX09EViqzK6jhSEbwUFE0CXqf6ClZ xecJS89i7tQY3WnNwOsN2PxhADwmM9yP2wOXtSSOciODP5/ZScoY8iJRrd9rCWSQWr+I 6S2U+eXdSVoQ2hLeHBv4+RRBYOoGqIlisoiMjDNUQEm0Amv4dzcoL/6Se6PRpm8aNmlZ 0ahovNgqgULX1nnl+wkzFGtG/sy1fWqs6a8s0NEEargwtSBytuV/rX2GJW1zF3/gReFF UDpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/pQr6KmTdUgnaHE8iXfJ0bvx2pGOLcHh3rodgiE7+Kk=; b=gs465BrgIEQzTC1b4sTx5RnUQTbsKXa7NtpBunB4Vkse5+JL90GIa6fFnsFb1e8xe3 NCTWNpl4T26fVd+6jwI6OAXlgrW0VcrHAhbPHjQF2Fz781yCwCGFPXS4gVwIpvwmZi6k 21cIa/RIn1JSknEiIAA2wenezWbvdn/qlKQ3+/X8soLQ+vw2LxenFUlY6gr1Q9zMFDyz TeJ2QoSvOVb6Gi83RnyD2S4SZt3I38uNAw5mTrmtP9UtrRw5BJfDyFAfqN1GB/zPvcv3 qFoCyxptRRt+1QDVLhyCB0faw5uvFG7jeiYYnUBbPcWc9SGkJQ6nq6hudaK3f8bdnJbn sj1w== X-Gm-Message-State: AFqh2kocz9NAEd7FH/19XvRg2L9O35XXPyq8V98IAO9HmaaMXJEjKog+ crzf/6kWXa7gujpXqWfpPryNzQ== X-Received: by 2002:a5d:4bce:0:b0:2be:4ae1:215a with SMTP id l14-20020a5d4bce000000b002be4ae1215amr11722277wrt.16.1674468609550; Mon, 23 Jan 2023 02:10:09 -0800 (PST) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id m9-20020a056000024900b002bdec340a1csm22670403wrz.110.2023.01.23.02.10.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 02:10:09 -0800 (PST) From: Neil Armstrong Date: Mon, 23 Jan 2023 11:10:04 +0100 Subject: [PATCH v3 7/7] dt-bindings: PCI: convert amlogic,meson-pcie.txt to dt-schema MIME-Version: 1.0 Message-Id: <20221117-b4-amlogic-bindings-convert-v3-7-e28dd31e3bed@linaro.org> References: <20221117-b4-amlogic-bindings-convert-v3-0-e28dd31e3bed@linaro.org> In-Reply-To: <20221117-b4-amlogic-bindings-convert-v3-0-e28dd31e3bed@linaro.org> To: Srinivas Kandagatla , Rob Herring , Krzysztof Kozlowski , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Wim Van Sebroeck , Guenter Roeck , Mauro Carvalho Chehab , Daniel Lezcano , Thomas Gleixner , Ulf Hansson , Bjorn Helgaas , Lorenzo Pieralisi , Rob Herring , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org, linux-media@vger.kernel.org, linux-mmc@vger.kernel.org, linux-pci@vger.kernel.org, Krzysztof Kozlowski X-Mailer: b4 0.12.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755807785929849320?= X-GMAIL-MSGID: =?utf-8?q?1755807785929849320?= Convert the Amlogic Meson AXG DWC PCIe SoC controller bindings to dt-schema. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Neil Armstrong --- .../devicetree/bindings/pci/amlogic,axg-pcie.yaml | 134 +++++++++++++++++++++ .../devicetree/bindings/pci/amlogic,meson-pcie.txt | 70 ----------- 2 files changed, 134 insertions(+), 70 deletions(-) diff --git a/Documentation/devicetree/bindings/pci/amlogic,axg-pcie.yaml b/Documentation/devicetree/bindings/pci/amlogic,axg-pcie.yaml new file mode 100644 index 000000000000..a5bd90bc0712 --- /dev/null +++ b/Documentation/devicetree/bindings/pci/amlogic,axg-pcie.yaml @@ -0,0 +1,134 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/pci/amlogic,axg-pcie.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Amlogic Meson AXG DWC PCIe SoC controller + +maintainers: + - Neil Armstrong + +description: + Amlogic Meson PCIe host controller is based on the Synopsys DesignWare PCI core. + +allOf: + - $ref: /schemas/pci/pci-bus.yaml# + - $ref: /schemas/pci/snps,dw-pcie-common.yaml# + +# We need a select here so we don't match all nodes with 'snps,dw-pcie' +select: + properties: + compatible: + enum: + - amlogic,axg-pcie + - amlogic,g12a-pcie + required: + - compatible + +properties: + compatible: + items: + - enum: + - amlogic,axg-pcie + - amlogic,g12a-pcie + - const: snps,dw-pcie + + reg: + items: + - description: External local bus interface registers + - description: Meson designed configuration registers + - description: PCIe configuration space + + reg-names: + items: + - const: elbi + - const: cfg + - const: config + + interrupts: + maxItems: 1 + + clocks: + items: + - description: PCIe GEN 100M PLL clock + - description: PCIe RC clock gate + - description: PCIe PHY clock + + clock-names: + items: + - const: pclk + - const: port + - const: general + + phys: + maxItems: 1 + + phy-names: + const: pcie + + resets: + items: + - description: Port Reset + - description: Shared APB reset + + reset-names: + items: + - const: port + - const: apb + + num-lanes: + const: 1 + + power-domains: + maxItems: 1 + +required: + - compatible + - reg + - reg-names + - interrupts + - clock + - clock-names + - "#address-cells" + - "#size-cells" + - "#interrupt-cells" + - interrupt-map + - interrupt-map-mask + - ranges + - bus-range + - device_type + - num-lanes + - phys + - phy-names + - resets + - reset-names + +unevaluatedProperties: false + +examples: + - | + #include + #include + pcie: pcie@f9800000 { + compatible = "amlogic,axg-pcie", "snps,dw-pcie"; + reg = <0xf9800000 0x400000>, <0xff646000 0x2000>, <0xf9f00000 0x100000>; + reg-names = "elbi", "cfg", "config"; + interrupts = ; + clocks = <&pclk>, <&clk_port>, <&clk_phy>; + clock-names = "pclk", "port", "general"; + resets = <&reset_pcie_port>, <&reset_pcie_apb>; + reset-names = "port", "apb"; + phys = <&pcie_phy>; + phy-names = "pcie"; + #interrupt-cells = <1>; + interrupt-map-mask = <0 0 0 0>; + interrupt-map = <0 0 0 0 &gic GIC_SPI 179 IRQ_TYPE_EDGE_RISING>; + bus-range = <0x0 0xff>; + #address-cells = <3>; + #size-cells = <2>; + device_type = "pci"; + num-lanes = <1>; + ranges = <0x82000000 0 0 0xf9c00000 0 0x00300000>; + }; +... diff --git a/Documentation/devicetree/bindings/pci/amlogic,meson-pcie.txt b/Documentation/devicetree/bindings/pci/amlogic,meson-pcie.txt deleted file mode 100644 index c3a75ac6e59d..000000000000 --- a/Documentation/devicetree/bindings/pci/amlogic,meson-pcie.txt +++ /dev/null @@ -1,70 +0,0 @@ -Amlogic Meson AXG DWC PCIE SoC controller - -Amlogic Meson PCIe host controller is based on the Synopsys DesignWare PCI core. -It shares common functions with the PCIe DesignWare core driver and -inherits common properties defined in -Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml. - -Additional properties are described here: - -Required properties: -- compatible: - should contain : - - "amlogic,axg-pcie" for AXG SoC Family - - "amlogic,g12a-pcie" for G12A SoC Family - to identify the core. -- reg: - should contain the configuration address space. -- reg-names: Must be - - "elbi" External local bus interface registers - - "cfg" Meson specific registers - - "config" PCIe configuration space -- reset-gpios: The GPIO to generate PCIe PERST# assert and deassert signal. -- clocks: Must contain an entry for each entry in clock-names. -- clock-names: Must include the following entries: - - "pclk" PCIe GEN 100M PLL clock - - "port" PCIe_x(A or B) RC clock gate - - "general" PCIe Phy clock -- resets: phandle to the reset lines. -- reset-names: must contain "port" and "apb" - - "port" Port A or B reset - - "apb" Share APB reset -- phys: should contain a phandle to the PCIE phy -- phy-names: must contain "pcie" - -- device_type: - should be "pci". As specified in snps,dw-pcie.yaml - - -Example configuration: - - pcie: pcie@f9800000 { - compatible = "amlogic,axg-pcie", "snps,dw-pcie"; - reg = <0x0 0xf9800000 0x0 0x400000 - 0x0 0xff646000 0x0 0x2000 - 0x0 0xf9f00000 0x0 0x100000>; - reg-names = "elbi", "cfg", "config"; - reset-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>; - interrupts = ; - #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 0>; - interrupt-map = <0 0 0 0 &gic GIC_SPI 179 IRQ_TYPE_EDGE_RISING>; - bus-range = <0x0 0xff>; - #address-cells = <3>; - #size-cells = <2>; - device_type = "pci"; - ranges = <0x82000000 0 0 0x0 0xf9c00000 0 0x00300000>; - - clocks = <&clkc CLKID_USB - &clkc CLKID_PCIE_A - &clkc CLKID_PCIE_CML_EN0>; - clock-names = "general", - "pclk", - "port"; - resets = <&reset RESET_PCIE_A>, - <&reset RESET_PCIE_APB>; - reset-names = "port", - "apb"; - phys = <&pcie_phy>; - phy-names = "pcie"; - };