From mboxrd@z Thu Jan 1 00:00:00 1970 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=-19.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 BDFBDC4338F for ; Mon, 26 Jul 2021 13:37: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 40D0660F02 for ; Mon, 26 Jul 2021 13:37:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 40D0660F02 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3774A8335F; Mon, 26 Jul 2021 15:37:24 +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="lyzzrGW3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3C2A58337F; Mon, 26 Jul 2021 15:36:33 +0200 (CEST) Received: from mail-oi1-x236.google.com (mail-oi1-x236.google.com [IPv6:2607:f8b0:4864:20::236]) (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 BECE383346 for ; Mon, 26 Jul 2021 15:35:12 +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-x236.google.com with SMTP id u10so10878986oiw.4 for ; Mon, 26 Jul 2021 06:35:12 -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=0I+GcmuMaSzoHJ11v/JcuvMl3gccF5wTYSQGomhSMGM=; b=lyzzrGW3lV0cF913wlRoiJijBd7WH9RTyUNmSaNI4NNkQE6cySQo2KU0nriVuAxdK4 rTTZf5GiYBH+h39IJCEmVKqfIh8zEOzSiXvHfwtAMY4QIRRTxZXye0dIU7mmLGUe5fS8 qt0vKa78ZR1G3dYRjzYmAJ4lbSggeSNayKcN4= 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=0I+GcmuMaSzoHJ11v/JcuvMl3gccF5wTYSQGomhSMGM=; b=e1wrdOx8exSQN+JeMWxZzUBDu1+5bhf83zd2xStHgJ23IfnmHzsmNIw/18azQqmBVr nNHtQUXFBdCz5puL5Ii+AuvLWcAXBP6gz8uwqvsYA5iYAie8V+M2SjW+oDQsWQXj/njf fo2DupyWorijfIwNP0dQEIiqTpNGJWDAaweNkSzBPQh3SZZvNYaC3ED8zHXiKC7GkW91 7Hn6O1fA9pex6LRTcIEd4qqSdwxqCezWyMnU6X0dSh6DFCusW4sx407Es4TL9UkvXZqX mc6TmSuZe4IAY3LvXj9VTXCfx9x3WkoH/Tcu6E98vui3fbZy+clqSB87AbHCn8nvgfLB ZKkw== X-Gm-Message-State: AOAM532nMQtSiWi4pO+xtRDA97IHOiOU7NnJaPUi/0O9vu1NICpRj+dV zNZ+E8IragfKA21lbOyVEIVkfjM55r/iQthL X-Google-Smtp-Source: ABdhPJy9zHhX4AennjdHXkXNvccGzn5XVrzFwR5eJd6CbZMyGK5st790KArYtYfEb/qDDw8y/BuO2w== X-Received: by 2002:a05:6808:1582:: with SMTP id t2mr11178184oiw.173.1627306510954; Mon, 26 Jul 2021 06:35:10 -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.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 06:35:10 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Marek Vasut Subject: [PATCH 14/33] pci: usb: Drop DM_PCI from ohci Date: Mon, 26 Jul 2021 07:34:20 -0600 Message-Id: <20210726133440.634682-15-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 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 Now that DM_PCI is always enabled we don't need to check it. Drop this old condition and update the comment. Signed-off-by: Simon Glass --- drivers/usb/host/ohci-hcd.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index c62d8feecce..7fa84f8bbe4 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c @@ -52,13 +52,6 @@ #include /* needed for AT91_USB_HOST_BASE */ #endif -#if defined(CONFIG_CPU_ARM920T) || \ - defined(CONFIG_PCI_OHCI) || \ - defined(CONFIG_DM_PCI) || \ - defined(CONFIG_SYS_OHCI_USE_NPS) -# define OHCI_USE_NPS /* force NoPowerSwitching mode */ -#endif - #undef OHCI_VERBOSE_DEBUG /* not always helpful */ #undef DEBUG #undef SHOW_INFO @@ -1885,12 +1878,14 @@ static int hc_start(ohci_t *ohci) mask = OHCI_INTR_RHSC | OHCI_INTR_UE | OHCI_INTR_WDH | OHCI_INTR_SO; ohci_writel(mask, &ohci->regs->intrenable); -#ifdef OHCI_USE_NPS - /* required for AMD-756 and some Mac platforms */ + /* + * required for AMD-756 and some Mac platforms + * Note: this is always enabled at present, since driver model is used + * for PCI + */ ohci_writel((roothub_a(ohci) | RH_A_NPS) & ~RH_A_PSM, &ohci->regs->roothub.a); ohci_writel(RH_HS_LPSC, &ohci->regs->roothub.status); -#endif /* OHCI_USE_NPS */ /* connect the virtual root hub */ ohci->rh.devnum = 0; -- 2.32.0.432.gabb21c7263-goog