From patchwork Thu Jun 7 20:55:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 10453591 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9AB0060467 for ; Thu, 7 Jun 2018 20:55:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 89AE429744 for ; Thu, 7 Jun 2018 20:55:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7DDC82987E; Thu, 7 Jun 2018 20:55:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2A49329744 for ; Thu, 7 Jun 2018 20:55:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References: List-Owner; bh=N6wsvrx/Wy6lll0f8FDXvMPFO6Y/u1JKDfsOKVnuPPo=; b=CG2zMHFHY3+zhs fAUwG1sXygxZtCT8Y/g1Q9L+7AfVvaYjE3FutzMift+8Wzv84NYJFcEKU+6SJUYHqQoosgTnATxln H9xuEpKnWIvBFpYF+TsgQyGxZHH3oAnwakQY8cRFoGdr08/zKdt2gaO92DLJNdvROb3Lxb1p6DG8u UqsrvXsQL5P/sxUPpZ60mvPAa9zM50dn5QpxLUaHagzJhhdH468V9bCC69S7heFwaNpaaqlyPug2A rLrjtNF1CIZNQjwif5xyLPpBbJBJBZzm08WHylOtgkFLiHkedv15ymu/JG5r8HF+NHNpPbS0UuzZB /DSLLXSN+rkNZ/ak3qwA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fR1wR-0007pu-BU; Thu, 07 Jun 2018 20:55:31 +0000 Received: from mail-pl0-x241.google.com ([2607:f8b0:400e:c01::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fR1wM-0007of-9b for linux-arm-kernel@lists.infradead.org; Thu, 07 Jun 2018 20:55:28 +0000 Received: by mail-pl0-x241.google.com with SMTP id c41-v6so6879910plj.10 for ; Thu, 07 Jun 2018 13:55:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jgDRWf8FMDkNl523pFMcco5inhhEoK/I0cmuny+vbRY=; b=kaRtG8enXlMNfpad9+SCRjoWZEmdA8jwCao7x6iEIIpxLmGdUEaB+06j15JDFshUxu MbwHenusVzd1jXDB/F7LIC5zE7bNnlpu2nr4kLtGrCTuN9uw/MZnIwhs1D9wpG6BuCEO fMuauNh5sRgioKtDXMy/4mVrtHDei49e2gLoxVCPEY/LGVz+C+rgg3G3Ip+8hewzyuKi LzgGzqpnO7D9iMxn0QvoDbBbi/VXOZHrrxyxcnUhaBV8GGzAb2dq7upKxBjlYB69xaGx AcselmCm58ogR/GpAKqEB3llkajaY8XadbmyWFx+rYWRjcow5QLHP+qpQqeH1MnkUk/z 3PCw== 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:mime-version :content-transfer-encoding; bh=jgDRWf8FMDkNl523pFMcco5inhhEoK/I0cmuny+vbRY=; b=js7OyKpmm+njlR81mHlmP3DpmrynjALmHfqGx2SIHKb+mweCtXNQMnNJIxAMT7JX71 qCzSMHAnpOxc9oNawHQjJZJve+JBcwfg/m0xIoj+Ff36wAFDIfYm1FhCu0VVJMDXTgY0 de8DPj8wmn9AYKg6zX0eE87a2IQ0TQxBnvWtvlxvOWBZoBFJt3L18wd/oCvtamu9moez ZFzxErdoXVV4aABSVc327fdd/gil6Qre6kpzqcicWNJp6ifTPemr9XuL0JhqaSU52kTJ UpThiFF8YqqBwUVwFrfSKHMxwmRC0nEhcOcctBuI142GFVE7XH6gELOEgZ/UXqbIkaZE RaKg== X-Gm-Message-State: APt69E2MgI7nAoUXVMvxUIWNEW7XRY9/J/a6CF3MqKXIrHbUayfH2xnP AFFMkBXudYAkgwlHqzd66argitCj+cg= X-Google-Smtp-Source: ADUXVKKN439Zl3YKZ3tyD9MuYKGAYSYlu8dw3Cib2jAJ3t+qZWULajVzhEWPe6V1LIT7XMTdInIV7Q== X-Received: by 2002:a17:902:7244:: with SMTP id c4-v6mr3550690pll.265.1528404915223; Thu, 07 Jun 2018 13:55:15 -0700 (PDT) Received: from localhost ([98.237.141.101]) by smtp.gmail.com with ESMTPSA id g12-v6sm17718224pfh.164.2018.06.07.13.55.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Jun 2018 13:55:14 -0700 (PDT) From: Kevin Hilman To: linux-amlogic@lists.infradead.org Subject: [PATCH] ARM64: dts: meson-gx: fix ATF reserved memory region Date: Thu, 7 Jun 2018 13:55:14 -0700 Message-Id: <20180607205514.36631-1-khilman@baylibre.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180607_135526_484236_190C8FA8 X-CRM114-Status: GOOD ( 12.89 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Neil Armstrong Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Vendor firmware/uboot has different reserved regions depending on firmware version, but current codebase reserves the same regions on GXL and GXBB, so move the additional reserved memory region to common .dtsi. Found when putting a recent vendor u-boot on meson-gxbb-p200. Recommended-by: Neil Armstrong Signed-off-by: Kevin Hilman --- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 6 ++++++ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 8 -------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index b003f324ca31..b8dc4dbb391b 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -35,6 +35,12 @@ no-map; }; + /* Alternate 3 MiB reserved for ARM Trusted Firmware (BL31) */ + secmon_reserved_alt: secmon@5000000 { + reg = <0x0 0x05000000 0x0 0x300000>; + no-map; + }; + linux,cma { compatible = "shared-dma-pool"; reusable; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi index 27538eea547b..c87a80e9bcc6 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi @@ -13,14 +13,6 @@ / { compatible = "amlogic,meson-gxl"; - reserved-memory { - /* Alternate 3 MiB reserved for ARM Trusted Firmware (BL31) */ - secmon_reserved_alt: secmon@5000000 { - reg = <0x0 0x05000000 0x0 0x300000>; - no-map; - }; - }; - soc { usb0: usb@c9000000 { status = "disabled";