From patchwork Mon Jul 31 12:41:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Derald D. Woods" X-Patchwork-Id: 795756 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="eYs9qOkN"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xLfH36Fclz9s8J for ; Mon, 31 Jul 2017 22:42:22 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id D4618C21F4D; Mon, 31 Jul 2017 12:42:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D4959C21D7B; Mon, 31 Jul 2017 12:42:12 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8128DC21DCC; Mon, 31 Jul 2017 12:42:11 +0000 (UTC) Received: from mail-it0-f65.google.com (mail-it0-f65.google.com [209.85.214.65]) by lists.denx.de (Postfix) with ESMTPS id E7776C21D7B for ; Mon, 31 Jul 2017 12:42:10 +0000 (UTC) Received: by mail-it0-f65.google.com with SMTP id h199so14660528ith.5 for ; Mon, 31 Jul 2017 05:42:10 -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=HIcEQ8MYbuN4rcwXuSdXpOXy+stUVixZILkq+veO4ag=; b=eYs9qOkNFefA7qL0cLIf7OKgEFCq79loSniVGuxULed38PGy+vK9mZFtSKCqQ9GfOY HJGo66sTb+kcAD3dF+IMjQHbd5ollb2dx50eoe/BcTb8Sfrhf51brvDucyQnCJZRWuSw jEdmD+YYS9sNvTrOZ3+qfym9WrDo8j+zDVrIb7T/H0Ej5/kg9jkEPQWqq7mLRJbC1uJN rmf7o5/2nDfq0hO/nZUDtN99f2a65O32+Puc91932ZCWYNJNWLgKtKTCWoK0IjEns5ef aYJchmQAGB+1aaTtLg56NKK3fj/h56/ptpp8Kj1rQCemCkq286yjSzXlyuVLpQ5uBwl0 MdfA== 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=HIcEQ8MYbuN4rcwXuSdXpOXy+stUVixZILkq+veO4ag=; b=eSLomTqG4NiI1AuP54U7lMLZTDBSsbo84llsHsKXxx4KMGQlWLdmHfoHfZzDlb7Fsb OxIbcJnc8vw/Noqzm7315h0Vji7U2QlmzVHsNG1n5jVvc2PXejOr+jRyYDKxK0mpPxQ4 uG4qh/qKZ3xmWtfkEOIY5YzdwduSsZwE26sYQBKtAPykXFHITtodt7dO2MMfkWP4mPJN h3BITOfbY1CdQTLlARYW7HHdD1JqhRVeNroyXlgWmQvxkwO7mgQMnJ+n4BVRWzGhnTwu 8upOvuy5DcGkBkw2r5YPNs2Dt3+gdA2WmXI5IP6ok2hD9dvhPpyaT08upMQuAv5Bnz3p 7l+g== X-Gm-Message-State: AIVw112die2A5R9ZY8rnO1DIp1EyzE2SKUPYvx8LlRyo4GAjdU9tJc2P nIoNJ7SQtT6GqjwY X-Received: by 10.36.74.212 with SMTP id k203mr18314810itb.14.1501504929186; Mon, 31 Jul 2017 05:42:09 -0700 (PDT) Received: from exodus.hsd1.il.comcast.net ([2601:247:c080:b23:eb85:522a:f9fb:2eb1]) by smtp.gmail.com with ESMTPSA id w6sm5583229itb.2.2017.07.31.05.42.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 31 Jul 2017 05:42:07 -0700 (PDT) From: "Derald D. Woods" To: u-boot@lists.denx.de Date: Mon, 31 Jul 2017 07:41:40 -0500 Message-Id: <20170731124140.17748-1-woods.technical@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170730235111.6256-1-woods.technical@gmail.com> References: <20170730235111.6256-1-woods.technical@gmail.com> Subject: [U-Boot] [PATCH v2] arm: omap: Fix 'get_device_type()' for OMAP34XX X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Fixes: 00bbe96ebabb ("arm: omap: Unify get_device_type() function") The control status register value is embedded in a structure somewhere in SRAM, with the last refactoring effort. This patch allows OMAP3 EVM (TMDSEVM3530) to boot again using the known control register base and offset for 'readl', for the OMAP34XX case. Signed-off-by: Derald D. Woods --- Changes in v2: - Added 'signed-off-by' - Updated description --- arch/arm/mach-omap2/sysinfo-common.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/mach-omap2/sysinfo-common.c b/arch/arm/mach-omap2/sysinfo-common.c index 1dc7051ab3..3955e803ad 100644 --- a/arch/arm/mach-omap2/sysinfo-common.c +++ b/arch/arm/mach-omap2/sysinfo-common.c @@ -16,6 +16,10 @@ */ u32 get_device_type(void) { +#if defined(CONFIG_OMAP34XX) + return (readl(OMAP34XX_CTRL_BASE + 0x2f0) & DEVICE_TYPE_MASK) >> + DEVICE_TYPE_SHIFT; +#endif return (readl((*ctrl)->control_status) & DEVICE_TYPE_MASK) >> DEVICE_TYPE_SHIFT; }