From patchwork Thu Nov 14 19:57:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1195191 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=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="ZCYSpcF1"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 47DXkb41y7z9s7T for ; Fri, 15 Nov 2019 07:14:15 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 117DEC21E39; Thu, 14 Nov 2019 20:05:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id C85ECC21EA2; Thu, 14 Nov 2019 19:59:00 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B3E1AC21EC5; Thu, 14 Nov 2019 19:58:55 +0000 (UTC) Received: from mail-il1-f193.google.com (mail-il1-f193.google.com [209.85.166.193]) by lists.denx.de (Postfix) with ESMTPS id 3C913C21D8A for ; Thu, 14 Nov 2019 19:58:40 +0000 (UTC) Received: by mail-il1-f193.google.com with SMTP id d83so6469896ilk.7 for ; Thu, 14 Nov 2019 11:58:40 -0800 (PST) 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=8Had6afOPXtXF6iq74aieb31s7FDAbr3V3dNaoqtFrY=; b=ZCYSpcF13ea/bHWTI7a+hQW1TdeMjLZHgZDpSk7uwf0HEaWQtnycW2vIr3psmpdpZW qwEhmEqTaN2YHTHkWruhc7P63YuYU1PvC3T2SQgjtv9B4hakwfXaih0D8vzw9g+857Qp Zk1kLn55vIichZgSCNUgMp614DOnw7NuLkPpM= 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=8Had6afOPXtXF6iq74aieb31s7FDAbr3V3dNaoqtFrY=; b=fEW/dy/gVO6hjyGTr/AqIcvoZeahkwDcKAOSgkNqb6hQBsGZAWaUGEMd+9+Ug5oRXt Emfd/+Q19yksyK1gHHNEMPOH1evYj/NDUAA6Gfe5rII2x4hPDFvdbrEV2c1GK8oZ+zAv Zx77SftZokGfM0KxXo+sgjBVSVqKdnMzcgohPZiGrQo7Usl/XMacUromv+S3jmz0j+Hx bFdNzbQkh7Vs0s5z/0JO4G3XhT864lASTAOtDjQFJOyXB1cJzzosiUl9efH8reyRJAxX IebCEre31BvKNJhG+NXYX7cwEPu257Go68St7sEQiH4yw5rb44FVx5OSbT14YbpEX3bb jebw== X-Gm-Message-State: APjAAAVcO0m586iOOUTl3GRxpzfm/LbGA7YJsI2z15hCFX6Qgoaz0GOp /d62PYMgUkvVpFk2rZh4xVyIrhC11Hs= X-Google-Smtp-Source: APXvYqzm+Tt1c8Mp5/5mwzx3DScAaYLn6AalhIt2+nO19abPF/mPd3SXX41tdNxpcrWqVNZZMONdSQ== X-Received: by 2002:a92:7f03:: with SMTP id a3mr12467512ild.105.1573761518744; Thu, 14 Nov 2019 11:58:38 -0800 (PST) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id c83sm652546iof.48.2019.11.14.11.58.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Nov 2019 11:58:38 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Date: Thu, 14 Nov 2019 12:57:31 -0700 Message-Id: <20191114125724.v4.23.Iaa061cc6a0a856a9300b6b03c2f5bb21d81565ff@changeid> X-Mailer: git-send-email 2.24.0.rc1.363.gb1bccd3e3d-goog In-Reply-To: <20191114195751.30357-1-sjg@chromium.org> References: <20191114195751.30357-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini Subject: [U-Boot] [PATCH v4 23/42] common: Move mii_init() function out of common.h X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This function belongs in mii.h so move it over. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- Changes in v4: None Changes in v3: None Changes in v2: None arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 1 + drivers/net/fsl_mcdmafec.c | 1 + drivers/net/ldpaa_eth/ls1088a.c | 1 + drivers/net/ldpaa_eth/lx2160a.c | 1 + drivers/net/mcffec.c | 1 + drivers/net/mcfmii.c | 1 + drivers/net/mpc8xx_fec.c | 1 + drivers/net/pic32_eth.c | 1 + include/common.h | 3 --- include/linux/mii.h | 2 ++ 10 files changed, 10 insertions(+), 3 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 59d03b167c..374fde6b65 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -39,6 +39,7 @@ #include #endif #endif +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c index e66fb16de8..b2936b78d7 100644 --- a/drivers/net/fsl_mcdmafec.c +++ b/drivers/net/fsl_mcdmafec.c @@ -14,6 +14,7 @@ #include #include #include +#include #undef ET_DEBUG #undef MII_DEBUG diff --git a/drivers/net/ldpaa_eth/ls1088a.c b/drivers/net/ldpaa_eth/ls1088a.c index c3260d318c..54cb16e51b 100644 --- a/drivers/net/ldpaa_eth/ls1088a.c +++ b/drivers/net/ldpaa_eth/ls1088a.c @@ -8,6 +8,7 @@ #include #include #include +#include u32 dpmac_to_devdisr[] = { [WRIOP1_DPMAC1] = FSL_CHASSIS3_DEVDISR2_DPMAC1, diff --git a/drivers/net/ldpaa_eth/lx2160a.c b/drivers/net/ldpaa_eth/lx2160a.c index 1fbeb0d14b..9432b6eb85 100644 --- a/drivers/net/ldpaa_eth/lx2160a.c +++ b/drivers/net/ldpaa_eth/lx2160a.c @@ -8,6 +8,7 @@ #include #include #include +#include u32 dpmac_to_devdisr[] = { [WRIOP1_DPMAC1] = FSL_CHASSIS3_DEVDISR2_DPMAC1, diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c index fb93041256..9a3a8455a1 100644 --- a/drivers/net/mcffec.c +++ b/drivers/net/mcffec.c @@ -18,6 +18,7 @@ #include #include +#include #undef ET_DEBUG #undef MII_DEBUG diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c index 961618b410..b8af2cc44b 100644 --- a/drivers/net/mcfmii.c +++ b/drivers/net/mcfmii.c @@ -15,6 +15,7 @@ #include #endif #include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c index f45f1e4677..0a80985192 100644 --- a/drivers/net/mpc8xx_fec.c +++ b/drivers/net/mpc8xx_fec.c @@ -13,6 +13,7 @@ #include #include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/net/pic32_eth.c b/drivers/net/pic32_eth.c index b0f7677154..39c4b10ab8 100644 --- a/drivers/net/pic32_eth.c +++ b/drivers/net/pic32_eth.c @@ -12,6 +12,7 @@ #include #include #include +#include #include "pic32_eth.h" diff --git a/include/common.h b/include/common.h index cc5f13ec7e..992675100d 100644 --- a/include/common.h +++ b/include/common.h @@ -254,9 +254,6 @@ void reset_timer (void); void enable_interrupts (void); int disable_interrupts (void); -/* $(CPU)/.../ */ -void mii_init (void); - /* arch/$(ARCH)/lib/cache.c */ void enable_caches(void); void flush_cache (unsigned long, unsigned long); diff --git a/include/linux/mii.h b/include/linux/mii.h index 21db032340..49e29ac314 100644 --- a/include/linux/mii.h +++ b/include/linux/mii.h @@ -225,4 +225,6 @@ static inline u8 mii_resolve_flowctrl_fdx(u16 lcladv, u16 rmtadv) return cap; } +void mii_init(void); + #endif /* __LINUX_MII_H__ */