| Message ID | 20190415192734.935387-3-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | None | expand |
On 15/04/2019 21:25, Arnd Bergmann wrote: > 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. Acked-by: Alexander Sverdlin <alexander.sverdlin@gmail.com> > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > 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 <linux/io.h> > #include <linux/spinlock.h> > #include <linux/clkdev.h> > +#include <linux/soc/cirrus/ep93xx.h> > > #include <mach/hardware.h> > > 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 <linux/platform_data/video-ep93xx.h> > #include <linux/platform_data/keypad-ep93xx.h> > #include <linux/platform_data/spi-ep93xx.h> > +#include <linux/soc/cirrus/ep93xx.h> > + > #include <mach/gpio-ep93xx.h> > > #include <asm/mach/arch.h> > 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 <linux/ktime.h> > > #include <linux/platform_data/dma-ep93xx.h> > -#include <mach/platform.h> > +#include <linux/soc/cirrus/ep93xx.h> > > #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 <linux/io.h> > #include <linux/input/matrix_keypad.h> > #include <linux/slab.h> > - > -#include <mach/hardware.h> > +#include <linux/soc/cirrus/ep93xx.h> > #include <linux/platform_data/keypad-ep93xx.h> > > /* > 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 <asm/div64.h> > > -#include <mach/platform.h> /* for ep93xx_pwm_{acquire,release}_gpio() */ > +#include <linux/soc/cirrus/ep93xx.h> /* 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 <linux/platform_device.h> > #include <linux/gpio.h> > #include <linux/module.h> > +#include <linux/soc/cirrus/ep93xx.h> > #include <sound/core.h> > #include <sound/pcm.h> > #include <sound/soc.h> > #include <asm/mach-types.h> > -#include <mach/hardware.h> > > 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 <sound/soc.h> > > #include <linux/platform_data/dma-ep93xx.h> > +#include <linux/soc/cirrus/ep93xx.h> > > #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 <sound/initval.h> > #include <sound/soc.h> > > -#include <mach/hardware.h> > -#include <mach/ep93xx-regs.h> > #include <linux/platform_data/dma-ep93xx.h> > +#include <linux/soc/cirrus/ep93xx.h> > > #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 <linux/init.h> > #include <linux/module.h> > #include <linux/platform_device.h> > +#include <linux/soc/cirrus/ep93xx.h> > > #include <sound/core.h> > #include <sound/pcm.h> > #include <sound/soc.h> > > #include <asm/mach-types.h> > -#include <mach/hardware.h> > > 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 <linux/platform_device.h> > #include <linux/module.h> > +#include <linux/soc/cirrus/ep93xx.h> > #include <sound/core.h> > #include <sound/pcm.h> > #include <sound/soc.h> > > #include <asm/mach-types.h> > -#include <mach/hardware.h> > > #include "../codecs/tlv320aic23.h" > >
On Mon, Apr 15, 2019 at 9:30 PM Arnd Bergmann <arnd@arndb.de> wrote: > 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 <arnd@arndb.de> Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
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 <linux/io.h> #include <linux/spinlock.h> #include <linux/clkdev.h> +#include <linux/soc/cirrus/ep93xx.h> #include <mach/hardware.h> 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 <linux/platform_data/video-ep93xx.h> #include <linux/platform_data/keypad-ep93xx.h> #include <linux/platform_data/spi-ep93xx.h> +#include <linux/soc/cirrus/ep93xx.h> + #include <mach/gpio-ep93xx.h> #include <asm/mach/arch.h> 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 <linux/ktime.h> #include <linux/platform_data/dma-ep93xx.h> -#include <mach/platform.h> +#include <linux/soc/cirrus/ep93xx.h> #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 <linux/io.h> #include <linux/input/matrix_keypad.h> #include <linux/slab.h> - -#include <mach/hardware.h> +#include <linux/soc/cirrus/ep93xx.h> #include <linux/platform_data/keypad-ep93xx.h> /* 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 <asm/div64.h> -#include <mach/platform.h> /* for ep93xx_pwm_{acquire,release}_gpio() */ +#include <linux/soc/cirrus/ep93xx.h> /* 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 <linux/platform_device.h> #include <linux/gpio.h> #include <linux/module.h> +#include <linux/soc/cirrus/ep93xx.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/soc.h> #include <asm/mach-types.h> -#include <mach/hardware.h> 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 <sound/soc.h> #include <linux/platform_data/dma-ep93xx.h> +#include <linux/soc/cirrus/ep93xx.h> #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 <sound/initval.h> #include <sound/soc.h> -#include <mach/hardware.h> -#include <mach/ep93xx-regs.h> #include <linux/platform_data/dma-ep93xx.h> +#include <linux/soc/cirrus/ep93xx.h> #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 <linux/init.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/soc/cirrus/ep93xx.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/soc.h> #include <asm/mach-types.h> -#include <mach/hardware.h> 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 <linux/platform_device.h> #include <linux/module.h> +#include <linux/soc/cirrus/ep93xx.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/soc.h> #include <asm/mach-types.h> -#include <mach/hardware.h> #include "../codecs/tlv320aic23.h"
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 <arnd@arndb.de> --- 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