From patchwork Thu Feb 15 20:52:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 773034 Delivered-To: patch@linaro.org Received: by 2002:adf:9dc2:0:b0:33b:4db1:f5b3 with SMTP id q2csp1037563wre; Thu, 15 Feb 2024 13:01:03 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXEMB+mKqvrMTATerXYpgiVbDnxdH1FjEExfnxT3MSGWTheB/Yjm7BaCOppG9YmzpvmweYYX/2cpPPGTkwHPWrF X-Google-Smtp-Source: AGHT+IHD5eTskPgvrwjpYlB0uuRdvym9V0JiJprDXTNJD9H+k9oVKttTbHGakT5dEDQWba2FgV1a X-Received: by 2002:a2e:95c8:0:b0:2d1:1d91:376c with SMTP id y8-20020a2e95c8000000b002d11d91376cmr2080516ljh.31.1708030863302; Thu, 15 Feb 2024 13:01:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708030863; cv=none; d=google.com; s=arc-20160816; b=SKnAVdA+wzpAH8gVSBkfYDDmg72IuSCXngLtiyz3bSGgLJjWhegv8/jqm/asnXe8Lr 2NWmhdX+ZUJelN5830QR2PzusvE6HnggfBZ9cbl1vfJ1DSRgBPQ9+j4eri4xVZO19Xqo PMvem30ZHYiEz//sXhxYsZRRF8b5CVQvhvDX1jph/L/znqR/A2LhcEpOlI8FQxFQac8j 5OP4FgM4GCglAi8NeOc0R3xPI9IdPp3mquBEPLpnc+Qg24+BhLKtQuioxcTph1XEvGRt H91s2DzUOk6MPMiIYYT842FFh7blIx03NX75b2DZiFjpAu8xYP5Fga0Gr1MAibqNPKlT 75DQ== 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=bAZGfbWoqNKVvi6q8WscUjnpPJa5jw/DgSL1YaMeUHk=; fh=uj4/4e+YUUWLf5cCSbd0IJKNzc1n8kTXYJfvoDVMNiM=; b=t4AHsx0ErnAInzlAQs1gqvPpK8/I2Y5Ol64rsOuzODDvnDk/olZK05Vg9CxOtvaIFm tCtBTNxbR9BJxuBli/mGOrT7+CN14GxNauOjsFCwQP3bovw/7xTAGewGmOxsGsDBAqfb PEtSwLqOdMcgvoBGOgiJv/JCqVf5Ve2Ngpp3GOKnpc5K5oVlM+zqYHL90P7yzAr8NodT fLlAzPUoIODhzrYJnUPW4/bhMLiDh/OhDP9Wq2YQxwgHJgvma02sf1uma1wTV33CSPrS 7tQu8RpOVHv3ZQJ09OVgyMDmKKTjzhNLoT5/6lkKnLOxe155/CzNU3xwODQxsWMHVFrC Uy3w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vU6hjPK+; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 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. [85.214.62.61]) by mx.google.com with ESMTPS id t16-20020aa7d4d0000000b0056384d51a22si972873edr.610.2024.02.15.13.01.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 13:01:03 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vU6hjPK+; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 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 8DA8D87F94; Thu, 15 Feb 2024 21:54:08 +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="vU6hjPK+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DC1FC87F15; Thu, 15 Feb 2024 21:54:05 +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=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) (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 3AEB587F26 for ; Thu, 15 Feb 2024 21:53:02 +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-wr1-x42e.google.com with SMTP id ffacd0b85a97d-33d118a181fso398800f8f.1 for ; Thu, 15 Feb 2024 12:53:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708030381; x=1708635181; 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=bAZGfbWoqNKVvi6q8WscUjnpPJa5jw/DgSL1YaMeUHk=; b=vU6hjPK++xW3tydFCq/pYsK9k/joIdalI8PPdBz2O846jy4EhwOO5t9TpDYAeJWslP W4wWtqpaucA5QwgPIZQxpCRCfqzp8f0Zg3LZLEDAT6/K58HIY2ze83DcCeSYNgw2twg7 zueW55iYZKmZfBQFz12BR0wKGlXDXrR6WS0iFstNucZdl4BQ8bxsbDKEYFgwczNpaXS8 /1sRVOet8szf6a64rvESzMvjeOO8q+5ACOno9YlejBS+naoUCJvke+MpH5PqIeYnt11w UzbYcnCCoRSM0z2Nl6qWpM1x0nQm4hmxX4lcFR+c5vPg4m8bMAGKUHRUsRPHVNTnCLSo 5/5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708030381; x=1708635181; 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=bAZGfbWoqNKVvi6q8WscUjnpPJa5jw/DgSL1YaMeUHk=; b=nUiXkgLWcjkf1cwI6amsf2DCC0Peh3L6l4SLiQ2mgWfBW++WXvgDnfnSViCsDgrwj4 p1vwrEN8nOhvP7omlziA/m6kblDPJB1fw1owm67KFO4LxkC/Im9PWZNVM6HWB7gRIYA4 AAXZVqXXW7fddOzqH0TsYqxXXPunDiAHY4m9JO3D/bsZq0tkKNDEfGXVyt/+ekzb+5md Dc/os3rHJplDrUkRnHxYXiVjyVRVPzTSouo4+iSUH1X39JI78XG0Zjs5ndAoc2aQJO4y txEQUuYTmwsYQx5bUXs3TvIaBEO+uwYViG8VDbprnyZaV1nwYEckn0JByaLP5jIJBxZh cb8g== X-Forwarded-Encrypted: i=1; AJvYcCW3cNmgDM7rYfjOxEYes2UeYTEmg4/C7AjR7OpjY+wNQnLqbX+xMl8zTwjakKsyhqpKb9LQMV8dT1/G3pD1ZtgsSut1Fw== X-Gm-Message-State: AOJu0YzoVVoFKrnIcOP2ZLlC6Wp0+00QIJDT4e4wVIHfGRJYYWfCn/+I o7s7z5bNj04Vpc9XT0ye5EgcvD/7ypRaFpvqT/g+NHLlTJQ1S/S4M56w6R6D6EF04vNs8hMTf/Z U X-Received: by 2002:a5d:65c3:0:b0:33d:136a:8821 with SMTP id e3-20020a5d65c3000000b0033d136a8821mr1063727wrw.25.1708030381597; Thu, 15 Feb 2024 12:53:01 -0800 (PST) Received: from lion.localdomain (host-92-17-96-232.as13285.net. [92.17.96.232]) by smtp.gmail.com with ESMTPSA id e4-20020adfe384000000b0033cfa00e497sm194025wrm.64.2024.02.15.12.53.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 12:53:01 -0800 (PST) From: Caleb Connolly Date: Thu, 15 Feb 2024 20:52:53 +0000 Subject: [PATCH v4 35/39] dts: dragonboard820c: use correct bindings for clocks MIME-Version: 1.0 Message-Id: <20240215-b4-qcom-common-target-v4-35-ed06355c634a@linaro.org> References: <20240215-b4-qcom-common-target-v4-0-ed06355c634a@linaro.org> In-Reply-To: <20240215-b4-qcom-common-target-v4-0-ed06355c634a@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=+1ArGX4PaZfWn9L1iVMQQyj25pchQ2ZkjIpI0KIGD+k=; b=owGbwMvMwCFYaeA6f6eBkTjjabUkhtRzle3KcwuFb131fHqhb1WzaMSrbKX3VxqO7pOa8/PV+ 10OnjPvdZSyMAhyMMiKKbKIn1hm2bT2sr3G9gUXYOawMoEMYeDiFICJvFBg+F/8rq34cbucxOV7 mtfstk1ysxRXWvykrzXl7mOTQrYJEicZ/imt6xHnymD7GTcj3++bjMQsv3VGU1ZdTWTcpxrX/ET c/x4A 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 Reviewed-by: Sumit Garg --- 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;