From patchwork Sun Jul 7 08:19:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Trimarchi X-Patchwork-Id: 3183 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id F3BDA3FA22 for ; Sun, 7 Jul 2024 10:20:09 +0200 (CEST) Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-57851ae6090sf2641771a12.3 for ; Sun, 07 Jul 2024 01:20:09 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720340409; cv=pass; d=google.com; s=arc-20160816; b=sgKe1gCXLj4KRrwrhEb9/pXh9yF8LhPa2fOQoG4sxd4+UXw0gBfv0u/NnqpFrzC3nV zCAT6CMzDXrlUSkD5Leb5T79fYb6+xE8KMe/9roka1kGuyVte8Hz3GtNbwpD8P6RPG06 XONB76Q9y87rOIil3xdDsh/ug4frMAM/o131lZg+6YR+ACANDG0yMEeZlbP0T5vJHBW1 cetDehiA91FQ4t/jxr05kzFU3r0NYjFpQxC4u23SkJC23Lp+EcYi+KmXsP2Db30OBsiw OsGCgZtNe7aobygbDYVXMRofxgAL8E7E0WI5pP/p8pdFnxzb1COHRgvyaAo3jjhieg2c DsZQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=7/5J050ySnLHJQ7KDtfTRML36AUqcRoWHq6EjO2jgUo=; fh=jp6bbIYtuFpSa+VoyXdXoEXj849Ru2C8OBy1R/YepE0=; b=vkECnNUdPppN1deqpL8//wKmEmyUuYNaG9Aubi5s0qq+8Qx+LfbDqKnlyXT9XW0hjC gHQeaSTb/8UEcBKKvsbl0FZAx7SM9GO774YTcWTaSqBELGa7nHOU7+QryO31Wfz1rME7 DZNCDSNzP3l0KO9+MZkz1oyktRCfMjmhbUfLKnAcaCXz61Pbls8mTGoYcQG47TeHjWL1 DN7xY2IjpOpBWmYhmS+DVWU0RKc5HgBNYNMYO5yr8aVsb55bpXHjggnOyDc3lwDhjSSJ erIq//GNjj9TcESIRtn4CIY+KIYwdmSkTLl5JZfAo8CyN5o1CPglqonwkdO15pNo1xtn aHKg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=KMkfUlAG; spf=pass (google.com: domain of michael@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=michael@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1720340409; x=1720945209; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=7/5J050ySnLHJQ7KDtfTRML36AUqcRoWHq6EjO2jgUo=; b=g/LrJTaa4JpQn8i8lLj4jI914fjt7EjIWeN4wbYPNBgGXgO84HfUdYS/uEPQo8Ypwh xKgtQETluKbE60bS2qRNAXmc3OpJ+R2mi2OpzHYG4qzXCUa8leJY6oI7jhoNRPyLO/VR IVrRumiGpu6ZUI3ff42gQsgazg29J0lg9CQgY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720340409; x=1720945209; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=7/5J050ySnLHJQ7KDtfTRML36AUqcRoWHq6EjO2jgUo=; b=OWe6j0D8kFiTfYMCeDMdeRakUeVaVAjAEJlf0JdI03z7roD2zaZb7KW1b+AjoMnn6J 9Qg+b4Ybjd8XSLdnR4DvwKJF0zjhSdA9q5u+jUApn20haja4WVloA/nuOXiW1ywQv9F/ 6d2ZQ33yo4L5+WRyhAnAyEzn9BLKv2gnzo1jX9RY6KSbO4rV2xcA7o+CCEHwebOcGM+i FtURts0g9YBLdCoHlOUQZtQ+useBCnI30yrb3nu+cO6ehTj9vjLudCU6bis/A5jyYU87 H0PJ30ejuAZvETCESQ8LavgZubjx4V5utgE+5jf47fGEVKXAVhhvZYgG0I2HYjLIPKnT 4zMg== X-Forwarded-Encrypted: i=2; AJvYcCXPRNCFyn3cxoncjORiWGuh1qOOAAnWsQ/bAhCxIC/02hHnAjx1bw5+a4/m48t3rpcT4lLP/4skOu5RIPZOQaf2DB8hLzWT/c4UbmF0Sz3USBQ5KdVM7jAbZcbopw== X-Gm-Message-State: AOJu0YyJLXYvYQEcz2i2HnVuYAvICtP9L33MKwP4k6ZZiFcww806no1e OCfTW7hxYCdEiffO93gR69vuoCEXAWQo8OXU76GpN8zlqdkgyfpf8tDgMrRtONWKyQ== X-Google-Smtp-Source: AGHT+IH1yIR+9FncVcCI71uN0A82jmCXd1mLofj9oYSEnByRBWQ8/kVntasxjsnBse6g26FOoRBjIg== X-Received: by 2002:a05:6402:278e:b0:58b:fd23:7065 with SMTP id 4fb4d7f45d1cf-58e5aec8d0amr5378286a12.16.1720340409606; Sun, 07 Jul 2024 01:20:09 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:aa7:cd6a:0:b0:58f:749f:1c6c with SMTP id 4fb4d7f45d1cf-58f74ae6031ls764978a12.1.-pod-prod-01-eu; Sun, 07 Jul 2024 01:20:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVdMsKAsFtPuXzbj/sHmzc/cDFBC3jchmGtzEcuB7gn61j7m8uVW8h98RE45lqdYzTIAxpmvB9O1iPBdR+On5Ga9sxk06xnVfeCN2zm5jKWPPb0 X-Received: by 2002:a17:906:aed5:b0:a6f:6126:18aa with SMTP id a640c23a62f3a-a77ba728ccbmr493422166b.67.1720340407974; Sun, 07 Jul 2024 01:20:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720340407; cv=none; d=google.com; s=arc-20160816; b=ACYPXZQxgUGvsQq4m62i1q+EeYtZ80xWwxojPD6d9SMGyfVO2YE8S5XY572h4MdN+W ucaQ/mJl3YjxjYG7G2FLs4279soR+HSF3/Qvm7IrcLmjYvoqV12d4nsY4Zp4ql/eYnMK InTcSWo178iDF9TZSoDQYl16j4Kx7wmXA/5EL/nPgDom1ek4oU5HzRJPMdFG6bnWRBN4 20dgvZdeAYNKKIm0AHOCsBYYxClxO1/nlV8jG0UeeJv9GzhNteq/JAqCnwkpyxCc+Xkd PwXWxpbDShGrSOsq2f35BmdinciH80G8mPCeqRjZbasc6E+167Oxxj6cGjoi85QEoXlu Zszg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Yh4v3D3pWHHqrsVDjmkbDuP1IwQL+jZVx5ue+4JboHQ=; fh=wMmxTFtS729UMPgMOGFFBEUrJ4GxuZrXqEjUscjNPs4=; b=dlxc/YJH/EfqVXM/s0NlbiDtSPmRYNqGq4GrZCCj4w+F0HORLV+j5ZSiXHaxM5MPW4 Ff3FDj8ENs0We9iIEUgTSDE3Ri0fQE8hH7am/6co70rC6eKRPefAuiU0QKLsRY5s36fT 8Az7Wr3dVUgq8pd6zS8wxjC9MsbiEtCanTUXoPB4Zr+dFRUS9cAvH7eP358yNe04Ozse P2jf8qXMj376W0qUFMSX2bls1HUquqQQtNTDk5+ai1BDsMY/2VY9HZ1IslZ+RIGJwBR9 uYciPy3oka2K38zzkKVhAvskkZJXI/zH0iCBHN812JhjLboB/M/BX97Q2uEzWzjSTp0a Gvsw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=KMkfUlAG; spf=pass (google.com: domain of michael@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=michael@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id a640c23a62f3a-a77cd4600f9sor109388466b.5.2024.07.07.01.20.07 for (Google Transport Security); Sun, 07 Jul 2024 01:20:07 -0700 (PDT) Received-SPF: pass (google.com: domain of michael@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCXeA+i/NM7iPJTc5r5bFzrVZplWGfcgqHn8aTJR6VoU/Qz/jqcPhz/lR/z0FUaREA+anW3OUhtw9gRbCDmDh/cOmRMzjTxESMEmLuQi6FU82pLD X-Received: by 2002:a17:906:2e94:b0:a6f:d5b:20c3 with SMTP id a640c23a62f3a-a77ba72957fmr602899266b.74.1720340407567; Sun, 07 Jul 2024 01:20:07 -0700 (PDT) Received: from panicking.. ([109.52.6.228]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a77e4a8092dsm111708666b.58.2024.07.07.01.20.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jul 2024 01:20:07 -0700 (PDT) From: Michael Trimarchi To: Fabio Estevam , Lukasz Majewski , Sean Anderson Cc: Tom Rini , linux-amarula@amarulasolutions.com, u-boot@lists.denx.de, Dario Binacchi , Michael Trimarchi , Marek Vasut Subject: [PATCH 1/4] clk: imx: clk-imx8mn Fix nand and spi clock parent Date: Sun, 7 Jul 2024 10:19:58 +0200 Message-ID: <20240707082001.20746-2-michael@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240707082001.20746-1-michael@amarulasolutions.com> References: <20240707082001.20746-1-michael@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: michael@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=KMkfUlAG; spf=pass (google.com: domain of michael@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=michael@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The osc_24m is the clock-output-name and not the one that is used as internal name reference from the strcmp. The clock that use osc_24m, will not be able to reparent it as they should. We need anyway register the osc_24m clock fixed factor in the clock tree. Fixes: 710c4ffb890 ("clk: imx: clk-imx8mn add gpmi nand clocks") Fixes: 85b1c11989c ("clk: imx: Add ECSPI to iMX8MN") Cc: Marek Vasut Signed-off-by: Michael Trimarchi --- drivers/clk/imx/clk-imx8mn.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/clk/imx/clk-imx8mn.c b/drivers/clk/imx/clk-imx8mn.c index ed9e16d7c1..bfd1677520 100644 --- a/drivers/clk/imx/clk-imx8mn.c +++ b/drivers/clk/imx/clk-imx8mn.c @@ -57,15 +57,15 @@ static const char *imx8mn_usdhc2_sels[] = {"clock-osc-24m", "sys_pll1_400m", "sy "sys_pll3_out", "sys_pll1_266m", "audio_pll2_out", "sys_pll1_100m", }; #if CONFIG_IS_ENABLED(DM_SPI) -static const char *imx8mn_ecspi1_sels[] = {"osc_24m", "sys_pll2_200m", "sys_pll1_40m", +static const char *imx8mn_ecspi1_sels[] = {"clock-osc-24m", "sys_pll2_200m", "sys_pll1_40m", "sys_pll1_160m", "sys_pll1_800m", "sys_pll3_out", "sys_pll2_250m", "audio_pll2_out", }; -static const char *imx8mn_ecspi2_sels[] = {"osc_24m", "sys_pll2_200m", "sys_pll1_40m", +static const char *imx8mn_ecspi2_sels[] = {"clock-osc-24m", "sys_pll2_200m", "sys_pll1_40m", "sys_pll1_160m", "sys_pll1_800m", "sys_pll3_out", "sys_pll2_250m", "audio_pll2_out", }; -static const char *imx8mn_ecspi3_sels[] = {"osc_24m", "sys_pll2_200m", "sys_pll1_40m", +static const char *imx8mn_ecspi3_sels[] = {"clock-osc-24m", "sys_pll2_200m", "sys_pll1_40m", "sys_pll1_160m", "sys_pll1_800m", "sys_pll3_out", "sys_pll2_250m", "audio_pll2_out", }; #endif @@ -105,7 +105,7 @@ static const char *imx8mn_usdhc3_sels[] = {"clock-osc-24m", "sys_pll1_400m", "sy static const char *imx8mn_qspi_sels[] = {"clock-osc-24m", "sys_pll1_400m", "sys_pll2_333m", "sys_pll2_500m", "audio_pll2_out", "sys_pll1_266m", "sys_pll3_out", "sys_pll1_100m", }; -static const char * const imx8mn_nand_sels[] = {"osc_24m", "sys_pll2_500m", "audio_pll1_out", +static const char * const imx8mn_nand_sels[] = {"clock-osc-24m", "sys_pll2_500m", "audio_pll1_out", "sys_pll1_400m", "audio_pll2_out", "sys_pll3_out", "sys_pll2_250m", "video_pll_out", }; @@ -119,7 +119,9 @@ static const char * const imx8mn_usb_phy_sels[] = {"clock-osc-24m", "sys_pll1_10 static int imx8mn_clk_probe(struct udevice *dev) { + struct clk osc_24m_clk; void __iomem *base; + int ret; base = (void *)ANATOP_BASE_ADDR; @@ -238,6 +240,11 @@ static int imx8mn_clk_probe(struct udevice *dev) clk_dm(IMX8MN_SYS_PLL2_1000M, imx_clk_fixed_factor("sys_pll2_1000m", "sys_pll2_out", 1, 1)); + ret = clk_get_by_name(dev, "osc_24m", &osc_24m_clk); + if (ret) + return ret; + clk_dm(IMX8MN_CLK_24M, dev_get_clk_ptr(osc_24m_clk.dev)); + base = dev_read_addr_ptr(dev); if (!base) return -EINVAL;