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: 162260 Delivered-To: patch@linaro.org Received: by 2002:ac9:2a84:0:0:0:0:0 with SMTP id p4csp3173814oca; Mon, 15 Apr 2019 12:28:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqzG8vm5tx89rU7ikslQqlpWyS1k60M5uAowoT3AJ/VO9MJKsjJbJgwa4AIvlwQ71v6t68ov X-Received: by 2002:a17:902:e084:: with SMTP id cb4mr79054650plb.77.1555356480727; Mon, 15 Apr 2019 12:28:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555356480; cv=none; d=google.com; s=arc-20160816; b=UddZ+Qi8aJONfyhyZdPHhzDgE4bWnNEXlx8KdRTvf892ZjzP3gddou9VtzjJ9DSM8I KQjw7G/YPus0v9KpEEroUbBeE0pAG8M5BuM+uv4oC23Q0cwVOqk8hR220+H80aBOcBjE +lIPzSzR7EFLuDlT/nAsRPTY1qG7rZ0p11Ny0Eo4nRYK2lQCiOO3uF6ugtfjRUc7g1d7 3D+3rvHASxLOXsaRwPuMmFgFwTiFKI1xouIWXpCHZ0ChYg3PAW6dQBMVfpVR/fdYXVnA KvClautlDJBq2Fpk8viwqcUTZjVOmxM+olcie61FpmXBbL+PdHBl8bIsgpK2t+t/IcZ1 Xahw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=RlbtI99HDYR0SEipUgLYGF3C7RkFB8gCHHtAonLQ7i0=; b=m/8+ujIP2nw6d1DnRznks/S2ASkynSLremkwfwZyReS76ro6XF9E36c5E7e6uKNiwF vaPwKdPM8AHftlPjWmDAYn5bBGxvm/WgcT58uCaso2tOyujaxR8h6U4NRccjdlTcCZd4 HZvIeyrmnkuJiLCQ7EHv3qBxkQQjFbKlAvdzhpcHkrx8hKk7Jrwniairihwk7J+vrGsC KEQfHTXCai27kPH+NQkV4qjHqdwii7M1kcyKcmTVPyW/IpIYj3iO/xWxAlGMm9CNQ29S qIseMWZdN3CiBnlX0915gR2JEUtTYQBWoYbfS8Zns5YVVPALij37WXJQrypNqolrLIL2 Fx+Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a73si30293442pge.358.2019.04.15.12.28.00; Mon, 15 Apr 2019 12:28:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730551AbfDOT17 (ORCPT + 30 others); Mon, 15 Apr 2019 15:27:59 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:46841 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729289AbfDOT1x (ORCPT ); Mon, 15 Apr 2019 15:27:53 -0400 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 Cc: Linus Walleij , Arnd Bergmann , "David S. Miller" , Jakub Kicinski , David Ahern , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org 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-Spam-Flag: NO 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== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 -- 2.20.0 Acked-by: Alexander Sverdlin Acked-by: Alexander Sverdlin Acked-by: Linus Walleij 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 From patchwork Mon Apr 15 19:25:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 162261 Delivered-To: patch@linaro.org Received: by 2002:ac9:2a84:0:0:0:0:0 with SMTP id p4csp3174480oca; Mon, 15 Apr 2019 12:28:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqwxrwGiE4MkaonP187uuv/yRFF97oVSlqlA2SsKf07jbkCodRC4wzXxmkJkYaOpd1yc+rYW X-Received: by 2002:a62:1318:: with SMTP id b24mr76622330pfj.201.1555356528099; Mon, 15 Apr 2019 12:28:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555356528; cv=none; d=google.com; s=arc-20160816; b=BLVqWFx8YsO9EyVe4CoUuOhPjUrpMqsnFx0pmEpXGn6rzMnVniRdj5jQiXTN28WgWO LOcemgcICW+Nc343ipYcbhbQd2vehhvd5MPb8Qaym9WmjGwatLg1ii+9/Yyh/xs91STu xgiiFxzvKHcD9vGMGv3f27hYmC7o8q2M4wJCR2uEoG+7l/cowRqUxZvFC1nCN0gN3imD G7ARBO4Gf//NjBRLYuOIp95Eg28i7KXOCS7QN17tcYQGLkhmErSpSBFF8Zs2wxiGpUUG XH9aCRCdmHb2EzPZO7raHS2jjV8A7lEwoJP2pNrTN0jwXJMDu7ptudvOOsA2TMj3KG8A MDSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=K5sbHRF5M/YO8cBNgxHoKYdl90vp1O+ktqB9hksy+yo=; b=AKSnJDgTK+mDup4HsrWH8XjfeZs5AOTEvp8nxbW66Jt/+o7HOKqJoOUy60OBKmHRUO XGt35wtmKDNYyxwAglB90Kw8iltScfHR413E9MejIutBMImJy2zQ+Oh12kPnQsCJZMwT jpWEj9QNkedp2V79oTzjN9hiqiFLu6oNcfZn4DSefTpOtPuv6WK+dhLhZ9YzmIAWW2fm WoEMP/RqQtBW0epvjdoyuYlCeUNe7rl5UgKN0HH0fJJF58lrPPtS6582UBoHSC9iSHVo I5N2xcqV5KGvnO1HbKVcfVNHJS51V0kxJr4sPYy1tPPWtFSrL1kIGEcxh1wdkTLboRB3 6uAQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 5si46714347pgg.505.2019.04.15.12.28.47; Mon, 15 Apr 2019 12:28:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730574AbfDOT2q (ORCPT + 30 others); Mon, 15 Apr 2019 15:28:46 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:45297 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729063AbfDOT2m (ORCPT ); Mon, 15 Apr 2019 15:28:42 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.145]) with ESMTPA (Nemesis) id 1MhDEq-1gcueH0N0s-00eLtE; Mon, 15 Apr 2019 21:28:35 +0200 From: Arnd Bergmann To: Hartley Sweeten , Alexander Sverdlin Cc: Linus Walleij , Arnd Bergmann , Dmitry Torokhov , Stefan Agner , Enric Balletbo i Serra , Guenter Roeck , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/4] ARM: ep93xx: keypad: stop using mach/platform.h Date: Mon, 15 Apr 2019 21:25:24 +0200 Message-Id: <20190415192734.935387-2-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190415192734.935387-1-arnd@arndb.de> References: <20190415192734.935387-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:Dz9JsujkkUgk8Frvv9ud7TM/8N/2eXNKu9k/iheacQOv6Lia4mu Fhs4U0hadKRMyQ3rmWoXQy/8RCMxp+AawzJ6kyQQPfFJCU6LtCcrtBCaj6P8W5Md4RP2qGd JoP6V1JHr4wOsQjFDtEBcFCtM9WHVqyUXKefQeWIsKjrpAtS5y32oay1hWAwS3HB+R3uGf6 O9Dv2XjPEZjo08N3aLDsQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:oX+RErlzxHA=:bofT5AK8lN0WLeiMfzF+Td +p1V42yb+a4im/yfKUfui6LNgsAYR4hlTsva/ZIPGQ6pLgGsEh17rT3XvPSKeXMh5pCEiINoA ogMvXqWbe4HpfDCnJriFsCTJ4us1LM/Nu4mjIJ5pAeGKe8p83Jh4j15Zn7UJulPCnLqwffifF OCDEIB22roZhBSu8w/Tqr6e3Q/NdsqSKlcshOlHE4bSkYMPnQB8i7ka/xhoQoqPdYiDyEjXis 8QI1eOuqnfhTp9T/tgdJZ+lEvzBKQv8G/tnaIRjnpl1+zrbHI3H1c91w6xrWo4wVypVwV7Mn3 AKBQg3+m8JSWlKMmTtIhL2NHQoD4xlDmpcrhXrOAAHwT/tSibIuXo0hRmyUkTn+15d3t7AuXn RmutzCfpdJmAT1gyB8QuV7y9Orcil5bioRFZ6qQccvBBbhfEahXh6EiXhzDCi4K0Jbg7R0IdO myv6IQsfZgRSrcAIifIwRXhEf83YTxVqeldpIkef0c5PrI8fwwAsQjbQ7/9gcUxYIFrfERGrP Z0n3Sj7ZwMv0TkPVkcUakJA8xPFqkeueCp0fi3MNQCiiX3l3aA12BoudNUjIDF0BPLlB6QOqf XnOP2bSUaET4rrdJ55uccAoADnHfLzqJ4cQQvW++7sY61IS5QxP3dyUHG+fDAZVEr9oDHCI5h 9TczqdpR1oCjqW5+tDbMMJuPL7ZhgVSvWkFDRjZ+B/g+7YflA2ZbPMY29oCfa+h+VZxjDewwz otSmwr0mb6oMfCwUqHmnNg4wPGb3rdI0+IBqlg== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We can communicate the clock rate using platform data rather than setting a flag to use a particular value in the driver, which is cleaner and avoids the dependency. No platform in the kernel currently defines the ep93xx keypad device structure, so this is a rather pointless excercise. Any out of tree users are probably dead now, but if not, they have to change their platform code to match the new platform_data structure. Signed-off-by: Arnd Bergmann --- drivers/input/keyboard/Kconfig | 2 +- drivers/input/keyboard/ep93xx_keypad.c | 5 +---- include/linux/platform_data/keypad-ep93xx.h | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) -- 2.20.0 Acked-by: H Hartley Sweeten diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index a878351f1643..b373f3274542 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -194,7 +194,7 @@ config KEYBOARD_LKKBD config KEYBOARD_EP93XX tristate "EP93xx Matrix Keypad support" - depends on ARCH_EP93XX + depends on ARCH_EP93XX || COMPILE_TEST select INPUT_MATRIXKMAP help Say Y here to enable the matrix keypad on the Cirrus EP93XX. diff --git a/drivers/input/keyboard/ep93xx_keypad.c b/drivers/input/keyboard/ep93xx_keypad.c index f77b295e0123..71472f6257c0 100644 --- a/drivers/input/keyboard/ep93xx_keypad.c +++ b/drivers/input/keyboard/ep93xx_keypad.c @@ -137,10 +137,7 @@ static void ep93xx_keypad_config(struct ep93xx_keypad *keypad) struct ep93xx_keypad_platform_data *pdata = keypad->pdata; unsigned int val = 0; - if (pdata->flags & EP93XX_KEYPAD_KDIV) - clk_set_rate(keypad->clk, EP93XX_KEYTCHCLK_DIV4); - else - clk_set_rate(keypad->clk, EP93XX_KEYTCHCLK_DIV16); + clk_set_rate(keypad->clk, pdata->clk_rate); if (pdata->flags & EP93XX_KEYPAD_DISABLE_3_KEY) val |= KEY_INIT_DIS3KY; diff --git a/include/linux/platform_data/keypad-ep93xx.h b/include/linux/platform_data/keypad-ep93xx.h index 0e36818e3680..3054fced8509 100644 --- a/include/linux/platform_data/keypad-ep93xx.h +++ b/include/linux/platform_data/keypad-ep93xx.h @@ -9,8 +9,7 @@ struct matrix_keymap_data; #define EP93XX_KEYPAD_DIAG_MODE (1<<1) /* diagnostic mode */ #define EP93XX_KEYPAD_BACK_DRIVE (1<<2) /* back driving mode */ #define EP93XX_KEYPAD_TEST_MODE (1<<3) /* scan only column 0 */ -#define EP93XX_KEYPAD_KDIV (1<<4) /* 1/4 clock or 1/16 clock */ -#define EP93XX_KEYPAD_AUTOREPEAT (1<<5) /* enable key autorepeat */ +#define EP93XX_KEYPAD_AUTOREPEAT (1<<4) /* enable key autorepeat */ /** * struct ep93xx_keypad_platform_data - platform specific device structure @@ -24,6 +23,7 @@ struct ep93xx_keypad_platform_data { unsigned int debounce; unsigned int prescale; unsigned int flags; + unsigned int clk_rate; }; #define EP93XX_MATRIX_ROWS (8) From patchwork Mon Apr 15 19:31:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 162263 Delivered-To: patch@linaro.org Received: by 2002:ac9:2a84:0:0:0:0:0 with SMTP id p4csp3178497oca; Mon, 15 Apr 2019 12:32:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqzy4awSmSRDV3eadBdgWTrzGYHj4YL5dUWoBUztTxvIWdgliUXatjpZqw0/I7/tYzlxfgt/ X-Received: by 2002:a65:4846:: with SMTP id i6mr73648527pgs.132.1555356768824; Mon, 15 Apr 2019 12:32:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555356768; cv=none; d=google.com; s=arc-20160816; b=LxmBfhfInnPB8p8vDwvxYnhMEZp+83va5r9OtnGbT5IQHeYuKpxzmCLw0QfFzLYost 1gUFvyS7BTU/Nv559ccZRdyni1q7IeYjrPrXctNdV0ojwluK0igYG6fp6TWQ6No+60Qi 1c4BO7MSkkR3RJ4upOAoNQ1QgrBSvd6YfHMhTtUKN6AJ5WvoBCa7mNM1KaYFozsGoQDG aVZLcpgV1Kpi0BnkyFjP76RwxquQPAanSSy0vlBfSh+0S+SPQIKiArIBhbtmIIo/Gqdh Y5zmuq0+y1EK9//bNBWq9SU0eN/a+q68rnyhay3FxsFd9p74JXpV8ir3O51eAGJPDoSU vijQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=TVeAGBgkIwyeuWkqja12TvlWKdXWNSH43qlbcjwOdhU=; b=Ocx8PhI+N1TLepvQqUxClrjVUVBA/i3SFNQE8cYbJNdZOfes4EvQvmr5O1k2jBzHZy o8DfzAxZSJBvShB7WJANhjau0QEHbv0PIbY7VOaWvFhuUh6fsK5Z4YJnr6OjhU8UiBTZ RFWmyqPfNz6bkykgYgvY3/TNF6Ix29Ixv+cPya9cWzoc2GAIq+fXu8gHT4rCA8txU7sj /J8GUW8XvahdRQx07EPIsxynVj4xzQzMsIppGfLVsjGcKDYQuJE7qkFH1KYzDo+cKSaq 7U2M7kG/R6ilZ44p1pd4fp/7gf7aAN9Z+O/gf4qh6wxWZslWwViMiYudVX/H5g7BeC0J 2Ptw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a11si36889952plp.306.2019.04.15.12.32.48; Mon, 15 Apr 2019 12:32:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728330AbfDOTcr (ORCPT + 30 others); Mon, 15 Apr 2019 15:32:47 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:50121 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728220AbfDOTcq (ORCPT ); Mon, 15 Apr 2019 15:32:46 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.129]) with ESMTPA (Nemesis) id 1MQNF3-1hTVSL1VFx-00MJa8; Mon, 15 Apr 2019 21:32:32 +0200 From: Arnd Bergmann To: Hartley Sweeten , Alexander Sverdlin Cc: Linus Walleij , Arnd Bergmann , Lukasz Majewski , Olof Johansson , Mark Brown , Ulf Hansson , Laurent Pinchart , Miquel Raynal , Boris Brezillon , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] ARM: ep93xx: move private headers out of mach/* Date: Mon, 15 Apr 2019 21:31:50 +0200 Message-Id: <20190415193231.936070-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190415192734.935387-1-arnd@arndb.de> References: <20190415192734.935387-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:ivPYvLLQ2j7TZufmWjXvXUfDmxVt/p/ExL/DvN/KwGxtp+3ub4o BOFcaeXUfmSyzCjflApEe+0APEuk1Zm97Xid0XmwZWBqpPxounHwtNu5mUDAXKdJI0ICF8b dP4bluOFs3Lhed5QKU/aR7R7mknzx3ogpm0269yUHA/YUOGU9zm9kpmmi2FhLSlJpsKh0AL 8vsKEcCoQgpJTF174IM2A== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:R6RaNR2FKfw=:9+PYJzJ4YGVkJXT5oF1gpf l7BAeuv0K2bZFie6Sby34HkL8lDbW2Sve1N615WI5V9VcssMZND/b5t+Tw/eyQylVlFgOJ+FG iBWoiDq8J4YpcRYhWbJRGa+pKNzhRW59+9W9h5sWA1Mivop57grravatgKRK42BqcaTsQyNSt rY1HIcNQ8bOUCuEm1O0gsLH5/QslxU75hnn3VeDsoByyetOCV1PeV93hlcgITVWV2hi24xT31 Z6JR442lnKA5RHIf0ByUa8gxSHXts8gHgxJzCtU8BzU8J92hzMnd+a8hMVDPmTfFNFja0RD2J zk/Hdw/SYkpI6THLv3crWPnHo0986ElYEeJnJ2cfn0Axcd05LJRdl3sc8EW8uxb0mnL4exba/ c2n6XuXUIXENzrcIgpjjuHTybEbDWY/diaKrzse+KozmebEvPdGcRm5yLEYPVzGfBr+OOI4x1 FbohmfA71xR+vQIeV4EbWUjCbTor7b4TM1h0MSwC4x1S3AFpP4stn5ULaK1P+JAk2yo0gOjQE 5k78FPZOOEIKtY0Uq+iQYzJSFNs9+gJFLAux0gioaNAMikYnMH3mCbnwUjlsrck4qsWKRUFyh fpvno05IhoU2qYW+9b+eQLIOAgdkFSU7FVMpfhe/Kx9B2dH0Vmt9xcUBMB+ch5J9G7YxM+eTq mlmSytUftZA2BQiV7O1z0zezNvYj+rMNgWPSsc8yaOD46Zm+zUKergZg1eLgXnvCwfIpzUAgc bj1DrKwks29pTidCWyi9a1cHYENBd+SiWO3Nmw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gpio-ep93xx.h, hardware.h, and platform.h are only used in arch/arm/mach-ep93xx, so we can move them one there and no longer expose them to device drivers. Signed-off-by: Arnd Bergmann --- arch/arm/mach-ep93xx/adssphere.c | 2 +- arch/arm/mach-ep93xx/clock.c | 2 +- arch/arm/mach-ep93xx/core.c | 6 +++--- arch/arm/mach-ep93xx/dma.c | 2 +- arch/arm/mach-ep93xx/edb93xx.c | 4 ++-- arch/arm/mach-ep93xx/gesbc9312.c | 2 +- arch/arm/mach-ep93xx/{include/mach => }/gpio-ep93xx.h | 0 arch/arm/mach-ep93xx/{include/mach => }/hardware.h | 2 +- arch/arm/mach-ep93xx/micro9.c | 2 +- arch/arm/mach-ep93xx/{include/mach => }/platform.h | 0 arch/arm/mach-ep93xx/simone.c | 4 ++-- arch/arm/mach-ep93xx/snappercl15.c | 4 ++-- arch/arm/mach-ep93xx/ts72xx.c | 4 ++-- arch/arm/mach-ep93xx/vision_ep9307.c | 4 ++-- 14 files changed, 19 insertions(+), 19 deletions(-) rename arch/arm/mach-ep93xx/{include/mach => }/gpio-ep93xx.h (100%) rename arch/arm/mach-ep93xx/{include/mach => }/hardware.h (96%) rename arch/arm/mach-ep93xx/{include/mach => }/platform.h (100%) -- 2.20.0 Acked-by: Alexander Sverdlin Reviewed-by: Lukasz Majewski diff --git a/arch/arm/mach-ep93xx/adssphere.c b/arch/arm/mach-ep93xx/adssphere.c index bda6c3a5c923..5d3a3e302012 100644 --- a/arch/arm/mach-ep93xx/adssphere.c +++ b/arch/arm/mach-ep93xx/adssphere.c @@ -15,7 +15,7 @@ #include #include -#include +#include "hardware.h" #include #include diff --git a/arch/arm/mach-ep93xx/clock.c b/arch/arm/mach-ep93xx/clock.c index 9f43362eb62d..b9f523d9dc8c 100644 --- a/arch/arm/mach-ep93xx/clock.c +++ b/arch/arm/mach-ep93xx/clock.c @@ -22,7 +22,7 @@ #include #include -#include +#include "hardware.h" #include diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c index 3d245668846d..cc1382f879af 100644 --- a/arch/arm/mach-ep93xx/core.c +++ b/arch/arm/mach-ep93xx/core.c @@ -39,13 +39,13 @@ #include #include -#include +#include "hardware.h" #include #include #include #include -#include +#include "gpio-ep93xx.h" #include #include @@ -125,7 +125,7 @@ void ep93xx_devcfg_set_clear(unsigned int set_bits, unsigned int clear_bits) /** * ep93xx_chip_revision() - returns the EP93xx chip revision * - * See for more information. + * See "platform.h" for more information. */ unsigned int ep93xx_chip_revision(void) { diff --git a/arch/arm/mach-ep93xx/dma.c b/arch/arm/mach-ep93xx/dma.c index 88a4c9b089a5..821427107b11 100644 --- a/arch/arm/mach-ep93xx/dma.c +++ b/arch/arm/mach-ep93xx/dma.c @@ -26,7 +26,7 @@ #include #include -#include +#include "hardware.h" #include "soc.h" diff --git a/arch/arm/mach-ep93xx/edb93xx.c b/arch/arm/mach-ep93xx/edb93xx.c index 8e89ec8b6f0f..d96dd014dd23 100644 --- a/arch/arm/mach-ep93xx/edb93xx.c +++ b/arch/arm/mach-ep93xx/edb93xx.c @@ -32,10 +32,10 @@ #include -#include +#include "hardware.h" #include #include -#include +#include "gpio-ep93xx.h" #include #include diff --git a/arch/arm/mach-ep93xx/gesbc9312.c b/arch/arm/mach-ep93xx/gesbc9312.c index 0cca5b183309..ac48e3476587 100644 --- a/arch/arm/mach-ep93xx/gesbc9312.c +++ b/arch/arm/mach-ep93xx/gesbc9312.c @@ -15,7 +15,7 @@ #include #include -#include +#include "hardware.h" #include #include diff --git a/arch/arm/mach-ep93xx/include/mach/gpio-ep93xx.h b/arch/arm/mach-ep93xx/gpio-ep93xx.h similarity index 100% rename from arch/arm/mach-ep93xx/include/mach/gpio-ep93xx.h rename to arch/arm/mach-ep93xx/gpio-ep93xx.h diff --git a/arch/arm/mach-ep93xx/include/mach/hardware.h b/arch/arm/mach-ep93xx/hardware.h similarity index 96% rename from arch/arm/mach-ep93xx/include/mach/hardware.h rename to arch/arm/mach-ep93xx/hardware.h index 8938906e780a..e7d850e04782 100644 --- a/arch/arm/mach-ep93xx/include/mach/hardware.h +++ b/arch/arm/mach-ep93xx/hardware.h @@ -6,7 +6,7 @@ #ifndef __ASM_ARCH_HARDWARE_H #define __ASM_ARCH_HARDWARE_H -#include +#include "platform.h" /* * The EP93xx has two external crystal oscillators. To generate the diff --git a/arch/arm/mach-ep93xx/micro9.c b/arch/arm/mach-ep93xx/micro9.c index 373583c29825..c7f64e4ff6c7 100644 --- a/arch/arm/mach-ep93xx/micro9.c +++ b/arch/arm/mach-ep93xx/micro9.c @@ -16,7 +16,7 @@ #include #include -#include +#include "hardware.h" #include #include diff --git a/arch/arm/mach-ep93xx/include/mach/platform.h b/arch/arm/mach-ep93xx/platform.h similarity index 100% rename from arch/arm/mach-ep93xx/include/mach/platform.h rename to arch/arm/mach-ep93xx/platform.h diff --git a/arch/arm/mach-ep93xx/simone.c b/arch/arm/mach-ep93xx/simone.c index 80ccb984d521..adc17289cc23 100644 --- a/arch/arm/mach-ep93xx/simone.c +++ b/arch/arm/mach-ep93xx/simone.c @@ -27,8 +27,8 @@ #include #include -#include -#include +#include "hardware.h" +#include "gpio-ep93xx.h" #include #include diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c index cf0cb58b3454..f8f89551dbed 100644 --- a/arch/arm/mach-ep93xx/snappercl15.c +++ b/arch/arm/mach-ep93xx/snappercl15.c @@ -25,9 +25,9 @@ #include -#include +#include "hardware.h" #include -#include +#include "gpio-ep93xx.h" #include #include diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c index 85b74ac943f0..bba6aa5d7106 100644 --- a/arch/arm/mach-ep93xx/ts72xx.c +++ b/arch/arm/mach-ep93xx/ts72xx.c @@ -23,8 +23,8 @@ #include #include -#include -#include +#include "gpio-ep93xx.h" +#include "hardware.h" #include #include diff --git a/arch/arm/mach-ep93xx/vision_ep9307.c b/arch/arm/mach-ep93xx/vision_ep9307.c index 767ee64628dc..66e2b34aa779 100644 --- a/arch/arm/mach-ep93xx/vision_ep9307.c +++ b/arch/arm/mach-ep93xx/vision_ep9307.c @@ -31,10 +31,10 @@ #include -#include +#include "hardware.h" #include #include -#include +#include "gpio-ep93xx.h" #include #include