From patchwork Thu Jan 30 21:12:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 190498 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.9 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1DF83C2D0DB for ; Thu, 30 Jan 2020 21:13:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DD1EE215A4 for ; Thu, 30 Jan 2020 21:13:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="SQtPMKRt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727751AbgA3VN6 (ORCPT ); Thu, 30 Jan 2020 16:13:58 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:37231 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726739AbgA3VMt (ORCPT ); Thu, 30 Jan 2020 16:12:49 -0500 Received: by mail-pf1-f195.google.com with SMTP id p14so2132198pfn.4 for ; Thu, 30 Jan 2020 13:12:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=DL3Xj2gy1feowgW/Sg72hYm7o1TkTy8xgZkITqMjsW4=; b=SQtPMKRtj01P5JJJGS396b8R3/3VeGV4/R0qVWQ0LNcuyKhXZKWXHympAr0KWSUzEp HJsnhbaR0wQdSzKp2GquCd5O7h/XslBk3nd1vkThvsPahkHe/OZwg/G4Rhvk56OQsU7C D+39eKvuEznG/23cEBUnljBFerE9MHyGZ9HOM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=DL3Xj2gy1feowgW/Sg72hYm7o1TkTy8xgZkITqMjsW4=; b=WHrKhsTUGQtlX/qsVoUbbUXG/yiKVMnS+pXguyraSu1wQJlcY9okXEuSFUrXyYBlpB 5ZDMHCsYRUnGb7oyRSLBYb+JqQ3vpET1JnyZLaG6nfwdzT2RhJtAYI+XXm2XiL/sPgUa PlVit0lS4dyPkjkj/s6kRNdGBXq+ZoGI6Uc78mb43QS2CznlWYR/pu8wVeTjUi4FhRfA GBj3xiYFZsORPMODn44Quzw0PfH5DqnR5gEZ+uGpFYxrGmkEmGlZIeJ+ZYESccRg5CoV E01EChUVSpvI2yPkOFkH2FFx7XeBu8p5ts8BT0+fDKATUPvaOM8L0IMbgeUG4hnIDj34 buVw== X-Gm-Message-State: APjAAAXf1U4/NJpj55u5S4vX4VYbfpP2mDP49HAVNpOxj+WTIMpxzEOF 425K3DDQLsPrasV/uvi31IhZQg== X-Google-Smtp-Source: APXvYqyydq94vw+3/2Uuxvh7TPDi7rgVwiLWorocrqm2vUTw+2MylyCLOwQKrq2TEnAs18vfsj+N1w== X-Received: by 2002:a63:4d4c:: with SMTP id n12mr6860359pgl.212.1580418768475; Thu, 30 Jan 2020 13:12:48 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:15c:202:1:24fa:e766:52c9:e3b2]) by smtp.gmail.com with ESMTPSA id ci5sm4343871pjb.5.2020.01.30.13.12.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jan 2020 13:12:48 -0800 (PST) From: Douglas Anderson To: Rob Herring , Andy Gross , Bjorn Andersson , Stephen Boyd Cc: Jeffrey Hugo , Taniya Das , jeffrey.l.hugo@gmail.com, linux-arm-msm@vger.kernel.org, harigovi@codeaurora.org, devicetree@vger.kernel.org, mka@chromium.org, kalyan_t@codeaurora.org, Mark Rutland , linux-clk@vger.kernel.org, hoegsberg@chromium.org, Douglas Anderson , Michael Turquette , linux-kernel@vger.kernel.org, Rob Herring Subject: [PATCH v3 00/15] clk: qcom: Fix parenting for dispcc/gpucc/videocc Date: Thu, 30 Jan 2020 13:12:16 -0800 Message-Id: <20200130211231.224656-1-dianders@chromium.org> X-Mailer: git-send-email 2.25.0.341.g760bfbb309-goog MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The aim of this series is to get the dispcc and gpucc in a workable shape upstream for sc7180. I personally wasn't focusing on (and didn't test much) videocc but pulled it along for the ride. Most of the work in this series deals with the fact that the parenting info for these clock controllers was in a bad shape. It looks like it was half transitioned from the old way of doing things (relying on global names) to the new way of doing things (putting the linkage in the device tree). This should fully transition us. As part of this transition I update the sdm845.dtsi file to specify the info as per the new way of doing things. Although I've now put the linkage info in the sdm845.dtsi file, though, I haven't updated the sdm845 clock drivers in Linux so they still work via the global name matching. It's left as an exercise to the reader to update the sdm845 clock drivers in Linux. This series passes these things for me on linux-next (next-20200129) after picking the recent gcc fix I posted [1]: for f in \ Documentation/devicetree/bindings/clock/qcom,msm8998-gpucc.yaml \ Documentation/devicetree/bindings/clock/qcom,sc7180-dispcc.yaml \ Documentation/devicetree/bindings/clock/qcom,sc7180-gpucc.yaml \ Documentation/devicetree/bindings/clock/qcom,sc7180-videocc.yaml \ Documentation/devicetree/bindings/clock/qcom,sdm845-dispcc.yaml \ Documentation/devicetree/bindings/clock/qcom,sdm845-gpucc.yaml \ Documentation/devicetree/bindings/clock/qcom,sdm845-videocc.yaml; do \ ARCH=arm64 make dtbs_check DT_SCHEMA_FILES=$f; \ done I also tried this: # Delete broken yaml: rm Documentation/devicetree/bindings/pci/intel-gw-pcie.yaml ARCH=arm64 make dt_binding_check | grep 'clock/qcom' ...and that didn't seem to indicate problems. I also tried this (make sure you don't run w/ -j64 or diff is hard): # Delete broken yaml: rm Documentation/devicetree/bindings/pci/intel-gw-pcie.yaml git checkout beforeMyCode ARCH=arm64 make dt_binding_check > old.txt 2>&1 git checkout myCode ARCH=arm64 make dt_binding_check > new.txt 2>&1 diff old.txt new.txt ...and that didn't seem to indicate problems. I have confirmed that (with extra patches) the display/gpu come up on sc7180 and sdm845-cheza. You can find the top of my downstream tree at: https://crrev.com/c/2017976/4 I have confirmed that sdm845-cheza display / GPU come up atop next-20200129, which is what this series is posted against. Compared to v2, this series has quite a few changes. Mostly it's: - Always split into multiple files (Stephen). - Use internal names, not purist names (Taniya). - I realized that I forgot to update the sc7180 video clock controller driver in v2. - A few other misc cleanups / fixes, see each patch for details. It feels like with this many patches there's very little chance I didn't do something stupid like make a tpyo or a paste-o paste-o, though I tried to cross-check as much as I could. I apologize in advance for the stupid things I did that I should have known better about. [1] https://lore.kernel.org/r/20200129152458.v2.1.I4452dc951d7556ede422835268742b25a18b356b@changeid Changes in v3: - Add Matthias tag. - Added include file to description. - Added pointer to inlude file in description. - Added videocc include file. - Discovered / added new gcc input clock on sdm845. - Everyone but msm8998 now uses internal QC names. - Fixed typo grpahics => graphics - Newly discovered gcc_disp_gpll0_div_clk_src added. - Patch ("clk: qcom: Get rid of fallback...dispcc-sc7180") split out for v3. - Patch ("clk: qcom: Get rid of the test...dispcc-sc7180") split out for v3. - Patch ("clk: qcom: Get rid of the test...gpucc-sc7180") split out for v3. - Patch ("clk: qcom: Get rid of the test...videocc-sc7180") new for v3. - Patch ("clk: qcom: Use ARRAY_SIZE in dispcc-sc7180...") split out for v3. - Patch ("clk: qcom: Use ARRAY_SIZE in gpucc-sc7180...") split out for v3. - Patch ("clk: qcom: Use ARRAY_SIZE in videocc-sc7180...") new for v3. - Split bindings into 3 files. - Split sc7180 and sdm845 into two files. - Split videocc bindings into 2 files. - Switched names to internal QC names rather than logical ones. - Unlike in v2, use internal name instead of purist name. - Updated commit description. Changes in v2: - Added includes - Changed various parent names to match bindings / driver - Patch ("arm64: dts: qcom: sdm845: Add...dispcc") new for v2. - Patch ("arm64: dts: qcom: sdm845: Add...gpucc") new for v2. - Patch ("arm64: dts: qcom: sdm845: Add...videocc") new for v2. - Patch ("clk: qcom: rcg2: Don't crash...") new for v2. - Patch ("dt-bindings: clock: Cleanup qcom,videocc") new for v2. - Patch ("dt-bindings: clock: Fix qcom,dispcc...") new for v2. - Patch ("dt-bindings: clock: Fix qcom,gpucc...") new for v2. Douglas Anderson (14): clk: qcom: rcg2: Don't crash if our parent can't be found; return an error dt-bindings: clock: Fix qcom,dispcc bindings for sdm845/sc7180 arm64: dts: qcom: sdm845: Add the missing clocks on the dispcc clk: qcom: Get rid of fallback global names for dispcc-sc7180 clk: qcom: Get rid of the test clock for dispcc-sc7180 clk: qcom: Use ARRAY_SIZE in dispcc-sc7180 for parent clocks dt-bindings: clock: Fix qcom,gpucc bindings for sdm845/sc7180/msm8998 arm64: dts: qcom: sdm845: Add missing clocks / fix names on the gpucc clk: qcom: Get rid of the test clock for gpucc-sc7180 clk: qcom: Use ARRAY_SIZE in gpucc-sc7180 for parent clocks dt-bindings: clock: Cleanup qcom,videocc bindings for sdm845/sc7180 clk: qcom: Get rid of the test clock for videocc-sc7180 clk: qcom: Use ARRAY_SIZE in videocc-sc7180 for parent clocks arm64: dts: qcom: sdm845: Add the missing clock on the videocc Taniya Das (1): arm64: dts: sc7180: Add clock controller nodes .../devicetree/bindings/clock/qcom,gpucc.yaml | 72 -------------- ...om,dispcc.yaml => qcom,msm8998-gpucc.yaml} | 33 +++---- .../bindings/clock/qcom,sc7180-dispcc.yaml | 84 ++++++++++++++++ .../bindings/clock/qcom,sc7180-gpucc.yaml | 72 ++++++++++++++ .../bindings/clock/qcom,sc7180-videocc.yaml | 63 ++++++++++++ .../bindings/clock/qcom,sdm845-dispcc.yaml | 99 +++++++++++++++++++ .../bindings/clock/qcom,sdm845-gpucc.yaml | 72 ++++++++++++++ ...,videocc.yaml => qcom,sdm845-videocc.yaml} | 27 ++--- arch/arm64/boot/dts/qcom/sc7180.dtsi | 47 +++++++++ arch/arm64/boot/dts/qcom/sdm845.dtsi | 28 +++++- drivers/clk/qcom/clk-rcg2.c | 3 + drivers/clk/qcom/dispcc-sc7180.c | 45 +++------ drivers/clk/qcom/gpucc-sc7180.c | 4 +- drivers/clk/qcom/videocc-sc7180.c | 4 +- 14 files changed, 513 insertions(+), 140 deletions(-) delete mode 100644 Documentation/devicetree/bindings/clock/qcom,gpucc.yaml rename Documentation/devicetree/bindings/clock/{qcom,dispcc.yaml => qcom,msm8998-gpucc.yaml} (51%) create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-dispcc.yaml create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-gpucc.yaml create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-videocc.yaml create mode 100644 Documentation/devicetree/bindings/clock/qcom,sdm845-dispcc.yaml create mode 100644 Documentation/devicetree/bindings/clock/qcom,sdm845-gpucc.yaml rename Documentation/devicetree/bindings/clock/{qcom,videocc.yaml => qcom,sdm845-videocc.yaml} (60%) Reviewed-by: Rob Herring