From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1D25C43461 for ; Thu, 17 Sep 2020 00:43:46 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 41884206C9 for ; Thu, 17 Sep 2020 00:43:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="oRxGxbel"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DVXF5KbZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 41884206C9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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=JC4TY1Q/PMgXyd2wp3Jd2u/a0ghqgXR0hXTbgWEJbYo=; b=oRxGxbelVGg63o2U7glz3DhuaB mJkO2oLjjYxw1dwV3wvP5BvXFOSVRDNY+uha1u7yHOSIBWujxP5bKP8YUfz5B9WhpeQVSw6TM4UCC nf6s4qUHRS1WZpG4JNQ0nutHkCu/gryPt6U7dkRAA835fwDbV21fEII9Ur/O9z0pa8ACopJHKcPdl Kz+nGWdY32avmuv6WYEUqZQRjtMAW6stiDPpKZKUDC21mkV4ax5D4ORHBr+058zvSZdq7iX1VqxXN xp9QX8cX8q2jfLM8HJ9BivmomVsi6KKYMJT5UpyjRww5oHEKU2+Q8uOUR3tpMT9DZKfrBDAhHygG1 hnLbFQ4g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIi02-0002tf-Ot; Thu, 17 Sep 2020 00:42:10 +0000 Received: from mail-qt1-x843.google.com ([2607:f8b0:4864:20::843]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIhzy-0002sP-At for linux-arm-kernel@lists.infradead.org; Thu, 17 Sep 2020 00:42:07 +0000 Received: by mail-qt1-x843.google.com with SMTP id y11so503883qtn.9 for ; Wed, 16 Sep 2020 17:42:05 -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=B3Aeb3EieL4LbfqM+ewr6EfYhIGfMyCZvarN0yol0iI=; b=DVXF5KbZNsuicWhJh5HIF09wGY4R7+mmOwLMjS2tyVwxdJc+JKMyJD1nmrQMYDi/RV S1sOoVqfXvU9Jp2Smc+j7LaDfsF0HX/6I3x0WpptlCyEwLe/2F/DMvrM1Ya4cBrcWklo a/gR3VOR8CPh0N39GHBnBWamHqoFWVVMDKKQWuX1Emxf8nfu/ufrvvd4mzhlEUV9XqRz TzsrzVaUY6XotFdCM6zAvBDB0rVmrdy4QTgZyfh2pkbMhTma1c+eLrv/lejOZhOlgaRD sUr63XG+W1bU9ayeWzMJBoiBmIfx5/ErjqI1agZLJQygR0rg+qenoNPw3WMxamuD8SNT 69DA== 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=B3Aeb3EieL4LbfqM+ewr6EfYhIGfMyCZvarN0yol0iI=; b=AeA+19nqI04Wx862n3slaVzhibNOG7hXSRUyGIF8Ad7R9BlABnb0RvcjBBxX/23a6d Rx/iINrfoVLoBigjsxmdk1sn5O8+OleOAWrqS4QvIa9oMAnhBIW1cc9tbgR21KrredTZ RCPc4KxxRyNcf12RUPs89hdNvVpk0k/kyNT3XRfyraHMw+iz1hZGt5fvTJZo1a4eyJG/ iCqrw01UsGuS30DzdY3e+WCGaRyR5elhW/zWD4S5lGSqWq7t6fOc+3mrXxSJIaLO7mTh XB7YhJqxoK1vWG5BeHGzYBMKCe4EzKMPzAiWP7UClIDZhuzWMeP8eDndRiDoHBQQGMbC xjfw== X-Gm-Message-State: AOAM530ClQiKV2HhFwHbuW0xXD2lL5aoUX7K883l4noMg8SZ4G1oG+7q XkVdpL5A1X+k3YRYi42wLPk= X-Google-Smtp-Source: ABdhPJzgodyPX9X26rOHkH31jTczUts6CaiUU7vHKQv1GkrFfMX46TkRsVq9kmMcJchc/0JOik3Fxg== X-Received: by 2002:ac8:7650:: with SMTP id i16mr26160046qtr.268.1600303324627; Wed, 16 Sep 2020 17:42:04 -0700 (PDT) Received: from localhost.localdomain ([2804:14c:482:640::1000]) by smtp.gmail.com with ESMTPSA id w6sm20127893qti.63.2020.09.16.17.42.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 17:42:03 -0700 (PDT) From: Fabio Estevam To: shawnguo@kernel.org Subject: [PATCH v2 01/11] ARM: imx27: Retrieve the SYSCTRL base address from devicetree Date: Wed, 16 Sep 2020 21:41:15 -0300 Message-Id: <20200917004125.18487-2-festevam@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200917004125.18487-1-festevam@gmail.com> References: <20200917004125.18487-1-festevam@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200916_204206_415019_56750B22 X-CRM114-Status: GOOD ( 16.65 ) 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Now that imx27 has been converted to a devicetree-only platform, retrieve the SYSCTRL base address from devicetree. To keep devicetree compatibilty the SYSCTRL base address will be retrieved from the CCM base address plus an 0x800 offset. This is not a problem as the imx27.dtsi describes the CCM register range as 0x1000. Signed-off-by: Fabio Estevam --- Changes since v1: - Do not introduce a sysctrl node to avoid breaking DT compatibility (Arnd) arch/arm/mach-imx/cpu-imx27.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/cpu-imx27.c b/arch/arm/mach-imx/cpu-imx27.c index a969aa71b60f..bf70e13bbe9e 100644 --- a/arch/arm/mach-imx/cpu-imx27.c +++ b/arch/arm/mach-imx/cpu-imx27.c @@ -9,6 +9,7 @@ */ #include +#include #include #include "hardware.h" @@ -17,16 +18,23 @@ static int mx27_cpu_rev = -1; static int mx27_cpu_partnumber; #define SYS_CHIP_ID 0x00 /* The offset of CHIP ID register */ +#define SYSCTRL_OFFSET 0x800 /* Offset from CCM base address */ static int mx27_read_cpu_rev(void) { + void __iomem *ccm_base; + struct device_node *np; u32 val; + + np = of_find_compatible_node(NULL, NULL, "fsl,imx27-ccm"); + ccm_base = of_iomap(np, 0); + BUG_ON(!ccm_base); /* * now we have access to the IO registers. As we need * the silicon revision very early we read it here to * avoid any further hooks */ - val = imx_readl(MX27_IO_ADDRESS(MX27_SYSCTRL_BASE_ADDR + SYS_CHIP_ID)); + val = imx_readl(ccm_base + SYSCTRL_OFFSET + SYS_CHIP_ID); mx27_cpu_partnumber = (int)((val >> 12) & 0xFFFF); -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel