From patchwork Wed Mar 11 18:04:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Tomer X-Patchwork-Id: 1253123 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=YotXgviD; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48d0HQ4xrkz9sPK for ; Thu, 12 Mar 2020 05:05:22 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 480D48156F; Wed, 11 Mar 2020 19:05:16 +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="YotXgviD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DA2F0813D1; Wed, 11 Mar 2020 19:04:54 +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.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) (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 E484881333 for ; Wed, 11 Mar 2020 19:04:44 +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=amittomer25@gmail.com Received: by mail-pf1-x443.google.com with SMTP id w65so1763774pfb.6 for ; Wed, 11 Mar 2020 11:04:44 -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=Ldhp1lt6OHACH0ALEBltK0hlYriZhBtL6JOxLBo6LCs=; b=YotXgviDu6GjxDX1DomF0xDc5r2A58nNGmq/F6WXxTQEiuZsuwN4DcyPg2LWWK/Ys7 xd5GehdcxrFPvBakTr4+zBcRzMiud8oKNZiDw5ef7DHtgVVIVju4owi0EelwD9oeHU5+ N8+rBgVy9bVlZ/eiNOy0IcMeaFBWY0TElbfc0iTmZoWcEdRCMWtUwY3c4Cu1NOMSGVfU ZgOrSbRMsW/zLXr7QMg1c1VRzSs4vD2+9ODxUEMUOY7bjkQE37v5tVPXCzfNrK1cx2/3 6YZ7to2ZYT9nYEqWWu0PmuB5bTn6ib0nTZuklDFV3e7L1UE7GCYMopXnQ9FKnpsmSFVD +1/Q== 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=Ldhp1lt6OHACH0ALEBltK0hlYriZhBtL6JOxLBo6LCs=; b=Hw0eyK5MPH9igtkYbgyW/Evc9IPIyEEptkzDQiTqCZpaQ2LJ0vB+dS6LEpomZG9Mbk NmUMUxx0jXvX39EyzhDV905dkQchcBfpefMv9PpNOGsYuyST2+2MxMyr9sMaZAW23Tqx zd+jn+nV9/9R8dqfvoZNqJypNZ5ybrSpVRceT718oNJLskYbh2DdvEty+vDViFjXC0Bj 62qp1vhqGW5tCVWLb/npXeHlrWTgl1eisHUyQCIJvYsc6rQuVkVMYgtEgEQbqgn4BA66 RzO8B5CnSl5rp7PlLlSbKne2lpMvWDz8eq91P0uu5ub8lpdAODYUiK9zit5sgA0HR5zI sNiw== X-Gm-Message-State: ANhLgQ2MWrtjQXU8Lkq70k3z9Z+qfr6ITsH14ww0btW55Iaf+r1eJCqw 5YYhlJgBP3sLShY9nI+fKy3UcYjo X-Google-Smtp-Source: ADFU+vtImtrA8VVe5gV7C8hKc/gJFZ6Sm+qYjuaUDfDgEFZryLhAPR81xUU6MdW1mqJ7P2GNLadMYQ== X-Received: by 2002:a62:be0d:: with SMTP id l13mr4026094pff.217.1583949882736; Wed, 11 Mar 2020 11:04:42 -0700 (PDT) Received: from localhost.localdomain ([106.212.138.62]) by smtp.gmail.com with ESMTPSA id b2sm10528486pgd.45.2020.03.11.11.04.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 Mar 2020 11:04:42 -0700 (PDT) From: Amit Singh Tomar To: u-boot@lists.denx.de Cc: andre.przywara@arm.com, manivannan.sadhasivam@linaro.org, trini@konsulko.com, Amit Singh Tomar Subject: [PATCH v5 02/11] arm: actions: rename sysmap-s900 to sysmap-owl Date: Wed, 11 Mar 2020 23:34:12 +0530 Message-Id: <1583949861-19143-3-git-send-email-amittomer25@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1583949861-19143-1-git-send-email-amittomer25@gmail.com> References: <1583949861-19143-1-git-send-email-amittomer25@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.102.2 at phobos.denx.de X-Virus-Status: Clean Now that memory maps(for both S700 and S900 SoCs) can be managed using a common file, rename sysmap-s900 to sysmap-owl to reflect the same. Reviewed-by: Manivannan Sadhasivam Signed-off-by: Amit Singh Tomar --- Changes since v4: * No changes. Changes since v3: * Added reviewed-by tag. Changes since v2: * Fixed the commit message and header. Changes since v1: * compile sysmap-owl.c against CONFIG_ARM64 now. --- arch/arm/mach-owl/Makefile | 2 +- arch/arm/mach-owl/sysmap-owl.c | 32 ++++++++++++++++++++++++++++++++ arch/arm/mach-owl/sysmap-s900.c | 32 -------------------------------- 3 files changed, 33 insertions(+), 33 deletions(-) create mode 100644 arch/arm/mach-owl/sysmap-owl.c delete mode 100644 arch/arm/mach-owl/sysmap-s900.c diff --git a/arch/arm/mach-owl/Makefile b/arch/arm/mach-owl/Makefile index 0b181c6..f3a69eb 100644 --- a/arch/arm/mach-owl/Makefile +++ b/arch/arm/mach-owl/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0+ obj-y += soc.o -obj-y += sysmap-s900.o +obj-$(CONFIG_ARM64) += sysmap-owl.o diff --git a/arch/arm/mach-owl/sysmap-owl.c b/arch/arm/mach-owl/sysmap-owl.c new file mode 100644 index 0000000..81f6ca2 --- /dev/null +++ b/arch/arm/mach-owl/sysmap-owl.c @@ -0,0 +1,32 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Memory map for Actions Semi Owl series SoCs. + * + * Copyright (C) 2015 Actions Semi Co., Ltd. + * Copyright (C) 2018 Manivannan Sadhasivam + */ + +#include +#include + +static struct mm_region owl_mem_map[] = { + { + .virt = 0x0UL, /* DDR */ + .phys = 0x0UL, /* DDR */ + .size = 0x80000000UL, + .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | + PTE_BLOCK_INNER_SHARE + }, { + .virt = 0xE0000000UL, /* Peripheral block */ + .phys = 0xE0000000UL, /* Peripheral block */ + .size = 0x08000000UL, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* List terminator */ + 0, + } +}; + +struct mm_region *mem_map = owl_mem_map; diff --git a/arch/arm/mach-owl/sysmap-s900.c b/arch/arm/mach-owl/sysmap-s900.c deleted file mode 100644 index f78b639..0000000 --- a/arch/arm/mach-owl/sysmap-s900.c +++ /dev/null @@ -1,32 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Actions Semi S900 Memory map - * - * Copyright (C) 2015 Actions Semi Co., Ltd. - * Copyright (C) 2018 Manivannan Sadhasivam - */ - -#include -#include - -static struct mm_region s900_mem_map[] = { - { - .virt = 0x0UL, /* DDR */ - .phys = 0x0UL, /* DDR */ - .size = 0x80000000UL, - .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | - PTE_BLOCK_INNER_SHARE - }, { - .virt = 0xE0000000UL, /* Peripheral block */ - .phys = 0xE0000000UL, /* Peripheral block */ - .size = 0x08000000UL, - .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | - PTE_BLOCK_NON_SHARE | - PTE_BLOCK_PXN | PTE_BLOCK_UXN - }, { - /* List terminator */ - 0, - } -}; - -struct mm_region *mem_map = s900_mem_map;