Message ID | 20210802005446.2267075-16-sjg@chromium.org |
---|---|
State | Accepted |
Commit | 0ecc7a0cbf127f426a8ed5a974012d5a1e6d6d34 |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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=<UNKNOWN>) 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=VdGHtA06; 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 4GdKNS2vwBz9sT6 for <incoming@patchwork.ozlabs.org>; Mon, 2 Aug 2021 10:57:28 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 59EA983338; Mon, 2 Aug 2021 02:56:37 +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="VdGHtA06"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C33BC8335B; Mon, 2 Aug 2021 02:56:31 +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-oi1-x230.google.com (mail-oi1-x230.google.com [IPv6:2607:f8b0:4864:20::230]) (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 1E7F983333 for <u-boot@lists.denx.de>; Mon, 2 Aug 2021 02:55:05 +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-oi1-x230.google.com with SMTP id 21so22188913oin.8 for <u-boot@lists.denx.de>; Sun, 01 Aug 2021 17:55:05 -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=D/vKI1ULjl51dsHreCT+jup7yHaRQU/Fc3I4aXKoYaY=; b=VdGHtA068syQAGHEuE8AEzpVrWR3FdY0fL53rXnxQzEDiwc07XEXzeaIOdPSs98eLe tnpLnXEhsortWRZoM1U0wpNWgNS0KcJPCWUszqNUlyLhnjdaI1zQ2K/BguSi3Olb4clv cUAksMWcJ4VsiK/ooAiCPx6MGI/K0x1kBfY9g= 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=D/vKI1ULjl51dsHreCT+jup7yHaRQU/Fc3I4aXKoYaY=; b=N/vT++Ab/72jdNUitr6iDgsXQ2B54aHZFBlel6HkiBvvAm3Zy/d+F/+1Diohwb9DdY fi13yaXFhbkGCmWo/iLCFTTQ7EeLGzIB+h/39P36zL8XM+Ud5KQeA/NIgMVB+b6+SOyW mXDy9teZkFt8aMW07pyhsyxEy0lJhFBbwcL04n4N4KcnT5oy4guZKnpPvBdNHu0Mr9rk yM0TKnt6csPeXs8NbZbmw+xesGX3kLYBkc5TFwaCKDtRfwmk1sQ01I+87WGBIHu+LqZQ iTqlwqk1j5ejLr66sDthnrpzEBzpORipV412AwJuB0xrbhX1i2mTJtmV+CruYBulHS/C IM2w== X-Gm-Message-State: AOAM530seOeXQSCiwKUyMUrl0UKvFsja/SHaj1P6jcxoQYdpwfRM8PIR VE4yX2ce/Kk2j1L2Zl3oilGOlyjq4P+gAozO X-Google-Smtp-Source: ABdhPJzimV5WFNB4tnyzQSC768YqKLiBcg/ZYE7GkjjuT5hdnZePKlCbmczcz+NJIcQ1jMW4h1DQwA== X-Received: by 2002:aca:ac03:: with SMTP id v3mr1244063oie.71.1627865703334; Sun, 01 Aug 2021 17:55:03 -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 s2sm1452616ooc.15.2021.08.01.17.55.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Aug 2021 17:55:03 -0700 (PDT) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>, Andy Fleming <afleming@gmail.com>, Mario Six <mario.six@gdsys.cc>, Priyanka Jain <priyanka.jain@nxp.com>, Stefan Roese <sr@denx.de>, Wolfgang Denk <wd@denx.de> Subject: [PATCH v2 15/32] ppc: socrates: Drop use of DM_PCI Date: Sun, 1 Aug 2021 18:54:28 -0600 Message-Id: <20210802005446.2267075-16-sjg@chromium.org> X-Mailer: git-send-email 2.32.0.554.ge1b32706d8-goog In-Reply-To: <20210802005446.2267075-1-sjg@chromium.org> References: <20210802005446.2267075-1-sjg@chromium.org> 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 <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean |
Series |
pci: Drop all pre-driver model code
|
expand
|
On Sun, Aug 01, 2021 at 06:54:28PM -0600, Simon Glass wrote: > Now that DM_PCI is always enabled we don't need to check it. Drop this > old code. > > Signed-off-by: Simon Glass <sjg@chromium.org> Applied to u-boot/master, thanks!
diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c index 3444af6a8c7..3ba2fbbd560 100644 --- a/board/socrates/socrates.c +++ b/board/socrates/socrates.c @@ -53,7 +53,7 @@ int checkboard (void) } putc('\n'); -#if defined(CONFIG_PCI) || defined(CONFIG_DM_PCI) +#if defined(CONFIG_PCI) /* Check the PCI_clk sel bit */ if (in_be32(&gur->porpllsr) & (1<<15)) { src = "SYSCLK"; @@ -130,9 +130,7 @@ int misc_init_r (void) &flash_info[CONFIG_SYS_MAX_FLASH_BANKS - 1]); } -#if defined(CONFIG_DM_PCI) pci_init(); -#endif return 0; }
Now that DM_PCI is always enabled we don't need to check it. Drop this old code. Signed-off-by: Simon Glass <sjg@chromium.org> --- (no changes since v1) board/socrates/socrates.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)