From patchwork Tue Dec 19 16:04:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 755917 Delivered-To: patch@linaro.org Received: by 2002:adf:b181:0:b0:336:6142:bf13 with SMTP id q1csp1500584wra; Tue, 19 Dec 2023 08:05:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IHNhKVSeO2Y3a1Zdv3nDdGcq0HGiBv29nAhVXZB8/mPs4M2ayBXr5eDF6gsyTyt793ChfxX X-Received: by 2002:a05:6000:889:b0:334:b2bb:6d1e with SMTP id cs9-20020a056000088900b00334b2bb6d1emr9776567wrb.17.1703001952869; Tue, 19 Dec 2023 08:05:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703001952; cv=none; d=google.com; s=arc-20160816; b=i/Kp6j87rk7XsH4nb1voZobaccjVuF31CGlshPrXasrZpDYtAnoJYHCu3508kBlZS/ 4BGwGvHTwFDAG0CvX+zGAoPBOjionsQpI6hISyxn8C+E+zrPuXfiAzTsI9gaOzNeaQun RUrqdapvSGbrYFV7S4XSLoNOHw3rCkAaYiTqkNfWJBAcrC2mTqajgHmkBGnTAp1+8fdb 4vVCexvz2cUl3qoMAfVrl9td5RzYC8Nv5/LSIOAbEts2M21shrw/wRWGi/5sgEQyFWc/ 5pOtY6sUoK6Ud52PJ9H+EcsUXkeo7YKXngc4XG3EqCRbvp5tsZqsumJHZq+r0HbM86T+ +mRQ== 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=LLfoUGx3ADWhlYThmfj/PaJlrmojVdY422ZpdR9iZNs=; fh=GB9E9KzRIiNXhkRWIZbZpSMjbCjxnqnvE8nYuQxq8UI=; b=nm3UNRa3K5mA2B5LmDBAWgB6oYdNGJppl+4W1MgCjPxBo7fSAZ3i4o8hWKlqmTxOYo nw45KrKa3Baz3Nw4k677uBMxbj92tr+0qme1tEhk3BQEIhQGlyyyicWwnmDmdA6f/WZ5 NrptPP04q7iyBW0izHbYOk9ZjmbNlwleVbPTSmi5DnMRtH4EtV+PHVHCkWDGG+G5AKr8 rcSx7VbV76aTsVID5vtKsxTG/Cw8iIu0ZGUFh4QXUEau7AdaR4PKosal1yfazOFj6JJp Y7QlWRRGi6tf3bRQk35LtPGOBZxl8wNrx/h9YFXcXAHit0cFH9KE+zhkZg5OADk08Wkd QQ2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ncb56Mgb; 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 cs14-20020a056000088e00b003334a679f75si12547107wrb.968.2023.12.19.08.05.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 08:05:52 -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=Ncb56Mgb; 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 CE85087847; Tue, 19 Dec 2023 17:04:44 +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="Ncb56Mgb"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 704A98780F; Tue, 19 Dec 2023 17:04:38 +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-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) (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 229CB87732 for ; Tue, 19 Dec 2023 17:04:30 +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-wm1-x335.google.com with SMTP id 5b1f17b1804b1-40c236624edso52073545e9.1 for ; Tue, 19 Dec 2023 08:04:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1703001869; x=1703606669; 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=LLfoUGx3ADWhlYThmfj/PaJlrmojVdY422ZpdR9iZNs=; b=Ncb56MgbFyUB62rjvL22S5bbBvKRZNuv4eHsmpwIfjlVCOUiKJMPZr7W+hNmUDpO7w Sq80+4B/BHTYu7tU4rMuZUS5qW5dLmRpdqatLyqK0vivkmdV18DGkdZhlabFqQHuTYmR C6vnLkRN3bkugtq4PPmf3ctEle1MKrt61HJm6ntdlIdeJspURWq812qUYDKKPUgYmany ycnv7ylDUZwxrX8D5iqLuGDTfLApfP5cyzs7Jfuh6ae8Yn1cuj9eugRJQcyvS/pT895H 36Qao/L7ymfg/zmX1K+H3+yD/08u6vG9TSqrHonLoQQ+yHSiKRfYrM/TFqy8bo9r4jEx ZyDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703001869; x=1703606669; 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=LLfoUGx3ADWhlYThmfj/PaJlrmojVdY422ZpdR9iZNs=; b=hfH9+k+ldRA60ntaRqj4R9PGj4NaMtWbLykZksq8BWRds+qZ5HbgRHccMtkqQ2oCrK I7cUi7K65FNiRWGbsAANzmeKfQ2yIbo0BkiMoYr5u4YrWhq6lOEg80VkXOPZycZWfTE8 ZuNUYxmxZxLobeJKa78tdGHl9hUb7thm20J0mzbBID9OLYivx7Dr6+YJrSV/QRPNMvFS 5m38qRdIuzynzIC2KLLAGqYsyQtbD8qfi/G8f6O3vSugZHX6jGw7avDOXgyiA7Dp3TdR cQQf9FAkj1iYd9nUV8PANfFCYPrUiWeexf0wJEWP0whnMLtmmGD3vkTejjhg+hTtjdYS mCYQ== X-Gm-Message-State: AOJu0YyZA8idHsucRA6idcsDMGr8z0rlE6z4TGzbWq8WaVBMB9n40vXC qb3/KMD6h30746QmIYHju4B/xQ== X-Received: by 2002:a05:600c:2317:b0:40b:5e21:cc2c with SMTP id 23-20020a05600c231700b0040b5e21cc2cmr9742248wmo.87.1703001869488; Tue, 19 Dec 2023 08:04:29 -0800 (PST) Received: from lion.localdomain (host-92-17-96-230.as13285.net. [92.17.96.230]) by smtp.gmail.com with ESMTPSA id je17-20020a05600c1f9100b0040d1450ca7esm3429723wmb.7.2023.12.19.08.04.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 08:04:29 -0800 (PST) From: Caleb Connolly Date: Tue, 19 Dec 2023 16:04:08 +0000 Subject: [PATCH v2 07/32] serial: msm: fix clock handling MIME-Version: 1.0 Message-Id: <20231219-b4-qcom-common-target-v2-7-b6dd9704219e@linaro.org> References: <20231219-b4-qcom-common-target-v2-0-b6dd9704219e@linaro.org> In-Reply-To: <20231219-b4-qcom-common-target-v2-0-b6dd9704219e@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=2677; i=caleb.connolly@linaro.org; h=from:subject:message-id; bh=V8tNP81M3Dat4HdQ6rMmiblGQ0MmNHo57qkosFhi/CA=; b=owGbwMvMwCFYaeA6f6eBkTjjabUkhtTG/UzH66bPnLAj8LjuGrsTvn0awU+0i2rMNX/sMW3RC z/QXDSvo5SFQZCDQVZMkUX8xDLLprWX7TW2L7gAM4eVCWQIAxenAEwkdS/Db7aOcP6di38nbW9/ Ec4TefUiZ8Q6zcvK/FJSC+cZ7nDdFc/wP8M2u+q+ZaODysQ/XHMamW79vs62iod12jaxl5ksniw HQgE= 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 Use the modern helpers to fetch the clock and use the correct property ("clocks" instead of "clock") Signed-off-by: Caleb Connolly --- arch/arm/dts/dragonboard410c.dts | 3 ++- arch/arm/dts/dragonboard820c.dts | 3 ++- drivers/serial/serial_msm.c | 24 +++++------------------- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/arch/arm/dts/dragonboard410c.dts b/arch/arm/dts/dragonboard410c.dts index 02c824d0226c..c395e6cc0427 100644 --- a/arch/arm/dts/dragonboard410c.dts +++ b/arch/arm/dts/dragonboard410c.dts @@ -84,7 +84,8 @@ serial@78b0000 { compatible = "qcom,msm-uartdm-v1.4"; reg = <0x78b0000 0x200>; - clock = <&clkc 4>; + clocks = <&clkc 4>; + clock-names = "core"; pinctrl-names = "uart"; pinctrl-0 = <&blsp1_uart>; }; diff --git a/arch/arm/dts/dragonboard820c.dts b/arch/arm/dts/dragonboard820c.dts index 146a0af8aafe..86b7f83d36d6 100644 --- a/arch/arm/dts/dragonboard820c.dts +++ b/arch/arm/dts/dragonboard820c.dts @@ -78,7 +78,8 @@ blsp2_uart2: serial@75b0000 { compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; reg = <0x75b0000 0x1000>; - clock = <&gcc 4>; + clocks = <&gcc 4>; + clock-names = "core"; pinctrl-names = "uart"; pinctrl-0 = <&blsp8_uart>; }; diff --git a/drivers/serial/serial_msm.c b/drivers/serial/serial_msm.c index 19a5a3a788f7..0148ddb54df6 100644 --- a/drivers/serial/serial_msm.c +++ b/drivers/serial/serial_msm.c @@ -160,29 +160,14 @@ static int msm_uart_clk_init(struct udevice *dev) { uint clk_rate = fdtdec_get_uint(gd->fdt_blob, dev_of_offset(dev), "clock-frequency", 115200); - uint clkd[2]; /* clk_id and clk_no */ - int clk_offset; - struct udevice *clk_dev; struct clk clk; int ret; - ret = fdtdec_get_int_array(gd->fdt_blob, dev_of_offset(dev), "clock", - clkd, 2); - if (ret) - return ret; - - clk_offset = fdt_node_offset_by_phandle(gd->fdt_blob, clkd[0]); - if (clk_offset < 0) - return clk_offset; - - ret = uclass_get_device_by_of_offset(UCLASS_CLK, clk_offset, &clk_dev); - if (ret) - return ret; - - clk.id = clkd[1]; - ret = clk_request(clk_dev, &clk); - if (ret < 0) + ret = clk_get_by_name(dev, "core", &clk); + if (ret < 0) { + pr_warn("%s: Failed to get clock: %d\n", __func__, ret); return ret; + } ret = clk_set_rate(&clk, clk_rate); clk_free(&clk); @@ -252,6 +237,7 @@ U_BOOT_DRIVER(serial_msm) = { .priv_auto = sizeof(struct msm_serial_data), .probe = msm_serial_probe, .ops = &msm_serial_ops, + .flags = DM_FLAG_PRE_RELOC, }; #ifdef CONFIG_DEBUG_UART_MSM