From patchwork Mon Apr 15 19:25:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10901457 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 265F214DB for ; Mon, 15 Apr 2019 19:28:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 090DF286DD for ; Mon, 15 Apr 2019 19:28:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F112128720; Mon, 15 Apr 2019 19:27:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 835EE286DD for ; Mon, 15 Apr 2019 19:27:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=mcriAzaj56tjVFDTfUcyDDjK5r5UEmAdwL8ouxOIfiE=; b=m9QMJzHTbP+lK/ 2wwO5Duz58/TRH5tKezGQPhCdT6PkaNaAOLa0oiEEK36tNGZRF6HodzbqJq7xWf/zJahMbp0LgJ91 IfAWOndVZXRbgFm74HiDGh3F9phu5HkLdh0YlGM/ot6eb/QhgiW9psLXKpgkEaST6oOphhafG3jPD BNDkfyyd50jOwXtxhIZdyqzLj9qnp2L0sp8GyJq6vsZbl6hEvlrupthwEeprtyF4PQJDTj7ei8MIU gSXRWuCsP7/EFFZEaTGli9GFAqoB6TTaM71jBmDyJi9jn57C7VjksiEYvqKeXqzu/9NIEE+41+fVb DAOV82ytI91y5ifxL8MQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hG7Gk-0003B1-LS; Mon, 15 Apr 2019 19:27:54 +0000 Received: from mout.kundenserver.de ([212.227.17.13]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hG7Gf-0003AG-OY for linux-arm-kernel@lists.infradead.org; Mon, 15 Apr 2019 19:27:52 +0000 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.145]) with ESMTPA (Nemesis) id 1M8ysi-1hB9SM1EKE-00674C; Mon, 15 Apr 2019 21:27:40 +0200 From: Arnd Bergmann To: Hartley Sweeten , Alexander Sverdlin Subject: [PATCH 1/4] ARM: ep93xx: move network platform data to separate header Date: Mon, 15 Apr 2019 21:25:23 +0200 Message-Id: <20190415192734.935387-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:7r+4JlmJvPvM2nMPpt2FgcrqkZ9O2yXFTBYzL79J2n1R3gNsh/I zJMiJz8yleneH9BgK+3DA6euAm9OBrFBVqYEnYfi8KOfp9koIp176i3pXHKoXLt0TLtR9HD 2KtYPTztUNtZy5X0U8Wff5PQIwLt/up9RF3G5UbUGPB4XISltrdFVGVhDSuGGSQFpSHnQPe UsLWgi5C9ubd95k4xDVIA== X-UI-Out-Filterresults: notjunk:1;V03:K0:htVNGk9GjfE=:8kjSBdwfuVj67ArJmu3r2I Mk2fc2oxt/2uttWubzOjlR+4odS9D3Hui8yKU97BhjkeijT9SOxFRHWMkwKtOJGQJzGEeVQO6 fJAezqbiOLxP0p4rez36baBm813X2m2VlhsdAo9aygLqPflPXIC4U7J9fKH6KcOK3Umts2eS6 tdZfZFDxbrfwr3aBRplYuOu+zUW8ZMiUSw1Ox/OGlVc0yj/GoaVpihoXpXZzacc8m/E1SNdNr 58JNdx6D78Y83s90YNo2ixoi0cH5zgNSt4uxvTuHfih95VBvyAeeOnAPL++uNg/W8vGJMh/RJ DMOUBoSVs2CiBuVvt2Zb46u6MRpQ7q71q9iRBInGqZeKh1D/+mnhyUJ/EoMIkEsx+Jd/6yUsN 3z5STqII//8IWzlOdZ5uLhOngUHJZjGZ5E8PeCx2rqrGcAsjAo4t6rcUo/TG5xAqUdObpr/7S kBsMJfT1owAp95s+RhwvuQG89JD/Hb2v+7wxWgJWEzETTTq4qNZZDRri82OyhYLypJRW9XHCV zYDEtOkn65Bfc7KYGHJljNgvwBkLkdmXbsN10zuINzZePJ7Sy4S25zWQ6rHUVPta74539eFjq uDpsAIiWFeKCTjNVn/knGM1aZ0yW8Tvaake3dWigzrRJHBpPCGArwpQonD+Ik+cHUK6WoRqtJ Mn2fkzOI9XiNfERYw14un8oCH1XggQlYYcz4zTL9lZjZupS2vFVvCKjFZwo5z0yS6nIPM1cUS LGuQDd8ZOJ1plRIq1/vZ7RwSUXDkuu4EkpnJrA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190415_122750_283563_320A1C55 X-CRM114-Status: GOOD ( 14.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jakub Kicinski , Arnd Bergmann , netdev@vger.kernel.org, Linus Walleij , linux-kernel@vger.kernel.org, David Ahern , "David S. Miller" , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The header file is the only thing preventing us from building the driver in a cross-platform configuration, so move the structure we are interested in to the global platform_data location and enable compile testing. Signed-off-by: Arnd Bergmann Acked-by: Alexander Sverdlin Acked-by: Linus Walleij --- arch/arm/mach-ep93xx/include/mach/platform.h | 7 +------ drivers/net/ethernet/cirrus/Kconfig | 2 +- drivers/net/ethernet/cirrus/ep93xx_eth.c | 2 +- include/linux/platform_data/eth-ep93xx.h | 10 ++++++++++ 4 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 include/linux/platform_data/eth-ep93xx.h diff --git a/arch/arm/mach-ep93xx/include/mach/platform.h b/arch/arm/mach-ep93xx/include/mach/platform.h index 6c41c794bed5..43446f33c2be 100644 --- a/arch/arm/mach-ep93xx/include/mach/platform.h +++ b/arch/arm/mach-ep93xx/include/mach/platform.h @@ -5,6 +5,7 @@ #ifndef __ASSEMBLY__ +#include #include struct device; @@ -15,12 +16,6 @@ struct ep93xxfb_mach_info; struct ep93xx_keypad_platform_data; struct ep93xx_spi_info; -struct ep93xx_eth_data -{ - unsigned char dev_addr[6]; - unsigned char phy_id; -}; - void ep93xx_map_io(void); void ep93xx_init_irq(void); diff --git a/drivers/net/ethernet/cirrus/Kconfig b/drivers/net/ethernet/cirrus/Kconfig index e9a0213b08c4..6238e6951336 100644 --- a/drivers/net/ethernet/cirrus/Kconfig +++ b/drivers/net/ethernet/cirrus/Kconfig @@ -41,7 +41,7 @@ config CS89x0_PLATFORM config EP93XX_ETH tristate "EP93xx Ethernet support" - depends on ARM && ARCH_EP93XX + depends on (ARM && ARCH_EP93XX) || COMPILE_TEST select MII help This is a driver for the ethernet hardware included in EP93xx CPUs. diff --git a/drivers/net/ethernet/cirrus/ep93xx_eth.c b/drivers/net/ethernet/cirrus/ep93xx_eth.c index 13dfdfca49fc..a6da9873570b 100644 --- a/drivers/net/ethernet/cirrus/ep93xx_eth.c +++ b/drivers/net/ethernet/cirrus/ep93xx_eth.c @@ -25,7 +25,7 @@ #include #include -#include +#include #define DRV_MODULE_NAME "ep93xx-eth" #define DRV_MODULE_VERSION "0.1" diff --git a/include/linux/platform_data/eth-ep93xx.h b/include/linux/platform_data/eth-ep93xx.h new file mode 100644 index 000000000000..8eef637a804d --- /dev/null +++ b/include/linux/platform_data/eth-ep93xx.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_PLATFORM_DATA_ETH_EP93XX +#define _LINUX_PLATFORM_DATA_ETH_EP93XX + +struct ep93xx_eth_data { + unsigned char dev_addr[6]; + unsigned char phy_id; +}; + +#endif