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 234A7C433EF for ; Thu, 17 Mar 2022 18:35:32 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 629BE83CF4; Thu, 17 Mar 2022 19:35:22 +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="MakZFjgE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B632F83D13; Thu, 17 Mar 2022 19:34:02 +0100 (CET) Received: from mail-qt1-x82b.google.com (mail-qt1-x82b.google.com [IPv6:2607:f8b0:4864:20::82b]) (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 4C94283F3D for ; Thu, 17 Mar 2022 19:33:26 +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-qt1-x82b.google.com with SMTP id 11so5075462qtt.9 for ; Thu, 17 Mar 2022 11:33:26 -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=xAxaQXohDrRMceqiDmzFI0pEMGQfXB+mQfpYuETUSQw=; b=MakZFjgE6pPtuNn4ehWT12A8nKmbAlHiWrfUbJz6m/w+cVbkDQR/ttwUVfNifzO80B mQlpa4lLbqxqMw0XAdEHOFXLjSbJpTPy8W63J/kkLmQ0e/UU+f+vU/DfTPAlDyQbDI/8 4afwgmZ1+evnHDBwS1fSn8u2SRYConMWs5k1rQ5RMnQF6BdB5D/gS201ULfcbvN+zy/8 q2TvY5H2BEXmGGclDazvxF7el1NjRKsl9ZBJxqm71yoskL+CUHCZ7Y7CS77lmE5K5pyp 9gK57QL3yxcshiH0u4I9KHzHTcvejA6jeGuhsLPB4ORstiwYTmXCHIJGGEnwaqxBlwxr 2tjw== 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=xAxaQXohDrRMceqiDmzFI0pEMGQfXB+mQfpYuETUSQw=; b=gn6C1mCPqIF/O3z6KSCzUMsl8BNERNYIszaLfUD6sSUKhSePmalpGCeHIHLJDRdX5P WEfob1U3cO0GJCnYaAmWIY8WidFQtjSji0L012r2ljarJwwmUU+RLscmswP8SJ1Tcbzd KZ7l8zQ24DwgDSCeyqQK1AbTwlDI/jULgFcTAjlCrR2c8saT8Mi3CaAbRQBGAWWZ/w5u jL0CRy7pOcDrd5XxSBxzP/EM/K+/YubAlXfrxDPCkHGCaSATzWunyBOOybm6WREiYgyi QcjJRMZsaznU5vNOI/VU6N5J0V1SvM6FBp6OTqZZ3gZIsOnWd/Q68kln3sOnu5U02HR8 hguQ== X-Gm-Message-State: AOAM530U9OE/wBUgD9lSTNwOOMgHcLR0kRTx2WEvkW0f/YQrO/1cqFLe NnVbD783V87MGGKk0ubUL4dGqf0WXQc= X-Google-Smtp-Source: ABdhPJylhV9Iaaw+jsA6cp0bfbewjc+InfJ6O+O/Bjlf1087Zc/MsA9Dy0WkUd0yA2KGM3115r6Rbg== X-Received: by 2002:ac8:57d5:0:b0:2e0:70a8:4419 with SMTP id w21-20020ac857d5000000b002e070a84419mr4928507qta.257.1647542004684; Thu, 17 Mar 2022 11:33:24 -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 d21-20020a05622a101500b002e07151139fsm4268051qte.17.2022.03.17.11.33.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Mar 2022 11:33:24 -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 v2 1/4] clk: imxrt: Use dts for anatop base address Date: Thu, 17 Mar 2022 14:33:18 -0400 Message-Id: <20220317183321.315249-2-Mr.Bossman075@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220317183321.315249-1-Mr.Bossman075@gmail.com> References: <20220317183321.315249-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 In Linux IMX and IMXRT use the device tree to hold the anatop address. The anatop is used in clock drivers as it controls the internal PLLs This will move the macro from asm/arch-imxrt to the device tree. This presumably should also be done with the other IMX boards as well. Signed-off-by: Jesse Taube --- arch/arm/dts/imxrt1020-evk-u-boot.dtsi | 4 ++++ arch/arm/dts/imxrt1020.dtsi | 5 +++++ arch/arm/dts/imxrt1050-evk-u-boot.dtsi | 4 ++++ arch/arm/dts/imxrt1050.dtsi | 5 +++++ arch/arm/include/asm/arch-imxrt/imx-regs.h | 2 -- drivers/clk/imx/clk-imxrt1020.c | 2 +- drivers/clk/imx/clk-imxrt1050.c | 2 +- 7 files changed, 20 insertions(+), 4 deletions(-) diff --git a/arch/arm/dts/imxrt1020-evk-u-boot.dtsi b/arch/arm/dts/imxrt1020-evk-u-boot.dtsi index 121665a2d2..9e1b074d2e 100644 --- a/arch/arm/dts/imxrt1020-evk-u-boot.dtsi +++ b/arch/arm/dts/imxrt1020-evk-u-boot.dtsi @@ -22,6 +22,10 @@ u-boot,dm-spl; }; +&anatop { + u-boot,dm-spl; +}; + &clks { u-boot,dm-spl; }; diff --git a/arch/arm/dts/imxrt1020.dtsi b/arch/arm/dts/imxrt1020.dtsi index 5ba314f995..13511ebb18 100644 --- a/arch/arm/dts/imxrt1020.dtsi +++ b/arch/arm/dts/imxrt1020.dtsi @@ -67,6 +67,11 @@ fsl,mux_mask = <0x7>; }; + anatop: anatop@400d8000 { + compatible = "fsl,imxrt-anatop"; + reg = <0x400d8000 0x4000>; + }; + clks: ccm@400fc000 { compatible = "fsl,imxrt1020-ccm"; reg = <0x400fc000 0x4000>; diff --git a/arch/arm/dts/imxrt1050-evk-u-boot.dtsi b/arch/arm/dts/imxrt1050-evk-u-boot.dtsi index 3168c2df2c..617cece448 100644 --- a/arch/arm/dts/imxrt1050-evk-u-boot.dtsi +++ b/arch/arm/dts/imxrt1050-evk-u-boot.dtsi @@ -22,6 +22,10 @@ u-boot,dm-spl; }; +&anatop { + u-boot,dm-spl; +}; + &clks { u-boot,dm-spl; }; diff --git a/arch/arm/dts/imxrt1050.dtsi b/arch/arm/dts/imxrt1050.dtsi index 6560a3827f..09f4712af6 100644 --- a/arch/arm/dts/imxrt1050.dtsi +++ b/arch/arm/dts/imxrt1050.dtsi @@ -59,6 +59,11 @@ fsl,mux_mask = <0x7>; }; + anatop: anatop@400d8000 { + compatible = "fsl,imxrt-anatop"; + reg = <0x400d8000 0x4000>; + }; + clks: ccm@400fc000 { compatible = "fsl,imxrt1050-ccm"; reg = <0x400fc000 0x4000>; diff --git a/arch/arm/include/asm/arch-imxrt/imx-regs.h b/arch/arm/include/asm/arch-imxrt/imx-regs.h index d01e6ca2e0..ad739caae9 100644 --- a/arch/arm/include/asm/arch-imxrt/imx-regs.h +++ b/arch/arm/include/asm/arch-imxrt/imx-regs.h @@ -15,8 +15,6 @@ #define GPIO4_BASE_ADDR 0x401C4000 #define GPIO5_BASE_ADDR 0x400C0000 -#define ANATOP_BASE_ADDR 0x400d8000 - #define MXS_LCDIF_BASE 0x402b8000 #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__)) diff --git a/drivers/clk/imx/clk-imxrt1020.c b/drivers/clk/imx/clk-imxrt1020.c index 840f783940..14ba6b47c1 100644 --- a/drivers/clk/imx/clk-imxrt1020.c +++ b/drivers/clk/imx/clk-imxrt1020.c @@ -93,7 +93,7 @@ static int imxrt1020_clk_probe(struct udevice *dev) void *base; /* Anatop clocks */ - base = (void *)ANATOP_BASE_ADDR; + base = (void *)ofnode_get_addr(ofnode_by_compatible(ofnode_null(), "fsl,imxrt-anatop")); clk_dm(IMXRT1020_CLK_PLL2_SYS, imx_clk_pllv3(IMX_PLLV3_GENERIC, "pll2_sys", "osc", diff --git a/drivers/clk/imx/clk-imxrt1050.c b/drivers/clk/imx/clk-imxrt1050.c index 3e17161002..514516a3a3 100644 --- a/drivers/clk/imx/clk-imxrt1050.c +++ b/drivers/clk/imx/clk-imxrt1050.c @@ -117,7 +117,7 @@ static int imxrt1050_clk_probe(struct udevice *dev) void *base; /* Anatop clocks */ - base = (void *)ANATOP_BASE_ADDR; + base = (void *)ofnode_get_addr(ofnode_by_compatible(ofnode_null(), "fsl,imxrt-anatop")); clk_dm(IMXRT1050_CLK_PLL1_REF_SEL, imx_clk_mux("pll1_arm_ref_sel", base + 0x0, 14, 2, -- 2.34.1