From patchwork Tue Apr 26 09:36:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 566287 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 B533DC433F5 for ; Tue, 26 Apr 2022 10:11:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348551AbiDZKOd (ORCPT ); Tue, 26 Apr 2022 06:14:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348590AbiDZKNY (ORCPT ); Tue, 26 Apr 2022 06:13:24 -0400 Received: from mail-lj1-x230.google.com (mail-lj1-x230.google.com [IPv6:2a00:1450:4864:20::230]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE25F22BE57 for ; Tue, 26 Apr 2022 02:36:15 -0700 (PDT) Received: by mail-lj1-x230.google.com with SMTP id 17so21200605lji.1 for ; Tue, 26 Apr 2022 02:36:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tH3TvKKnXPblTqVg7QnDnCSWxMYNwzCle2AW/mvTdUk=; b=ZlpdOX4SGfBQm99+6P3BSnFK7K0uGipKs4Lsocod+GYRc4ZhNZ6J6XxVl3KiThUI9/ cEUfzSzE7sLuIZgFCuvHpsUIVdlQiHxHezjDBWamuopumj2bM6bOPbW5w5l+ddHIFsHY 5SbtQFdJR8yAi14ubYebj8XJYtIP95lZ0JX6UIYUrpOneSSH7UrGmhCDHzksvUvHv2WP E9+MrmqvB74YOwOrX5qtEyfUwyxJulFXaUR3rDgISCuwHtEhIJLEYPlDZRwxXUaN62It Y3awcQhSRT12tZJVkdC57xUtid11FaAHaQQzWPVziWw1GJ9rnin8NxMZjIQTbsJGtLa/ uD4Q== 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=tH3TvKKnXPblTqVg7QnDnCSWxMYNwzCle2AW/mvTdUk=; b=mAI5RzztLM95wLpWn/RVOZ5Hnad9V32plnMX9sFYGx2NUm+vQHxV3yRPuBgV3p0YCN M8nJjBfTR4kIFK5kQT18ZYvyVXu9Cs16FAv0vjGLNRPvgPBIBjpxXuthJT3HgK4cxuc6 76i5D7uxnU2an1uVGJh5K0ATwuKMXtiw4448jTfqm6K1uSC/7OlHb8o4NFNTldmBOaOo LG1x2pN76LcQFf+mcgx0uPO835zwQAVHOZZeodQazZWUloQH2MTo+Y6+xIcL743WcW4V WRasFC8u9u9oTLZl98sGvubZxKwIOu8Ak8v/12bDa7d59U/6YPtBUCsn5wJ0c8IY26bd EWuw== X-Gm-Message-State: AOAM531YEYrbNfuLDQRTqiaYuWr+7sgVeGAfeoJm5QKtfqvGj9WW49LB t7ZLKDWiJEfoDSYyzp7Jw1N/SQ== X-Google-Smtp-Source: ABdhPJzUYGte1S74FszCtqPB4Cjm+F7MVFJO5hr+i1cxMABx/kVp6F/OFfM6Gro4UqBqE0n9GdfKcA== X-Received: by 2002:a2e:a816:0:b0:24d:9cd2:2d0a with SMTP id l22-20020a2ea816000000b0024d9cd22d0amr13533661ljq.26.1650965772897; Tue, 26 Apr 2022 02:36:12 -0700 (PDT) Received: from eriador.lumag.spb.ru ([188.162.64.30]) by smtp.gmail.com with ESMTPSA id x23-20020a056512131700b004486c863c8esm1684232lfu.257.2022.04.26.02.36.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Apr 2022 02:36:12 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Stephen Boyd , Michael Turquette , Rob Herring Cc: linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, Rob Herring Subject: [PATCH v2 1/2] dt-bindings: clock: gcc-apq8064: move qcom,apq8084 back to gcc-other.yaml Date: Tue, 26 Apr 2022 12:36:07 +0300 Message-Id: <20220426093608.2957210-2-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220426093608.2957210-1-dmitry.baryshkov@linaro.org> References: <20220426093608.2957210-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The global clock controller on apq8084 has nothing to do with the schema for apq8064. It uses the schema defined in qcom,gcc-other.yaml. Move respective declarations back. Instead add what was really meant to be present in qcom,gcc-apq8064 schema: the compatibility string for qcom,apq8064 device. Fixes: a469bf89a009 ("dt-bindings: clock: simplify qcom,gcc-apq8064 Documentation") Reported-by: Rob Herring Signed-off-by: Dmitry Baryshkov --- Documentation/devicetree/bindings/clock/qcom,gcc-apq8064.yaml | 4 +--- Documentation/devicetree/bindings/clock/qcom,gcc-other.yaml | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/clock/qcom,gcc-apq8064.yaml b/Documentation/devicetree/bindings/clock/qcom,gcc-apq8064.yaml index 97936411b6b4..9fafcb080069 100644 --- a/Documentation/devicetree/bindings/clock/qcom,gcc-apq8064.yaml +++ b/Documentation/devicetree/bindings/clock/qcom,gcc-apq8064.yaml @@ -20,12 +20,10 @@ description: | See also: - dt-bindings/clock/qcom,gcc-msm8960.h - dt-bindings/reset/qcom,gcc-msm8960.h - - dt-bindings/clock/qcom,gcc-apq8084.h - - dt-bindings/reset/qcom,gcc-apq8084.h properties: compatible: - const: qcom,gcc-apq8084 + const: qcom,gcc-apq8064 nvmem-cells: minItems: 1 diff --git a/Documentation/devicetree/bindings/clock/qcom,gcc-other.yaml b/Documentation/devicetree/bindings/clock/qcom,gcc-other.yaml index 6c45e0f85494..142402f29d98 100644 --- a/Documentation/devicetree/bindings/clock/qcom,gcc-other.yaml +++ b/Documentation/devicetree/bindings/clock/qcom,gcc-other.yaml @@ -15,6 +15,8 @@ description: | power domains. See also: + - dt-bindings/clock/qcom,gcc-apq8084.h + - dt-bindings/reset/qcom,gcc-apq8084.h - dt-bindings/clock/qcom,gcc-ipq4019.h - dt-bindings/clock/qcom,gcc-ipq6018.h - dt-bindings/reset/qcom,gcc-ipq6018.h @@ -36,6 +38,7 @@ allOf: properties: compatible: enum: + - qcom,gcc-apq8084 - qcom,gcc-ipq4019 - qcom,gcc-ipq6018 - qcom,gcc-mdm9607 From patchwork Tue Apr 26 09:36:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 566288 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 BF7E9C433EF for ; Tue, 26 Apr 2022 10:11:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244838AbiDZKOL (ORCPT ); Tue, 26 Apr 2022 06:14:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348588AbiDZKNY (ORCPT ); Tue, 26 Apr 2022 06:13:24 -0400 Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D269922BE6A for ; Tue, 26 Apr 2022 02:36:15 -0700 (PDT) Received: by mail-lj1-x234.google.com with SMTP id q185so11988125ljb.5 for ; Tue, 26 Apr 2022 02:36:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aqpv+MsraYmAMNWLkARIliibZ+YyOcALvDsEFEi8Sgw=; b=Fbc3VR9sFt2gzNsdu1qRY34I7dNBHhEavjo4EoxtDEIPoyfwt+HBDOljTWASj0kZ3u 5LuLxbpnFqSpYvFOkMwGb+pwGwvKQfNnjoCepxXubyPjMH9stI+S3ZfzZ+wx8BJ0SUNU nVFZ9NyWhTQw/wCNVUJQjpYrtFba0rPqIegEMVE7fHJIp8dcaFPqStR01NmGQamDrk8F pyKEZ4X2MqJtHZVT2ZnHKbXgSBhiSa91YkVBTq5PU9N2NsLC3nUoTdE31gzIVhxGjvlT HM68JF5uQi5a6WljlSO/qiyrhDTK/C5G8EpTdoJlb0huzVdUo98FPQnGPFlDpStlFEpW BWFQ== 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=aqpv+MsraYmAMNWLkARIliibZ+YyOcALvDsEFEi8Sgw=; b=FDdxBntZGswtmlgVetHWnhe/p0aqUp7gyzgU9e2tIP/1teNbAQfTor4SUAVhIiQ+Es Nkg2vRW5I7Pp51q4g9O4fUcIev66SOD/sTAjFY4R5ThiI1lQq6+o90rx1Cv//geCn49o /ImiBfvRvUWIEGyMG7l3XDhlf3BeA1MDZTdYc0QKIEQCZVzInoXdphXgLmvl2JIx+Di6 z+LdQwTIJ+Um7hp279f2laWRKJVMHWSr4PZZnYmuDxHnxowHFxL2r83U+A9GasyJhwtv OuRtvVehKiciFwCTJjNwrjpIlUQe0K0MFSbpEIj5KiDxaXovr+Rw6FP6lZkQB28YNhxf HuPA== X-Gm-Message-State: AOAM532UGbmgB4PxC2uquQrLKuSboDduwRpkFAeyJ/laz+jyalY+Q/gL A1FCLJ0ifYNqZ7ntqFduVzQfaw== X-Google-Smtp-Source: ABdhPJzQIFvoHDDbUzZA1glQx6vzXXSepDbgZjA5QEZ96AYEuu6jJ00WgexUTqYIwDrQ75CVGTaA1A== X-Received: by 2002:a2e:8617:0:b0:24d:a185:76c9 with SMTP id a23-20020a2e8617000000b0024da18576c9mr14013870lji.312.1650965774112; Tue, 26 Apr 2022 02:36:14 -0700 (PDT) Received: from eriador.lumag.spb.ru ([188.162.64.30]) by smtp.gmail.com with ESMTPSA id x23-20020a056512131700b004486c863c8esm1684232lfu.257.2022.04.26.02.36.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Apr 2022 02:36:13 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Stephen Boyd , Michael Turquette , Rob Herring Cc: linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 2/2] dt-bindings: clock/qcom,gcc-apq8064: move msm8960 compat from gcc-other.yaml Date: Tue, 26 Apr 2022 12:36:08 +0300 Message-Id: <20220426093608.2957210-3-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220426093608.2957210-1-dmitry.baryshkov@linaro.org> References: <20220426093608.2957210-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org MSM8960 shares the design (and the driver) of the global clock controller. Move it from clock/qcom,gcc-other.yaml to clock/qcom,gcc-apq8064.yaml. As the eaxmple in gcc-other.yaml was using the msm8960 compat string, change it to qcom,gcc-msm8660. Signed-off-by: Dmitry Baryshkov --- .../devicetree/bindings/clock/qcom,gcc-apq8064.yaml | 6 ++++-- Documentation/devicetree/bindings/clock/qcom,gcc-other.yaml | 5 ++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/clock/qcom,gcc-apq8064.yaml b/Documentation/devicetree/bindings/clock/qcom,gcc-apq8064.yaml index 9fafcb080069..bd7b04c75e50 100644 --- a/Documentation/devicetree/bindings/clock/qcom,gcc-apq8064.yaml +++ b/Documentation/devicetree/bindings/clock/qcom,gcc-apq8064.yaml @@ -4,7 +4,7 @@ $id: http://devicetree.org/schemas/clock/qcom,gcc-apq8064.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Qualcomm Global Clock & Reset Controller Binding for APQ8064 +title: Qualcomm Global Clock & Reset Controller Binding for APQ8064/MSM8960 allOf: - $ref: qcom,gcc.yaml# @@ -23,7 +23,9 @@ description: | properties: compatible: - const: qcom,gcc-apq8064 + enum: + - qcom,gcc-apq8064 + - qcom,gcc-msm8960 nvmem-cells: minItems: 1 diff --git a/Documentation/devicetree/bindings/clock/qcom,gcc-other.yaml b/Documentation/devicetree/bindings/clock/qcom,gcc-other.yaml index 142402f29d98..9c69083bd93e 100644 --- a/Documentation/devicetree/bindings/clock/qcom,gcc-other.yaml +++ b/Documentation/devicetree/bindings/clock/qcom,gcc-other.yaml @@ -47,7 +47,6 @@ properties: - qcom,gcc-msm8916 - qcom,gcc-msm8939 - qcom,gcc-msm8953 - - qcom,gcc-msm8960 - qcom,gcc-msm8974 - qcom,gcc-msm8974pro - qcom,gcc-msm8974pro-ac @@ -61,10 +60,10 @@ required: unevaluatedProperties: false examples: - # Example for GCC for MSM8960: + # Example for GCC for MSM8660: - | clock-controller@900000 { - compatible = "qcom,gcc-msm8960"; + compatible = "qcom,gcc-msm8660"; reg = <0x900000 0x4000>; #clock-cells = <1>; #reset-cells = <1>;