Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D5AC7C63793 for ; Thu, 22 Jul 2021 15:25:40 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5097761362 for ; Thu, 22 Jul 2021 15:25:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5097761362 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5CE9A829F8; Thu, 22 Jul 2021 17:25:38 +0200 (CEST) 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="BXAZiwkG"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1FFAC82BAA; Thu, 22 Jul 2021 17:25:36 +0200 (CEST) Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) (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 4392D8023C for ; Thu, 22 Jul 2021 17:25:33 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pbrobinson@gmail.com Received: by mail-wm1-x32c.google.com with SMTP id g12so3580288wme.2 for ; Thu, 22 Jul 2021 08:25:33 -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:mime-version :content-transfer-encoding; bh=n1PTtcNl2AebT2ZMZeft4AocF5mf09jN5x1C5CkEFjw=; b=BXAZiwkGBOxVFW6yykYPB1tON8OagmsgXa618Fh0mJy0ZwbvX6AS+xhEG4SJ1K/JhY Cm9pz0Y25GOnT6oiDlJnxUznyJC3YRYj+9QSIxJiQTljDnqyVfS2FcPmzGKun9iWeXw1 FLYODdjRTge8HGShNByF91NOTdz77HhBl93/TEIK/LTFoDcc2k3i4cEFLPZAu6dhA9yC ysMLQiN7C9j84Yv8p+oCp+V0K608gZ28IlQkwT90Yts5f2THGrFrl+Msu55OwyGkm8hF IL7ZMXICKUqdA6V2DdSB/d2SCTrDOfUW7BV3UmKnZ2WpIBYeHY6fEfKoGpBaYAd7P+n3 3Gbw== 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=n1PTtcNl2AebT2ZMZeft4AocF5mf09jN5x1C5CkEFjw=; b=ZGax5EozjNjizBOfYQh5yTaH585u0eFCZ+byiQvbLhSC9++LfjD3i0ftyzcba9WAC0 G8kW5AbRMsoO+pHZy1XcB3CWO/egJttdyIRpmWXYSQOlHqDAaDW1gdPXJApcBzdh3lg+ oLKb0kcEQJ5CTYZdj/8Vd5Mgv9OsDhZ0GycTOal/KRFg2MIUF73WCW/bLj2ym0yfCpCu ualIB/rEzjf9zUP6Lm6sz32Zh/777nkSjpj4UvizSfBVDhK0iAf6v+bAr/A+EjAvCnCr aiFEihG1ukxjN0+9TW18dEXw1VlBg9FNNe5mlIVoJle0+l3Y8MhhZn46XlOrfR7TXwTt Ln+g== X-Gm-Message-State: AOAM533RVBt+NLGp8+pS9bwwETp22twNAI6N1Sn7uQSY7hdx1bzYGX6z /hD+yTgBpAILlroq6CLCvxBsxB0nFIU= X-Google-Smtp-Source: ABdhPJx/18FBHO5QR7zatLQLhw918QzlH8pr8J70Wq4TPFAto3ZYImx/KmEe3Rgyok4xaTHMyJda2w== X-Received: by 2002:a05:600c:4f12:: with SMTP id l18mr9885683wmq.22.1626967532854; Thu, 22 Jul 2021 08:25:32 -0700 (PDT) Received: from morpheus.home.roving-it.com (f.c.9.1.f.e.c.d.1.e.0.0.2.b.5.5.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681:55b2:e1:dcef:19cf]) by smtp.googlemail.com with ESMTPSA id q17sm24279210wrv.47.2021.07.22.08.25.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 08:25:31 -0700 (PDT) From: Peter Robinson To: u-boot@lists.denx.de Cc: Peter Robinson , T Karthik Reddy , Ashok Reddy Soma , Michal Simek , Pratyush Yadav Subject: [PATCH] Revert "spi: spi-uclass: Add support to manually relocate spi memory ops" Date: Thu, 22 Jul 2021 16:25:29 +0100 Message-Id: <20210722152529.1407976-1-pbrobinson@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean This reverts commit 346df7d4fa62afc578d820b3a18815eec765074f. This patch broke booting Rockchip systems from U-Boot residing on SPI flash, for at least the Pinebook Pro and Rockpro64, and also confirmed with the not yet upstream Helios64. Signed-off-by: Peter Robinson Cc: T Karthik Reddy Cc: Ashok Reddy Soma Cc: Michal Simek Cc: Pratyush Yadav --- drivers/spi/spi-uclass.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c index d867b27806..ec7f4652b3 100644 --- a/drivers/spi/spi-uclass.c +++ b/drivers/spi/spi-uclass.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include @@ -200,16 +199,6 @@ static int spi_post_probe(struct udevice *bus) ops->set_mode += gd->reloc_off; if (ops->cs_info) ops->cs_info += gd->reloc_off; - if (ops->mem_ops) { - struct spi_controller_mem_ops *mem_ops = - (struct spi_controller_mem_ops *)ops->mem_ops; - if (mem_ops->adjust_op_size) - mem_ops->adjust_op_size += gd->reloc_off; - if (mem_ops->supports_op) - mem_ops->supports_op += gd->reloc_off; - if (mem_ops->exec_op) - mem_ops->exec_op += gd->reloc_off; - } reloc_done++; } #endif -- 2.31.1