From patchwork Thu Jan 20 06:33:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 12718270 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CED53C433F5 for ; Thu, 20 Jan 2022 06:34:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :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=7KnMyXKpQGG1W49xNe1lLCQhgGSHq2zFtJmhWgU/AhM=; b=wlAnlzhui+7KAU JbQpKKs9MqEBXYW+Bg+k2E8gdXJZkKBajCaiTK8UwOasUDzM3B6xXPuHoIrHynZZ0Q6rWUzH5hpMc SbwjSXKRtvTAvLY+CMBLXpMcEHnxVk4hknkqDweb+zXJZODfiyCBymjGG26mMHIHqeTrzvBRw4XS0 DUsuJAmVRHJUtfiY1N7kfB9sW2U+XPcGYUP2linRnXRqX8gaHXNlZIEm/7pW+tvqYvgLunfWoGO5D uM5UZYc21SliaSPuoA8taH2Fb+1RCooVd/G9mOXdpMjPCfN4fl+2e/5/xUicjb93hTf6oAL8ZZkOd UP43KCkrNZ9gbRgPaR1A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nAR0d-0092mP-Qf; Thu, 20 Jan 2022 06:33:23 +0000 Received: from mail-qv1-xf34.google.com ([2607:f8b0:4864:20::f34]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nAR0a-0092ki-RH for linux-arm-kernel@lists.infradead.org; Thu, 20 Jan 2022 06:33:22 +0000 Received: by mail-qv1-xf34.google.com with SMTP id g13so3138358qvw.4 for ; Wed, 19 Jan 2022 22:33:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=iIEWNGzZIA6PB46g/KfYUL/qJ1uv2/3umNgQBvWeius=; b=ZnWF/g0YBiWZOJ3Nk5G3ASaKTVMmyzTx6Z7TAwTbGHQajtgQkgxj6Ojo5wdgRYyKQq zqUadvm0ARZ7Xiz3U59Ef5rTQuJufMl8Tv80PdqS471EcF2gTI0vMPyLKj2UeO83528i PbxHxfXwn5SdB/lXSA2TZzEaGCIrH5ICxkJsWRr2ZeAVYU0PERMt5gB71gIb4MhIi4OW tif5agA2qjFk8gjXAQxRu/Eg5IE5TPlRPdJiCrbBO2q8qbBT5DfK5l0CqDERp+u1u3Fq m3xVlNubN4gLHGzwD2kgKTqTOreRjRER2bZ+KaCn4sT5vpxZ2oFukpCGiCw4zI3QmdkT Cx0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=iIEWNGzZIA6PB46g/KfYUL/qJ1uv2/3umNgQBvWeius=; b=bibDTrktf61Lizmv8ya2DDfXy1oN6YX6DNWc7nPqwuKSMOQ+63Zzjayopl7VDgCBd3 ASQjGzy8fuqwL5AVxz57/EkiK3xjx8xQoC8fZGyMp0QTbFmmB7H4ABj6HGbKsH/Z8cF6 qbR87F3ivc/v1wAW3lphHEzA1HHi2F1eUlJ68g+Ju6CkXMZtWHkOi4wLJWkIUlONqf/U EnWqz95ql0oiKswwvE8mDalS2x+EHpBxqZrugm1dx7votEVJate4TKeK1Fd8Xbgev6kt RBijOAkxQNrO1Pnduu7gcPlehkiywhZn2x9454dy57vogIdU3OyiusAMxVZo0NZRy0pv rr3g== X-Gm-Message-State: AOAM5326wSNSGpWxPR2svopxxKj+uwk3X0925eFFoyzq+c6dVKPXKjIg swwHFtKlEbg9XNKzzljQWhE= X-Google-Smtp-Source: ABdhPJxgLAF74UeUG/Gg3x7vyAGYXpPkEOS9JDkdvIfYUIFVpipTUSTqlf4WakSFwwmAwg+S0ma3dw== X-Received: by 2002:a05:6214:ca3:: with SMTP id s3mr27526096qvs.9.1642660397430; Wed, 19 Jan 2022 22:33:17 -0800 (PST) Received: from localhost.localdomain ([45.124.203.14]) by smtp.gmail.com with ESMTPSA id j186sm1053109qkb.57.2022.01.19.22.33.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jan 2022 22:33:16 -0800 (PST) From: Joel Stanley To: Eddie James , Andrew Jeffery Cc: linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, devicetree@vger.kernel.org Subject: [PATCH] ARM: dts: aspeed: rainier: Remove SPI NOR controllers Date: Thu, 20 Jan 2022 17:03:06 +1030 Message-Id: <20220120063307.63898-1-joel@jms.id.au> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220119_223320_916356_145A6DB3 X-CRM114-Status: GOOD ( 10.56 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Early Rainier builds had SPI NOR as a fallback boot device when eMMC was not programmed. Most systems don't have the NOR populated, so remove it from the device tree as it is not used. Signed-off-by: Joel Stanley --- arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 24 -------------------- 1 file changed, 24 deletions(-) diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts index 652c866c14dc..43bacb16d336 100644 --- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts @@ -2360,30 +2360,6 @@ &mac3 { use-ncsi; }; -&fmc { - status = "okay"; - flash@0 { - status = "okay"; - m25p,fast-read; - label = "bmc"; - spi-max-frequency = <50000000>; -#include "openbmc-flash-layout-128.dtsi" - }; -}; - -&spi1 { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_spi1_default>; - - flash@0 { - status = "okay"; - m25p,fast-read; - label = "pnor"; - spi-max-frequency = <100000000>; - }; -}; - &wdt1 { aspeed,reset-type = "none"; aspeed,external-signal;