From patchwork Wed Sep 16 20:55:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1365490 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=fHW//G+k; dkim=temperror header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=gdZMMZ/S; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BsC806Mfmz9sSn for ; Thu, 17 Sep 2020 06:56:48 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=v2PuT2/BtT/cOFOP7kf2j9ri7c9q/Bc5BQanWUQ+/60=; b=fHW//G+kkh8SWIU+pCMjLMVl52 4OFyUUxsYBiAj920vXTWaxXQb1qrLTO2FrfBJYxlhZLLFMx3ToUoCv/QXwmIXeO1F4aIN91lOBLMu 5s4NiQCBMjU6632GEwmQClgUPnjjPaJ20C2KJbeZ8o2ZsIczG6GhHRmjWZv9WB1xTOWkZHNSlvBI+ jfjwp1KNgwf2w8pkkmIvJ100Bom+6rnRfXsC2NNgDsnLS0FCGZJbX5FAurCjsDmuZCGSRRyb4v9FW LmCR0gm7XFHI89u7MKvevBIZ3FrfNEPvyBDU1JN58rz/BgurHfEf3egBQQsjNZRdkLOGFubdXRboh UobBDylA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIeTW-0006pa-LB; Wed, 16 Sep 2020 20:56:22 +0000 Received: from mail-qk1-x742.google.com ([2607:f8b0:4864:20::742]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIeT8-0006hs-AW for linux-arm-kernel@lists.infradead.org; Wed, 16 Sep 2020 20:55:59 +0000 Received: by mail-qk1-x742.google.com with SMTP id o16so9734045qkj.10 for ; Wed, 16 Sep 2020 13:55:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xhkI/d9Dfi5Y+r7hNLKh8MJ5iiL1RR/MhPZU3BzHsJE=; b=gdZMMZ/SZ82Hr5j38PwFA6wFLtugeeH54bHoVKQgfLnbN62uaANxSmygaQtR0SkiWa oAHCAsPpCZZxhgMl6F8xdaNzT+v82Vwq7n7v3U8XVvuncQlMKRGcIHgY7ZWGkhajPtYp RhiPWg9sxKEelE2uMmft/4qlL6BOwNJ2IaFlDYCSHhUNM57Hi9d/QELIBLdTwwks05IQ g1W3OF060cSgC63oLkIcCV47HU7pv0pRewxPmrt/xUF6thp0tY/DF5NZxTHwAX3bJBtH Fia2yDolL6Lq7p1Yt6So2wW5as0AQ/l6RjpZ9vjYZ1VSwJ8O/X4TBCZijFzo3pJb7lAe W7FQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xhkI/d9Dfi5Y+r7hNLKh8MJ5iiL1RR/MhPZU3BzHsJE=; b=RMNu+BsFHUigafF8G3yKHswL0riVJfz4McFBAZX8RWy+MNmZqWDoUvis3eSIybTtzu zmgKI7cSOBl+dPA4ifcL1UZ35OAl7NTJyeN0vcEcH/lnO6vUyl6Xxyl2h9hEReljlwlr DgmkmodQFzCfce8T7lYW0AbO4gjfK4D68r+plVIAYO5fTSgWsKAoDQElOyMbTn8NtmuD YE58zUaewPYbiWAW03P4s9ygkae+gyuwz9W5evM5Sd5mb5OJOfEjMtsTWwkkdJUkZPMf gK9gNmgc+iOGxbh2qkiH7wgKKqP2E6N9MCe/karUxo18H3N3/oefS+P82meyJZtIPjgd 368w== X-Gm-Message-State: AOAM533/L6layK14zZ/07wJpEJK5QVEirMzlPD8XIPyDf0YstmZcURzi ZvQ15zjVaWJUuA89mzo/qiU= X-Google-Smtp-Source: ABdhPJzlCbQF/17UVXoTyGTs5msYjbaMB7eFXy3mclrIfkr1ZKkIpgMKFCah8kexmKzdaAOd9yvIAg== X-Received: by 2002:a37:a6c3:: with SMTP id p186mr24981377qke.237.1600289756701; Wed, 16 Sep 2020 13:55:56 -0700 (PDT) Received: from localhost.localdomain ([2804:14c:482:640:9cc0:878:419e:8021]) by smtp.gmail.com with ESMTPSA id q142sm20320897qke.48.2020.09.16.13.55.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 13:55:56 -0700 (PDT) From: Fabio Estevam To: shawnguo@kernel.org Subject: [PATCH 06/13] ARM: imx3: Retrieve the CCM base address from devicetree Date: Wed, 16 Sep 2020 17:55:15 -0300 Message-Id: <20200916205522.8783-7-festevam@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200916205522.8783-1-festevam@gmail.com> References: <20200916205522.8783-1-festevam@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200916_165558_627017_0E2C2E43 X-CRM114-Status: GOOD ( 15.03 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:742 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [festevam[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Fabio Estevam , arnd@arndb.de, linux-imx@nxp.com, kernel@pengutronix.de MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org Now that imx31 and imx35 has been converted to a devicetree-only platform, retrieve the CCM base address from devicetree. Signed-off-by: Fabio Estevam --- arch/arm/mach-imx/mm-imx3.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/mm-imx3.c b/arch/arm/mach-imx/mm-imx3.c index 4df7edc7ae7c..b7c5e15bb972 100644 --- a/arch/arm/mach-imx/mm-imx3.c +++ b/arch/arm/mach-imx/mm-imx3.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -99,10 +100,14 @@ static void imx31_idle(void) void __init imx31_init_early(void) { + struct device_node *np; + mxc_set_cpu_type(MXC_CPU_MX31); arch_ioremap_caller = imx3_ioremap_caller; arm_pm_idle = imx31_idle; - mx3_ccm_base = MX31_IO_ADDRESS(MX31_CCM_BASE_ADDR); + np = of_find_compatible_node(NULL, NULL, "fsl,imx31-ccm"); + mx3_ccm_base = of_iomap(np, 0); + BUG_ON(!mx3_ccm_base); } void __init mx31_init_irq(void) @@ -137,10 +142,14 @@ static void imx35_idle(void) void __init imx35_init_early(void) { + struct device_node *np; + mxc_set_cpu_type(MXC_CPU_MX35); arm_pm_idle = imx35_idle; arch_ioremap_caller = imx3_ioremap_caller; - mx3_ccm_base = MX35_IO_ADDRESS(MX35_CCM_BASE_ADDR); + np = of_find_compatible_node(NULL, NULL, "fsl,imx35-ccm"); + mx3_ccm_base = of_iomap(np, 0); + BUG_ON(!mx3_ccm_base); } void __init mx35_init_irq(void)