From patchwork Tue Jan 30 14:05:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 768092 Delivered-To: patch@linaro.org Received: by 2002:adf:ee41:0:b0:33a:e5bd:fedd with SMTP id w1csp1388538wro; Tue, 30 Jan 2024 06:11:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IGosAyZwroMBl87uDN2L+POjK4e8+GsptZnmMrf85zdVmUR23Zf82IazF/ssiSr3v88pb73 X-Received: by 2002:a5d:60ca:0:b0:337:c93d:d815 with SMTP id x10-20020a5d60ca000000b00337c93dd815mr5618504wrt.35.1706623867587; Tue, 30 Jan 2024 06:11:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706623867; cv=none; d=google.com; s=arc-20160816; b=fZUNn9BB8lUT9YrzXl2CGusWnaj3GqrPLSwLB9Vn0y+j1A5b0aZvkiZ5abvmHrVg+E ppmHGiW3RGGT6W36OJNdnKkAYc/EHW9+8xGBtnSHMgTHvQvpfHKOwuJlD8WOsVz26LtR BY99h7+EVeHamgUGsLEqFWSXtNQiOKIUglZrQxygmqHRWucQ+U6ObHtAQwAeoZu/Cvnx Ye+5rdxLYM4gnIxaXlJbYIsfuheERnqfD8KHcdVeY+Yj27LNZ6hBfAKEO2H5x8cOsFqj UFiJPl46qce21TOpOtWMYsqDk0g1cPjkq/M5rCkuQdKvelqE7I8UOHUXNKb0lr9/gSLh xlVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:cc:to:in-reply-to:references :message-id:content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=EoPrJBfcdVTmMgaiIE05PQxdTHe+wKIeBsph+OkEYcE=; fh=GB9E9KzRIiNXhkRWIZbZpSMjbCjxnqnvE8nYuQxq8UI=; b=fga4N0sNeuhoK8beh3FcoXLHN+r/DK36l/J3brw0YY/llkXZQKloBoqFKbuysCNJiK L5Fke5Ib/J95EXmTSVQsmueaY36dcM0bCdZZsg6VioAMrCvpCSoTv/LUs577v3KjL1dk ++0ng7GwmpOV1nujQmfhzj5HD6uPPcM/gNTi7h1PO+YfAVx4Gr5edPkaNCFEFno6AOYz TBPOY0BlePe1B48zuxi695+EXdYtqeHZaOYmx7/RZDEsRG4WY6KOP26cx6B7ndPUZJQp YnX9HGmkamX9rjGXHWttGExdCNJ6k+KNgt2FQzUYagCzfiAG0/KMEbhhyuWYrgkaw40o Nz6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=A75lygmy; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id cs11-20020a056000088b00b00337bf8c0cccsi5375464wrb.199.2024.01.30.06.11.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 06:11:07 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=A75lygmy; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1DDDB87E48; Tue, 30 Jan 2024 15:06:04 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="A75lygmy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1E05487DFC; Tue, 30 Jan 2024 15:06:02 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 297B487E1D for ; Tue, 30 Jan 2024 15:05:42 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=caleb.connolly@linaro.org Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-51031ae95a1so3787550e87.0 for ; Tue, 30 Jan 2024 06:05:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706623541; x=1707228341; darn=lists.denx.de; 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=EoPrJBfcdVTmMgaiIE05PQxdTHe+wKIeBsph+OkEYcE=; b=A75lygmyNto5fk4yWc7ZZMjcCKgX131hyDHjU9e0Kz1AwKQh+Jx+hKHgfJ13jJkhI8 R6Ro8/EjMna7PIzvCIpvGZzVf+JZkvlApwdhx5tJDv4VPuB/UzkU7dY/iNW4QT4eCLYN 7BXJKk1BYOSuCYJiQ0GLXKCUFknCC/heaY91GRMTOUiG9pdHzM0phYRll1nYuZ4HrWuU OoFjtXvILdnGlI1C9raTn1FFkVVjqMGAps1z/MecdDzEQkkYLazUj/n0kKT2MkfOxan6 UOBOG++aezOGYPrh+V09vVz2Ny6ugmjtpWo7mS//TLVm2NMNkP0NfIeTm04J+q0oQb+m dZfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706623541; x=1707228341; 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=EoPrJBfcdVTmMgaiIE05PQxdTHe+wKIeBsph+OkEYcE=; b=Q2hGOEF1iyNFnYv2afZoWymt0dGGFWTMycrIrjHx0wNQvrdFGYcvNDvzz5nzBomhR8 UenSj1DNR+ZdBKs/aZqIT8mA53uJYGh9RLueLFS7H66wYdBl+ubuarSI1NNI5jm+YibA puKUf/7x7ap+XXI/RZcwqJWZ6oOYd7EidWn15O2Cnb9nGQz5zlGBcTMGM/BVVaIusTlV ToiNQaRMS5g1fufArHff7VJFDudHPJk8QrjhzFSZqiyExjexTrEBV9X7uHEzPGZLX+JN +FQU6BsyxRQl4Roc1G/apUdXitn2GGXX/zURMmfPP8SvQC3HbTCCTSAWy0BgVeGXpsSK BWYQ== X-Gm-Message-State: AOJu0YyFhXy9hqQAbqgHE85wXQ6Qmv7eIYkvhbl25fGyzwXzxh1ilMLY ptirA9YpnegQqW3GVNyPYM3RYMeSXsnb6q8qMkh3uJNFWW1avRiBXuNMZHRpDYA= X-Received: by 2002:a05:6512:348b:b0:50e:d1f:8221 with SMTP id v11-20020a056512348b00b0050e0d1f8221mr5907491lfr.10.1706623541606; Tue, 30 Jan 2024 06:05:41 -0800 (PST) Received: from lion.localdomain (host-92-17-96-232.as13285.net. [92.17.96.232]) by smtp.gmail.com with ESMTPSA id g11-20020a05600c310b00b0040f035bebfcsm1799017wmo.12.2024.01.30.06.05.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 06:05:41 -0800 (PST) From: Caleb Connolly Date: Tue, 30 Jan 2024 14:05:18 +0000 Subject: [PATCH v3 30/36] dts: dragonboard820c: use correct bindings for clocks MIME-Version: 1.0 Message-Id: <20240130-b4-qcom-common-target-v3-30-e523cbf9e556@linaro.org> References: <20240130-b4-qcom-common-target-v3-0-e523cbf9e556@linaro.org> In-Reply-To: <20240130-b4-qcom-common-target-v3-0-e523cbf9e556@linaro.org> To: Neil Armstrong , Sumit Garg , Ramon Fried , Dzmitry Sankouski , Caleb Connolly , Peng Fan , Jaehoon Chung , Rayagonda Kokatanur , Lukasz Majewski , Sean Anderson , Jorge Ramirez-Ortiz , Stephan Gerhold Cc: Marek Vasut , u-boot@lists.denx.de X-Mailer: b4 0.13-dev-4bd13 X-Developer-Signature: v=1; a=openpgp-sha256; l=2078; i=caleb.connolly@linaro.org; h=from:subject:message-id; bh=KHl8NwQjAEmv8odcmEIHsEOQPaSRTdu+Dug0m/whdbo=; b=owGbwMvMwCFYaeA6f6eBkTjjabUkhtSdTELpe8Pu7n/JHvX+g+gVl+uNVyVe/y26FHf7Cu/vU y/WM8Yd7yhlYRDkYJAVU2QRP7HMsmntZXuN7QsuwMxhZQIZwsDFKQATeXKK4Z/BhiXciiJfJcOO 3THwMlE/VObi61VnfPDTCq5/Vl6fp85i+F/XF/DC6nmf8vtjbI/Vfb15XQNnZlgWhdRdz16/9YR MYzMA X-Developer-Key: i=caleb.connolly@linaro.org; a=openpgp; fpr=83B24DA7FE145076BC38BB250CD904EB673A7C47 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Don't use hardcoded clock IDs, use the IDs from the dt-bindings to be compatible with upstream. Taken from kernel tag v6.7 Reviewed-by: Neil Armstrong Signed-off-by: Caleb Connolly --- arch/arm/dts/dragonboard820c.dts | 5 +++-- drivers/clk/qcom/clock-apq8096.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/arm/dts/dragonboard820c.dts b/arch/arm/dts/dragonboard820c.dts index 86b7f83d36d6..282c37e28f42 100644 --- a/arch/arm/dts/dragonboard820c.dts +++ b/arch/arm/dts/dragonboard820c.dts @@ -8,6 +8,7 @@ /dts-v1/; #include "skeleton64.dtsi" +#include / { model = "Qualcomm Technologies, Inc. DB820c"; @@ -78,7 +79,7 @@ blsp2_uart2: serial@75b0000 { compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; reg = <0x75b0000 0x1000>; - clocks = <&gcc 4>; + clocks = <&gcc GCC_BLSP2_UART2_APPS_CLK>; clock-names = "core"; pinctrl-names = "uart"; pinctrl-0 = <&blsp8_uart>; @@ -89,7 +90,7 @@ reg = <0x74a4900 0x314>, <0x74a4000 0x800>; index = <0x0>; bus-width = <4>; - clock = <&gcc 0>; + clock = <&gcc GCC_SDCC1_APPS_CLK>; clock-frequency = <200000000>; }; diff --git a/drivers/clk/qcom/clock-apq8096.c b/drivers/clk/qcom/clock-apq8096.c index 1e6fdb5cd42d..a4731613c5e0 100644 --- a/drivers/clk/qcom/clock-apq8096.c +++ b/drivers/clk/qcom/clock-apq8096.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "clock-qcom.h" @@ -107,10 +108,10 @@ static ulong apq8096_clk_set_rate(struct clk *clk, ulong rate) struct msm_clk_priv *priv = dev_get_priv(clk->dev); switch (clk->id) { - case 0: /* SDC1 */ + case GCC_SDCC1_APPS_CLK: /* SDC1 */ return clk_init_sdc(priv, rate); break; - case 4: /*UART2*/ + case GCC_BLSP2_UART2_APPS_CLK: /*UART2*/ return clk_init_uart(priv); default: return 0;