From patchwork Tue Aug 18 16:04:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Marek X-Patchwork-Id: 250618 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=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 C7519C433E1 for ; Tue, 18 Aug 2020 16:06:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A1252207DA for ; Tue, 18 Aug 2020 16:06:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=marek-ca.20150623.gappssmtp.com header.i=@marek-ca.20150623.gappssmtp.com header.b="ysnKismi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726894AbgHRQGh (ORCPT ); Tue, 18 Aug 2020 12:06:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726810AbgHRQGX (ORCPT ); Tue, 18 Aug 2020 12:06:23 -0400 Received: from mail-qk1-x744.google.com (mail-qk1-x744.google.com [IPv6:2607:f8b0:4864:20::744]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6DA89C061348 for ; Tue, 18 Aug 2020 09:06:22 -0700 (PDT) Received: by mail-qk1-x744.google.com with SMTP id i20so4505252qkk.8 for ; Tue, 18 Aug 2020 09:06:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marek-ca.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=67bzRpoZHKJN4TvGSl4PLgugaZtDFxIwY3BiNLQUAXw=; b=ysnKismirQG3Tn/AWM5af8ZsuO66oyYjlC/XxOVL660MqjUFVAcXSzK/8QG+8pmW5p VvxFtplJo/hpwUz7BNvpln85+THAg+OSXp3do0b98244SkuJdR6JWAQ0D/fIQ3t1boq/ pS32ajeF8bnUiuuL5G4Czk80Lfw+/9RW1hxpyN9ZriTGIlzPuftRUh7lf5j+V02r8lTk 3QyTiDTdlzXG8hRUZnwvPmqHGsdQIfsAPOZ7bBQr8UjU60NQcaQ7dFw1jbTvoVLysE1k kOjD84peUIoX90nR/xEkMuF41sqlrjtXmIFS9fszVPPBgzy+04NEn222ksRXSEBjyFKe bL8A== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=67bzRpoZHKJN4TvGSl4PLgugaZtDFxIwY3BiNLQUAXw=; b=Ika0v+9zJXWXqRGK2ql4hvfL1qT1GYzaFaCp9tA81NrUW6n8piL8B+//DBRtxLMqTO mtgLmRqjOAT3B4BH6gWa4/74b6lXLUiu1jOdKk3vEos1ws/QBbojEgMCixnTu3jALQFt duTjbnX2PCTB96Mec40ZLRxf5v9H6RJrdA6OiVwE+Wu1YbkwkkPP5bQKfXbJ3pWsgkDz 41qkGLrPIX446wxVWcWi20eHHGZnIah0sqGac/5luUX8kDtzTPQqemXKn9PFBXPrh9Ik OwoUlshwQc78Flu6GPembRsFHaC9OUWFV15ZRWvrf2A581XKGkPL+5ExzFA53CkW8CdV XPHg== X-Gm-Message-State: AOAM533fjez6IM3IZco7b/Rmlac4h/en4A8iEST7pG0R5oCIuM227g/e PYSekb1HxZP9iSwaY+14g++8zOIXO1jgG9Xa X-Google-Smtp-Source: ABdhPJz6YaHblVdUsO+t038UhP2eYwsT5GekIzGt1V1IH1hyXGi171nMB5ywW0xqb0tN9HseqE1rrQ== X-Received: by 2002:a05:620a:22f3:: with SMTP id p19mr17419632qki.116.1597766779360; Tue, 18 Aug 2020 09:06:19 -0700 (PDT) Received: from localhost.localdomain ([147.253.86.153]) by smtp.gmail.com with ESMTPSA id 128sm21198034qkk.101.2020.08.18.09.06.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Aug 2020 09:06:18 -0700 (PDT) From: Jonathan Marek To: linux-arm-msm@vger.kernel.org Cc: Andy Gross , Bjorn Andersson , Rob Herring , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/3] arm64: dts: qcom: use sm8150 gpucc dt-bindings Date: Tue, 18 Aug 2020 12:04:44 -0400 Message-Id: <20200818160445.14008-2-jonathan@marek.ca> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200818160445.14008-1-jonathan@marek.ca> References: <20200818160445.14008-1-jonathan@marek.ca> 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 Constants were used to allow merging separately from the dt-bindings, switch to symbolic names now that dt-bindings have landed. Signed-off-by: Jonathan Marek --- arch/arm64/boot/dts/qcom/sm8150.dtsi | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi index ab8680c6672e..62d49e81483e 100644 --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi @@ -10,6 +10,7 @@ #include #include #include +#include #include / { @@ -621,15 +622,15 @@ gmu: gmu@2c6a000 { ; interrupt-names = "hfi", "gmu"; - clocks = <&gpucc 0>, - <&gpucc 3>, - <&gpucc 6>, + clocks = <&gpucc GPU_CC_AHB_CLK>, + <&gpucc GPU_CC_CX_GMU_CLK>, + <&gpucc GPU_CC_CXO_CLK>, <&gcc GCC_DDRSS_GPU_AXI_CLK>, <&gcc GCC_GPU_MEMNOC_GFX_CLK>; clock-names = "ahb", "gmu", "cxo", "axi", "memnoc"; - power-domains = <&gpucc 0>, - <&gpucc 1>; + power-domains = <&gpucc GPU_CX_GDSC>, + <&gpucc GPU_GX_GDSC>; power-domain-names = "cx", "gx"; iommus = <&adreno_smmu 5 0x400>; @@ -674,12 +675,12 @@ adreno_smmu: iommu@2ca0000 { , , ; - clocks = <&gpucc 0>, + clocks = <&gpucc GPU_CC_AHB_CLK>, <&gcc GCC_GPU_MEMNOC_GFX_CLK>, <&gcc GCC_GPU_SNOC_DVM_GFX_CLK>; clock-names = "ahb", "bus", "iface"; - power-domains = <&gpucc 0>; + power-domains = <&gpucc GPU_CX_GDSC>; }; tlmm: pinctrl@3100000 {