Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8BE3CC433EF for ; Thu, 17 Mar 2022 18:34:12 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9D3E783D0D; Thu, 17 Mar 2022 19:33:56 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com 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=gmail.com header.i=@gmail.com header.b="jJ1jL7+5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AF42683F4C; Thu, 17 Mar 2022 19:33:35 +0100 (CET) Received: from mail-qk1-x732.google.com (mail-qk1-x732.google.com [IPv6:2607:f8b0:4864:20::732]) (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 BE73983CF1 for ; Thu, 17 Mar 2022 19:33:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=mr.bossman075@gmail.com Received: by mail-qk1-x732.google.com with SMTP id 1so5070696qke.1 for ; Thu, 17 Mar 2022 11:33:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eUbC8o92K6wbZWti/LxHoNtZfBLCYt+3ui9OdvYVZhQ=; b=jJ1jL7+53yk5cj45JbuRbbAyC6Wm+ggWRApEHTaqKLUiJA2uekTaO86Lrr2G6nV5pw QEalffGRzBCffmvLHG3hsAbOf11/fEWqin0MyFjzDyPArG3jCvw9/tU9QLyEeX1azKla rWIN9Axq9GG+/MXGRcKVi8ePOrKNKVDo6n7bJSm/OkX2ksYu+onv5ewCfnZzVREN1kas gwqp7qti1ORGKM0iRUDx8gJzGaGvbyO7mvBNTKvNi9/dYTQ3qOHh/KRcaghOXKSJIBuo dpwqustnZ0XwX9Ri5yiTr3V+1lT9DedLf4jeHF1hJtwuvFulQb3BqZQas+WoBGFEvmr9 N5Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eUbC8o92K6wbZWti/LxHoNtZfBLCYt+3ui9OdvYVZhQ=; b=5tJl8DIiZqb36EEpknQE0AwcBOOEVgV+iRFxGMlQ9rA0XH5J+PLc026ehSnHHBXMpd wit1rpm8AJgkBJyzT0cTheytM9N0jXHUy1MN7ATXHq7NO0TVny/rsThQVQA6SUFSD09s sXdse8YJUlk2EpHan1SvfpuUQxDjZ/zRiEtonOsu/ZOYVTPSjhhs2hGBnw6y3WnDVKu2 6hyAPU4KdqUJvtT5rPfhSmUfj6ADe6TJH4M2XHk2MWBZxd6QcJ4VGAAyRXAwfDS0rOxs /kpSl9g2jtA4/nK6Gfqc/7doRF9YBTBHSkF9iI9Xq7bdIKkFDJ+bMz4/E+e0MUCS4RJM 63uA== X-Gm-Message-State: AOAM532FPDa7rQ1EoyPA/VgFr4MZOwZvAGzowizv7ukkFcu0ghygO0Nc 5NumWde4Uq0iIcm2O1lC69c1iH/f1u8= X-Google-Smtp-Source: ABdhPJxEkVEyGc5LflF7xVLFnikzC2+KAGrmMXBmpIAParWyYpe6nly7QybRwa+ZimQ40pBNlCxh7w== X-Received: by 2002:a05:620a:2848:b0:67d:35de:bb5b with SMTP id h8-20020a05620a284800b0067d35debb5bmr3694669qkp.499.1647541990078; Thu, 17 Mar 2022 11:33:10 -0700 (PDT) Received: from jesse-desktop.jtp-bos.lab (146-115-144-188.s4282.c3-0.nwt-cbr1.sbo-nwt.ma.cable.rcncustomer.com. [146.115.144.188]) by smtp.gmail.com with ESMTPSA id w1-20020ac857c1000000b002e1e899badesm4223914qta.72.2022.03.17.11.33.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Mar 2022 11:33:09 -0700 (PDT) From: Jesse Taube X-Google-Original-From: Jesse Taube To: u-boot@lists.denx.de Cc: sbabic@denx.de, festevam@gmail.com, festevam@denx.de, uboot-imx@nxp.com, giulio.benetti@benettiengineering.com, lukma@denx.de, seanga2@gmail.com, sjg@chromium.org, jagan@amarulasolutions.com, kever.yang@rock-chips.com, andre.przywara@arm.com, pbrobinson@gmail.com, tharvey@gateworks.com, paul.liu@linaro.org, christianshewitt@gmail.com, Mr.Bossman075@gmail.com, samuel@sholland.org Subject: [PATCH v1 4/8] clk: imx: Add i.MXRT11xx pllv3 variant Date: Thu, 17 Mar 2022 14:32:56 -0400 Message-Id: <20220317183300.315173-5-Mr.Bossman075@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220317183300.315173-1-Mr.Bossman075@gmail.com> References: <20220317183300.315173-1-Mr.Bossman075@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.5 at phobos.denx.de X-Virus-Status: Clean The i.MXRT11 series has two new pll types but are variants of existing. This patch adds the ability to read one of the pll types' frequency as it can't be changed unlike the generic pll it also has the division factors swapped. Signed-off-by: Jesse Taube --- drivers/clk/imx/clk-pllv3.c | 44 +++++++++++++++++++++++++++++++++++++ drivers/clk/imx/clk.h | 1 + 2 files changed, 45 insertions(+) diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c index 077757efcb..511c973e5c 100644 --- a/drivers/clk/imx/clk-pllv3.c +++ b/drivers/clk/imx/clk-pllv3.c @@ -21,6 +21,7 @@ #define UBOOT_DM_CLK_IMX_PLLV3_USB "imx_clk_pllv3_usb" #define UBOOT_DM_CLK_IMX_PLLV3_AV "imx_clk_pllv3_av" #define UBOOT_DM_CLK_IMX_PLLV3_ENET "imx_clk_pllv3_enet" +#define UBOOT_DM_CLK_IMX_PLLV3_GENV2 "imx_clk_pllv3_genericv2" #define PLL_NUM_OFFSET 0x10 #define PLL_DENOM_OFFSET 0x20 @@ -42,6 +43,30 @@ struct clk_pllv3 { #define to_clk_pllv3(_clk) container_of(_clk, struct clk_pllv3, clk) +static ulong clk_pllv3_genericv2_get_rate(struct clk *clk) +{ + struct clk_pllv3 *pll = to_clk_pllv3(dev_get_clk_ptr(clk->dev)); + unsigned long parent_rate = clk_get_parent_rate(clk); + + u32 div = (readl(pll->base) >> pll->div_shift) & pll->div_mask; + + return (div == 0) ? parent_rate * 22 : parent_rate * 20; +} + +static ulong clk_pllv3_genericv2_set_rate(struct clk *clk, ulong rate) +{ + struct clk_pllv3 *pll = to_clk_pllv3(clk); + unsigned long parent_rate = clk_get_parent_rate(clk); + + u32 div = (readl(pll->base) >> pll->div_shift) & pll->div_mask; + u32 val = (div == 0) ? parent_rate * 22 : parent_rate * 20; + + if (rate == val) + return 0; + + return -EINVAL; +} + static ulong clk_pllv3_generic_get_rate(struct clk *clk) { struct clk_pllv3 *pll = to_clk_pllv3(dev_get_clk_ptr(clk->dev)); @@ -120,6 +145,13 @@ static const struct clk_ops clk_pllv3_generic_ops = { .set_rate = clk_pllv3_generic_set_rate, }; +static const struct clk_ops clk_pllv3_genericv2_ops = { + .get_rate = clk_pllv3_genericv2_get_rate, + .enable = clk_pllv3_generic_enable, + .disable = clk_pllv3_generic_disable, + .set_rate = clk_pllv3_genericv2_set_rate, +}; + static ulong clk_pllv3_sys_get_rate(struct clk *clk) { struct clk_pllv3 *pll = to_clk_pllv3(clk); @@ -269,6 +301,11 @@ struct clk *imx_clk_pllv3(enum imx_pllv3_type type, const char *name, pll->div_shift = 0; pll->powerup_set = false; break; + case IMX_PLLV3_GENERICV2: + drv_name = UBOOT_DM_CLK_IMX_PLLV3_GENV2; + pll->div_shift = 0; + pll->powerup_set = false; + break; case IMX_PLLV3_SYS: drv_name = UBOOT_DM_CLK_IMX_PLLV3_SYS; pll->div_shift = 0; @@ -313,6 +350,13 @@ U_BOOT_DRIVER(clk_pllv3_generic) = { .flags = DM_FLAG_PRE_RELOC, }; +U_BOOT_DRIVER(clk_pllv3_genericv2) = { + .name = UBOOT_DM_CLK_IMX_PLLV3_GENV2, + .id = UCLASS_CLK, + .ops = &clk_pllv3_genericv2_ops, + .flags = DM_FLAG_PRE_RELOC, +}; + U_BOOT_DRIVER(clk_pllv3_sys) = { .name = UBOOT_DM_CLK_IMX_PLLV3_SYS, .id = UCLASS_CLK, diff --git a/drivers/clk/imx/clk.h b/drivers/clk/imx/clk.h index 60f287046b..10670252b1 100644 --- a/drivers/clk/imx/clk.h +++ b/drivers/clk/imx/clk.h @@ -10,6 +10,7 @@ enum imx_pllv3_type { IMX_PLLV3_GENERIC, + IMX_PLLV3_GENERICV2, IMX_PLLV3_SYS, IMX_PLLV3_USB, IMX_PLLV3_USB_VF610, -- 2.34.1