From patchwork Mon Jul 26 13:34:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1510056 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=PjZxCpOw; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4GYLgR2wqCz9sXN for ; Mon, 26 Jul 2021 23:41:39 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 834D6833A9; Mon, 26 Jul 2021 15:40:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="PjZxCpOw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DD85D833A9; Mon, 26 Jul 2021 15:39:16 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-oo1-xc35.google.com (mail-oo1-xc35.google.com [IPv6:2607:f8b0:4864:20::c35]) (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 F10A083344 for ; Mon, 26 Jul 2021 15:35:20 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-oo1-xc35.google.com with SMTP id y16-20020a4ad6500000b0290258a7ff4058so2242459oos.10 for ; Mon, 26 Jul 2021 06:35:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Y3O6UFIEuMBILQNdK5cxC0iPbo4ryEHtqtVQunnNzWg=; b=PjZxCpOwJHo+dqsz9F59Qqyers3XKC64ahMdG8oEVrUg1Buj5joos5qlwwWn9OnaNn TXQHOC2A5sPCvvSIiWxqyvcwjsAml+g2i+fVePjEMKlRbfn89M0Y6ZIWzwjegKMcsHlw CUHayDEyYD8uTiAD0xS3YS8JxgoqkbGQkX1Rw= 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:mime-version:content-transfer-encoding; bh=Y3O6UFIEuMBILQNdK5cxC0iPbo4ryEHtqtVQunnNzWg=; b=JDHyVU5wbKBBKeYQ4cnrrq02v0Toxk28WuKcY9V+sx1nETJxz/6/8CsoEaJBL4UtHl W2cCNMTnxSHIbMarPtPBU0oGH+9zA6BoeeuK7t4y6E3/Missy1ykHDjmHJyUTaDBY1+H 9SAxuGOAZ4iL7v8Xpva1cvyTS6Myvpz4mJnDKLjQT/5fQnZP9XyTswyCvUL7SXBpHxw2 5qQlC55d96/79vnGMQsP+oKqRiQAcNE5rG/ZvWceH/EpejZxulNewTVrJiLzpXjl50h5 u02kKblBrj9Oe0s8GFnRLrOsWcaSZUbRQ7j1H8Ohemi6CLJKJ4qJrfhmnZ3Z4ucYrv3p TKvA== X-Gm-Message-State: AOAM530AmoHtBsXSYoEY02puitisZlhW3plfNjdxPVmuX/3c341zyc4v qGwz3ppC9n7GBw/lcicRlUuxlExNydYgRs8i X-Google-Smtp-Source: ABdhPJzPcifBkIz4meqzoA/XlGi8s7CZQgtYxc7LGkDaIGtUobOMV/Yyx+l6ZQgev8VYvMovsHSCUA== X-Received: by 2002:a4a:982d:: with SMTP id y42mr8750551ooi.25.1627306519324; Mon, 26 Jul 2021 06:35:19 -0700 (PDT) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id t141sm6591527oot.40.2021.07.26.06.35.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 06:35:18 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Stefano Babic Subject: [PATCH 23/33] pci: imx: Drop DM_PCI check from cpu driver Date: Mon, 26 Jul 2021 07:34:29 -0600 Message-Id: <20210726133440.634682-24-sjg@chromium.org> X-Mailer: git-send-email 2.32.0.432.gabb21c7263-goog In-Reply-To: <20210726133440.634682-1-sjg@chromium.org> References: <20210726133440.634682-1-sjg@chromium.org> MIME-Version: 1.0 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 We don't need this check anymore since when PCI is enabled, driver model is always used. Drop it. Signed-off-by: Simon Glass --- arch/arm/mach-imx/cpu.c | 4 ---- include/pci.h | 4 ---- 2 files changed, 8 deletions(-) diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index 423b7153522..8eb05c8dd67 100644 --- a/arch/arm/mach-imx/cpu.c +++ b/arch/arm/mach-imx/cpu.c @@ -283,10 +283,6 @@ u32 get_ahb_clk(void) void arch_preboot_os(void) { -#if defined(CONFIG_PCIE_IMX) && !CONFIG_IS_ENABLED(DM_PCI) - imx_pcie_remove(); -#endif - #if defined(CONFIG_IMX_AHCI) struct udevice *dev; int rc; diff --git a/include/pci.h b/include/pci.h index ca086420ff2..2c2930e7a74 100644 --- a/include/pci.h +++ b/include/pci.h @@ -785,10 +785,6 @@ int pci_last_busno(void); extern void pci_mpc85xx_init (struct pci_controller *hose); #endif -#ifdef CONFIG_PCIE_IMX -extern void imx_pcie_remove(void); -#endif - /** * pci_write_bar32() - Write the address of a BAR including control bits *