Commit 67e38f57 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Olof Johansson
Browse files

ARM: ep93xx: move pinctrl interfaces into include/linux/soc 



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: default avatarAlexander Sverdlin <alexander.sverdlin@gmail.com>
Acked-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent dfb6db00

arch/arm/mach-ep93xx/clock.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

arch/arm/mach-ep93xx/core.c

+2 −0
Original line number Diff line number Diff line
@@ -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>

arch/arm/mach-ep93xx/include/mach/platform.h

+0 −16
Original line number Diff line number Diff line
@@ -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);

drivers/ata/pata_ep93xx.c

+1 −1
Original line number Diff line number Diff line
@@ -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"

drivers/input/keyboard/ep93xx_keypad.c

+1 −2
Original line number Diff line number Diff line
@@ -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>



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE