From patchwork Mon Dec 25 15:39:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 758226 Delivered-To: patch@linaro.org Received: by 2002:a5d:67c6:0:b0:336:6142:bf13 with SMTP id n6csp2710208wrw; Mon, 25 Dec 2023 07:43:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IG9Tf5ZGYsPi004aNCqbgVzeUJLViLxqkdy95dvX0hESKCQM4Yp8xk3h7IrLakqYSGN0fMq X-Received: by 2002:a05:600c:a45:b0:40d:37d0:e66 with SMTP id c5-20020a05600c0a4500b0040d37d00e66mr2396376wmq.258.1703518990079; Mon, 25 Dec 2023 07:43:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703518990; cv=none; d=google.com; s=arc-20160816; b=HTGk08Tm39TVBSJMafjxBSW5lJCaKW8sZWZpNoIA7HPqSiB9ZH8MUcV2CAEjvmxSyU QXOpTOKxOMuujc+TnI1sQBRs6tqDGCGelFVbLXuUYRCwV8nc9fv3BYDbdZgDkjSOi+6U fIsMl1LrHE9R6g70sU1HgHD/xLAYIjOjoILokm55AN4pvKHm5ehauPZIOne3YVucUbdS CD3Y47lSRAHh/UsyZWGcr1xtqGB0VGI4hX8+GDipuiW7mMIvNvldVN1pISB4eMyjSOY/ +02Wx5Lg7fgsXdYW7zT9iZqY3gGk92DcHIn9nfpHYr1qt67WfDIXJi0Tdo3eOpOXgQjv MAZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/SLgFjrfnKhrRx66uwyN72RTeQ06CKv9CxJBWJ/pjGY=; fh=al8TO5kxNSCLdK6Wct4/S1Ky9QCKGaknFfrx/Rr/20U=; b=x9+K8hEmj3+QDUT6jDV4CRqqwx9WVYGKVPjFdDQCfQgKgsMpsw7pmtHhMsP+wm/7JL 1nWih6fDhAuHLv3/ttbVQ5Fn0s9P//5F+ln89TCY5DBvmC9AdrKFcEEVufS6FOV60Ygl NKu8vQDaHBKh3pTJP0n5ZdDpjgh/O1xN6LeHK0DxV4C2y68Q7yZYi4N65JrKxRmJ5p2O QieLRQTHdzzuoBXw1ij01pQrfM7ln5JyjmYbijnN1IaJOh2OPja5E4e2eSnjJQnEyGjz KiifikkbynadjsLvjbDeHozc1fTkGP0Wj7opryC4HdT4Z3zr6N2Nn1ZuGAfmKJZqDNAI 5Zbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HUV0narC; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id j12-20020a5d448c000000b003365b0cc3f4si4876602wrq.15.2023.12.25.07.43.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Dec 2023 07:43:10 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HUV0narC; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 849B18784B; Mon, 25 Dec 2023 16:42:21 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org 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=linaro.org header.i=@linaro.org header.b="HUV0narC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2603D8744F; Mon, 25 Dec 2023 16:42:20 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) (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 B654087846 for ; Mon, 25 Dec 2023 16:42:17 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=maxim.uvarov@linaro.org Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2ccb923c4d2so11323231fa.1 for ; Mon, 25 Dec 2023 07:42:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1703518936; x=1704123736; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/SLgFjrfnKhrRx66uwyN72RTeQ06CKv9CxJBWJ/pjGY=; b=HUV0narCP2SOpLHf0xSpSgfyuSZDtXUjCD+Qr2zMo928tm/4PJ67mB75LaziNlCOs2 98Y3UXDyOSajG3xM9DZkda/5F1psnbKSAxf7iT0th89fD34rN+Yg9mg4ueZTmA03vMkV X6m5Ev1EABOvXKhnTbMny6t/3McuF0MqPITzRHAku9LbLuLIKD6uRhMncTyq8/b53Tsr UQKaIjI1qat5n6X0H8v+TCb0RANDuFDddTnEGpO7EqxVxfK1648n40q4UjqMpq3poTuA 46SoKE+UF6xwRagghiD9mY9lq7GVUSdjtHxh7jm72dzPoD4PXmM7BI5oWLm2ElSpwxHG 53mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703518936; x=1704123736; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/SLgFjrfnKhrRx66uwyN72RTeQ06CKv9CxJBWJ/pjGY=; b=qzf0AXA1afMzWbRV3WfcOSlPouovPsgk4eHdLWQT14fsFdAvwpqEIK024tM9SKPcQr T6hfK6J/TDmmZRKcpf9hFxis4VlP2DwCV2BsTS/uRN4knLulCJmRbBJpw+N1mNVGsXnI Q8r2NejW0z3+nw1wjTu26VQDdrkWgC1fq3JF/T/zodrDCIPN/NJb0D5nIsuNIzsbBz1N ocfEYfl8DHffYJ2kOMJ6pZDD3L0Ivt7Wv+xlcQjQoS5l+hGaVeJMxVyDxjX2eOsvUd6X xw29I77GfNp4MUMpGDw5RHuSQwG2HskIbmXW3cAg7lcQ2chq8EkDZJoxyPk7xxHpfam2 XxKg== X-Gm-Message-State: AOJu0YwoT67OaaBxzEe5CPDVsCTb06WaoeWNXEnFZRLs9NVt6fysD+zy WWcx3pOvrfN5ZH99w3zf6eLlZrJSN9mH/5O4tdGHr+lP4f0= X-Received: by 2002:a05:651c:2044:b0:2cc:7868:c200 with SMTP id t4-20020a05651c204400b002cc7868c200mr1197822ljo.90.1703518936432; Mon, 25 Dec 2023 07:42:16 -0800 (PST) Received: from localhost.localdomain ([45.82.14.220]) by smtp.gmail.com with ESMTPSA id a17-20020a2ebe91000000b002cca6eafc44sm1425644ljr.113.2023.12.25.07.42.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Dec 2023 07:42:16 -0800 (PST) From: Maxim Uvarov To: u-boot@lists.denx.de Cc: simon.k.r.goldschmidt@gmail.com, tien.fong.chee@intel.com, sjg@chromium.org, joe.hershberger@ni.com, rfried.dev@gmail.com, bharat.gooty@broadcom.com, rayagonda.kokatanur@broadcom.com, trini@konsulko.com, Maxim Uvarov Subject: [PATHv2 8/9] omap3: use device specific naming for mem_init Date: Mon, 25 Dec 2023 21:39:28 +0600 Message-Id: <20231225153929.8284-9-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231225153929.8284-1-maxim.uvarov@linaro.org> References: <20231225153929.8284-1-maxim.uvarov@linaro.org> MIME-Version: 1.0 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.8 at phobos.denx.de X-Virus-Status: Clean Use device specific naming for functions so as to not overlap with common function names. Signed-off-by: Maxim Uvarov Reviewed-by: Tom Rini --- arch/arm/include/asm/arch-omap3/mem.h | 2 +- arch/arm/mach-omap2/omap3/board.c | 2 +- arch/arm/mach-omap2/omap3/emif4.c | 4 ++-- arch/arm/mach-omap2/omap3/sdrc.c | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/include/asm/arch-omap3/mem.h b/arch/arm/include/asm/arch-omap3/mem.h index 569779c55e..fce3568eca 100644 --- a/arch/arm/include/asm/arch-omap3/mem.h +++ b/arch/arm/include/asm/arch-omap3/mem.h @@ -475,7 +475,7 @@ enum { #ifndef __ASSEMBLY__ /* Function prototypes */ -void mem_init(void); +void omap3_mem_init(void); u32 is_mem_sdr(void); u32 mem_ok(u32 cs); diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c index 8b70251457..c76a95dd5d 100644 --- a/arch/arm/mach-omap2/omap3/board.c +++ b/arch/arm/mach-omap2/omap3/board.c @@ -216,7 +216,7 @@ void s_init(void) void board_init_f(ulong dummy) { early_system_init(); - mem_init(); + omap3_mem_init(); /* * Save the boot parameters passed from romcode. * We cannot delay the saving further than this, diff --git a/arch/arm/mach-omap2/omap3/emif4.c b/arch/arm/mach-omap2/omap3/emif4.c index 7e5a281922..4fbfb387ab 100644 --- a/arch/arm/mach-omap2/omap3/emif4.c +++ b/arch/arm/mach-omap2/omap3/emif4.c @@ -159,10 +159,10 @@ int dram_init_banksize(void) } /* - * mem_init() - + * omap3_mem_init() - * - Initialize memory subsystem */ -void mem_init(void) +void omap3_mem_init(void) { do_emif4_init(); } diff --git a/arch/arm/mach-omap2/omap3/sdrc.c b/arch/arm/mach-omap2/omap3/sdrc.c index 5d43e7c9cf..f2a0769b9d 100644 --- a/arch/arm/mach-omap2/omap3/sdrc.c +++ b/arch/arm/mach-omap2/omap3/sdrc.c @@ -4,7 +4,7 @@ * * This file has been created after exctracting and consolidating * the SDRC related content from mem.c and board.c, also created - * generic init function (mem_init). + * generic init function (omap3_mem_init). * * Copyright (C) 2004-2010 * Texas Instruments Incorporated - https://www.ti.com/ @@ -232,11 +232,11 @@ int dram_init_banksize(void) } /* - * mem_init - + * map3_mem_init - * - Init the sdrc chip, * - Selects CS0 and CS1, */ -void mem_init(void) +void omap3_mem_init(void) { /* only init up first bank here */ do_sdrc_init(CS0, EARLY_INIT);