Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp2481386yba; Mon, 15 Apr 2019 12:33:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqyYPpd7IQk+DtzZKuo/BEOrD1zbFaYZot6fBAQ3aCv25fMwbPSgAlKKBYs6fXwrODlMJl7v X-Received: by 2002:a65:5049:: with SMTP id k9mr73633280pgo.229.1555356788933; Mon, 15 Apr 2019 12:33:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555356788; cv=none; d=google.com; s=arc-20160816; b=D5+qNiWccN2+63psjKo96SJsZwGrT3IUuEjDvvDwlnl4POX6AyVZ05UToxDkTO6Xw3 CsPEZKBgZOukqeWzBAfmTyN4bm6Zz2ZZulUS1/4cusKHR+X7Th0XdbbcDt0uNhe6CJhn il3TT6HvyGjmQKFuh0BxqBxQNwFw4ZwTRm0D79CIqoYEkWBbXtjw7o7P90uiCxtNozvH WgjtzxOgJ1D+qf4v6K+ua4dhWK+XYFLOLqhaHp+acUyHfkzASeMLmBEfhpCNCtSORLAD xhIOC0qDqufSIpO9pod1pYa+tHMahHIleikqaGQpreE09/gjFckKZo4Gkrwigo6pCkEY PZIw== 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=HOMZTSLVlnwx+FeAe7IJt4PEMABN+nT2ODhUq0rSe3o=; b=njLDyGZTvr+RdDsrhcKm6RNrXLXyi09DE8dlkgeSZcOy0fRKXw6KVXVfL3LMFCcuML Ky17NELvQMNnWvHIaiU7/iRwIixTGYYnK5IPFjM9MSUdWpvWN6YXNYN03pVyxnJVP8yP GDvntv6gy7TnMobOWXPzcz/V+CFjW3JDR7xrLn5yMaRaTnEtk5I/GFrmImlA86jv4oR0 6QI3AlTl+V+N5ez3BuKH21HdKi8aXgtdBrFWs+UIu8irz5Xbn86KkZ9lWf/uo59oCwCu FRjv/nDH3uiiuwM//gyZp6c9reXJxbE7bPv46Hq80H7V4Ix5GiaBbPClCj43332LGVXE Wpmg== 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 k75si45631033pgc.515.2019.04.15.12.32.52; Mon, 15 Apr 2019 12:33:08 -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 S1729293AbfDOTaH (ORCPT + 99 others); Mon, 15 Apr 2019 15:30:07 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:51347 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728269AbfDOTaF (ORCPT ); Mon, 15 Apr 2019 15:30:05 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.145]) with ESMTPA (Nemesis) id 1MRCFu-1hS8PU2ZvA-00NEDC; Mon, 15 Apr 2019 21:29:44 +0200 From: Arnd Bergmann To: Hartley Sweeten , Alexander Sverdlin Cc: Linus Walleij , Arnd Bergmann , Bartlomiej Zolnierkiewicz , Jens Axboe , Dmitry Torokhov , Thierry Reding , Mark Brown , Olof Johansson , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org, linux-input@vger.kernel.org, linux-pwm@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH 3/4] ARM: ep93xx: move pinctrl interfaces into include/linux/soc Date: Mon, 15 Apr 2019 21:25:25 +0200 Message-Id: <20190415192734.935387-3-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 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:dRvk3DqNUanFdB12QVLmdoW3VNVR+CJbLIKq3bNIeNaHjokfuCj P0OnfDT+EC2RLgx1gqyx/4vdGjEF9QjjEWwWeqNMk2DrquyzOKk9p8aYbj9eB6/KD703oYx cZN0IVmsn4HczRs+Mli1CHmCjgdbjygnc+YuVg0AxOTZTwOOh/5W/pJy92KqawV0TvaZz5i BTfYPTKfgG7ZugvwFyc2g== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:aex9IFYN86E=:4XPEDTHn5/TAWcAS8M7/Y6 bTAbFK67uqiywdTFUlUuBJ+WHDSe0i7jpJH/VdT9WQ0E3+MIjxxVv8dFE44ehx0pV0YjmnxvQ tJeqRdKWHnBnTprSU2aus3R9IOpHWzuCmqPIxTqsSTGLw1decCmCZ0/kCKj6Mk4bKdXygzq5g PXW4yB97Aduwt/3PpZqyHwXAkp25MBp3fvH8uafNSyPb4U1+KxpZObqRp3rlfnmMbDPza/r21 q/EaI7mGBw28PG81tNlUPm6U+Q1XNw+UJpxRSKEN2qAH0IF0iJQfvickHZC2wHMJE/8YYPJ+a skPo27o969GhBejMAEqpaIMeVSQosxB32Mt/EbiwMUUQ2HsfndVxYL86WN9MOKpXpPJPdoOE2 yxjtMhIJkBAY2t5D3EZBKTae7iZqW5A8na+mpFRSZDScpOJwWe4VCzQXwPb3ggmeTAzM8N7pN 2akzkAEuFp2RfshfcGfaQquHOf5N16ojZAn960hFgelujlu5MJDTPfatv14Aj24veFb2snlIX R2Nq0Vn9ga/rYmbypPd4DEJu8GfLgimx71Nr84Wabz3ViGiYnkFGNIW6bufP72qb6cXNB5tWF nWXFptET6YVuZgIH/z/Ww/yZxKM8dHBauseOWakNcEYmJK9IMfo/FW7oXn+HUNFPQQNMylWwX uDxUHZ2+dz+0ffFLW7E6bJzGgoCXPo5dx1du4uz0Qq4gZij8RfAM7gPAin5QTMdB/sBbqt5H2 zbkwFqdVRuwpSrd/d1WJWVqtLVdq2ncOAfc7Ag== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ep93xx does not have a proper pinctrl driver, but does things ad-hoc through mach/platform.h, which is also used for setting up the boards. To avoid using mach/*.h headers completely, let's move the interfaces into include/linux/soc/. This is far from great, but gets the job done here, without the need for a proper pinctrl driver. Signed-off-by: Arnd Bergmann --- arch/arm/mach-ep93xx/clock.c | 1 + arch/arm/mach-ep93xx/core.c | 2 ++ arch/arm/mach-ep93xx/include/mach/platform.h | 16 --------- drivers/ata/pata_ep93xx.c | 2 +- drivers/input/keyboard/ep93xx_keypad.c | 3 +- drivers/pwm/pwm-ep93xx.c | 2 +- include/linux/soc/cirrus/ep93xx.h | 37 ++++++++++++++++++++ sound/soc/cirrus/edb93xx.c | 2 +- sound/soc/cirrus/ep93xx-ac97.c | 1 + sound/soc/cirrus/ep93xx-i2s.c | 3 +- sound/soc/cirrus/simone.c | 2 +- sound/soc/cirrus/snappercl15.c | 2 +- 12 files changed, 48 insertions(+), 25 deletions(-) create mode 100644 include/linux/soc/cirrus/ep93xx.h diff --git a/arch/arm/mach-ep93xx/clock.c b/arch/arm/mach-ep93xx/clock.c index d2eee707d27f..9f43362eb62d 100644 --- a/arch/arm/mach-ep93xx/clock.c +++ b/arch/arm/mach-ep93xx/clock.c @@ -20,6 +20,7 @@ #include #include #include +#include #include diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c index 706515faee06..3d245668846d 100644 --- a/arch/arm/mach-ep93xx/core.c +++ b/arch/arm/mach-ep93xx/core.c @@ -43,6 +43,8 @@ #include #include #include +#include + #include #include diff --git a/arch/arm/mach-ep93xx/include/mach/platform.h b/arch/arm/mach-ep93xx/include/mach/platform.h index 43446f33c2be..b4045a186239 100644 --- a/arch/arm/mach-ep93xx/include/mach/platform.h +++ b/arch/arm/mach-ep93xx/include/mach/platform.h @@ -19,14 +19,6 @@ struct ep93xx_spi_info; void ep93xx_map_io(void); void ep93xx_init_irq(void); -#define EP93XX_CHIP_REV_D0 3 -#define EP93XX_CHIP_REV_D1 4 -#define EP93XX_CHIP_REV_E0 5 -#define EP93XX_CHIP_REV_E1 6 -#define EP93XX_CHIP_REV_E2 7 - -unsigned int ep93xx_chip_revision(void); - void ep93xx_register_flash(unsigned int width, resource_size_t start, resource_size_t size); @@ -36,19 +28,11 @@ void ep93xx_register_spi(struct ep93xx_spi_info *info, struct spi_board_info *devices, int num); void ep93xx_register_fb(struct ep93xxfb_mach_info *data); void ep93xx_register_pwm(int pwm0, int pwm1); -int ep93xx_pwm_acquire_gpio(struct platform_device *pdev); -void ep93xx_pwm_release_gpio(struct platform_device *pdev); void ep93xx_register_keypad(struct ep93xx_keypad_platform_data *data); -int ep93xx_keypad_acquire_gpio(struct platform_device *pdev); -void ep93xx_keypad_release_gpio(struct platform_device *pdev); void ep93xx_register_i2s(void); -int ep93xx_i2s_acquire(void); -void ep93xx_i2s_release(void); void ep93xx_register_ac97(void); void ep93xx_register_ide(void); void ep93xx_register_adc(void); -int ep93xx_ide_acquire_gpio(struct platform_device *pdev); -void ep93xx_ide_release_gpio(struct platform_device *pdev); struct device *ep93xx_init_devices(void); extern void ep93xx_timer_init(void); diff --git a/drivers/ata/pata_ep93xx.c b/drivers/ata/pata_ep93xx.c index cc6d06c1b2c7..db271b705529 100644 --- a/drivers/ata/pata_ep93xx.c +++ b/drivers/ata/pata_ep93xx.c @@ -44,7 +44,7 @@ #include #include -#include +#include #define DRV_NAME "ep93xx-ide" #define DRV_VERSION "1.0" diff --git a/drivers/input/keyboard/ep93xx_keypad.c b/drivers/input/keyboard/ep93xx_keypad.c index 71472f6257c0..575dac52f7b4 100644 --- a/drivers/input/keyboard/ep93xx_keypad.c +++ b/drivers/input/keyboard/ep93xx_keypad.c @@ -27,8 +27,7 @@ #include #include #include - -#include +#include #include /* diff --git a/drivers/pwm/pwm-ep93xx.c b/drivers/pwm/pwm-ep93xx.c index bbf10ae02f0e..fa168581e6b8 100644 --- a/drivers/pwm/pwm-ep93xx.c +++ b/drivers/pwm/pwm-ep93xx.c @@ -35,7 +35,7 @@ #include -#include /* for ep93xx_pwm_{acquire,release}_gpio() */ +#include /* for ep93xx_pwm_{acquire,release}_gpio() */ #define EP93XX_PWMx_TERM_COUNT 0x00 #define EP93XX_PWMx_DUTY_CYCLE 0x04 diff --git a/include/linux/soc/cirrus/ep93xx.h b/include/linux/soc/cirrus/ep93xx.h new file mode 100644 index 000000000000..56fbe2dc59b1 --- /dev/null +++ b/include/linux/soc/cirrus/ep93xx.h @@ -0,0 +1,37 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _SOC_EP93XX_H +#define _SOC_EP93XX_H + +struct platform_device; + +#define EP93XX_CHIP_REV_D0 3 +#define EP93XX_CHIP_REV_D1 4 +#define EP93XX_CHIP_REV_E0 5 +#define EP93XX_CHIP_REV_E1 6 +#define EP93XX_CHIP_REV_E2 7 + +#ifdef CONFIG_ARCH_EP93XX +int ep93xx_pwm_acquire_gpio(struct platform_device *pdev); +void ep93xx_pwm_release_gpio(struct platform_device *pdev); +int ep93xx_ide_acquire_gpio(struct platform_device *pdev); +void ep93xx_ide_release_gpio(struct platform_device *pdev); +int ep93xx_keypad_acquire_gpio(struct platform_device *pdev); +void ep93xx_keypad_release_gpio(struct platform_device *pdev); +int ep93xx_i2s_acquire(void); +void ep93xx_i2s_release(void); +unsigned int ep93xx_chip_revision(void); + +#else +static inline int ep93xx_pwm_acquire_gpio(struct platform_device *pdev) { return 0; } +static inline void ep93xx_pwm_release_gpio(struct platform_device *pdev) {} +static inline int ep93xx_ide_acquire_gpio(struct platform_device *pdev) { return 0; } +static inline void ep93xx_ide_release_gpio(struct platform_device *pdev) {} +static inline int ep93xx_keypad_acquire_gpio(struct platform_device *pdev) { return 0; } +static inline void ep93xx_keypad_release_gpio(struct platform_device *pdev) {} +static inline int ep93xx_i2s_acquire(void) { return 0; } +static inline void ep93xx_i2s_release(void) {} +static inline unsigned int ep93xx_chip_revision(void) { return 0; } + +#endif + +#endif diff --git a/sound/soc/cirrus/edb93xx.c b/sound/soc/cirrus/edb93xx.c index 3d011abaa266..f678b4c1514a 100644 --- a/sound/soc/cirrus/edb93xx.c +++ b/sound/soc/cirrus/edb93xx.c @@ -22,11 +22,11 @@ #include #include #include +#include #include #include #include #include -#include static int edb93xx_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) diff --git a/sound/soc/cirrus/ep93xx-ac97.c b/sound/soc/cirrus/ep93xx-ac97.c index cd5a939ad608..c6bc447429af 100644 --- a/sound/soc/cirrus/ep93xx-ac97.c +++ b/sound/soc/cirrus/ep93xx-ac97.c @@ -24,6 +24,7 @@ #include #include +#include #include "ep93xx-pcm.h" diff --git a/sound/soc/cirrus/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c index 0918c5da575a..beab7c516855 100644 --- a/sound/soc/cirrus/ep93xx-i2s.c +++ b/sound/soc/cirrus/ep93xx-i2s.c @@ -27,9 +27,8 @@ #include #include -#include -#include #include +#include #include "ep93xx-pcm.h" diff --git a/sound/soc/cirrus/simone.c b/sound/soc/cirrus/simone.c index 1ec661834e5a..cb850530331b 100644 --- a/sound/soc/cirrus/simone.c +++ b/sound/soc/cirrus/simone.c @@ -13,13 +13,13 @@ #include #include #include +#include #include #include #include #include -#include static struct snd_soc_dai_link simone_dai = { .name = "AC97", diff --git a/sound/soc/cirrus/snappercl15.c b/sound/soc/cirrus/snappercl15.c index 11ff7b2672b2..dea4909154c8 100644 --- a/sound/soc/cirrus/snappercl15.c +++ b/sound/soc/cirrus/snappercl15.c @@ -13,12 +13,12 @@ #include #include +#include #include #include #include #include -#include #include "../codecs/tlv320aic23.h" -- 2.20.0