Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM soc multiplatform enablement from Olof Johansson:
"This is a pretty significant branch. It's the introduction of the
first multiplatform support on ARM, and with this (and the later
branch) merged, it is now possible to build one kernel that contains
support for highbank, vexpress, mvebu, socfpga, and picoxcell. More
platforms will be convered over in the next few releases.
Two critical last things had to be done for this to be practical and
possible:
* Today each platform has its own include directory under
mach-<mach>/include/mach/*, and traditionally that is where a lot
of driver/platform shared definitions have gone, such as platform
data structures. They now need to move out to a common location
instead, and this branch moves a large number of those out to
include/linux/platform_data.
* Each platform used to list the device trees to compile for its
boards in mach-<mach>/Makefile.boot.
Both of the above changes will mean that there are some merge
conflicts to come (and some to resolve here). It's a one-time move
and once it settles in, we should be good for quite a while. Sorry
for the overhead."
Fix conflicts as per Olof.
* tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (51 commits)
ARM: add v7 multi-platform defconfig
ARM: msm: Move core.h contents into common.h
ARM: highbank: call highbank_pm_init from .init_machine
ARM: dtb: move all dtb targets to common Makefile
ARM: spear: move platform_data definitions
ARM: samsung: move platform_data definitions
ARM: orion: move platform_data definitions
ARM: vexpress: convert to multi-platform
ARM: initial multiplatform support
ARM: mvebu: move armada-370-xp.h in mach dir
ARM: vexpress: remove dependency on mach/* headers
ARM: picoxcell: remove dependency on mach/* headers
ARM: move all dtb targets out of Makefile.boot
ARM: picoxcell: move debug macros to include/debug
ARM: socfpga: move debug macros to include/debug
ARM: mvebu: move debug macros to include/debug
ARM: vexpress: move debug macros to include/debug
ARM: highbank: move debug macros to include/debug
ARM: move debug macros to common location
ARM: make mach/gpio.h headers optional
...
This commit is contained in:
Linus Torvalds
@@ -1,93 +0,0 @@
|
||||
#ifndef __ASM_ARCH_DMA_H
|
||||
#define __ASM_ARCH_DMA_H
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/dmaengine.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
|
||||
/*
|
||||
* M2P channels.
|
||||
*
|
||||
* Note that these values are also directly used for setting the PPALLOC
|
||||
* register.
|
||||
*/
|
||||
#define EP93XX_DMA_I2S1 0
|
||||
#define EP93XX_DMA_I2S2 1
|
||||
#define EP93XX_DMA_AAC1 2
|
||||
#define EP93XX_DMA_AAC2 3
|
||||
#define EP93XX_DMA_AAC3 4
|
||||
#define EP93XX_DMA_I2S3 5
|
||||
#define EP93XX_DMA_UART1 6
|
||||
#define EP93XX_DMA_UART2 7
|
||||
#define EP93XX_DMA_UART3 8
|
||||
#define EP93XX_DMA_IRDA 9
|
||||
/* M2M channels */
|
||||
#define EP93XX_DMA_SSP 10
|
||||
#define EP93XX_DMA_IDE 11
|
||||
|
||||
/**
|
||||
* struct ep93xx_dma_data - configuration data for the EP93xx dmaengine
|
||||
* @port: peripheral which is requesting the channel
|
||||
* @direction: TX/RX channel
|
||||
* @name: optional name for the channel, this is displayed in /proc/interrupts
|
||||
*
|
||||
* This information is passed as private channel parameter in a filter
|
||||
* function. Note that this is only needed for slave/cyclic channels. For
|
||||
* memcpy channels %NULL data should be passed.
|
||||
*/
|
||||
struct ep93xx_dma_data {
|
||||
int port;
|
||||
enum dma_transfer_direction direction;
|
||||
const char *name;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct ep93xx_dma_chan_data - platform specific data for a DMA channel
|
||||
* @name: name of the channel, used for getting the right clock for the channel
|
||||
* @base: mapped registers
|
||||
* @irq: interrupt number used by this channel
|
||||
*/
|
||||
struct ep93xx_dma_chan_data {
|
||||
const char *name;
|
||||
void __iomem *base;
|
||||
int irq;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct ep93xx_dma_platform_data - platform data for the dmaengine driver
|
||||
* @channels: array of channels which are passed to the driver
|
||||
* @num_channels: number of channels in the array
|
||||
*
|
||||
* This structure is passed to the DMA engine driver via platform data. For
|
||||
* M2P channels, contract is that even channels are for TX and odd for RX.
|
||||
* There is no requirement for the M2M channels.
|
||||
*/
|
||||
struct ep93xx_dma_platform_data {
|
||||
struct ep93xx_dma_chan_data *channels;
|
||||
size_t num_channels;
|
||||
};
|
||||
|
||||
static inline bool ep93xx_dma_chan_is_m2p(struct dma_chan *chan)
|
||||
{
|
||||
return !strcmp(dev_name(chan->device->dev), "ep93xx-dma-m2p");
|
||||
}
|
||||
|
||||
/**
|
||||
* ep93xx_dma_chan_direction - returns direction the channel can be used
|
||||
* @chan: channel
|
||||
*
|
||||
* This function can be used in filter functions to find out whether the
|
||||
* channel supports given DMA direction. Only M2P channels have such
|
||||
* limitation, for M2M channels the direction is configurable.
|
||||
*/
|
||||
static inline enum dma_transfer_direction
|
||||
ep93xx_dma_chan_direction(struct dma_chan *chan)
|
||||
{
|
||||
if (!ep93xx_dma_chan_is_m2p(chan))
|
||||
return DMA_NONE;
|
||||
|
||||
/* even channels are for TX, odd for RX */
|
||||
return (chan->chan_id % 2 == 0) ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM;
|
||||
}
|
||||
|
||||
#endif /* __ASM_ARCH_DMA_H */
|
||||
@@ -1,35 +0,0 @@
|
||||
/*
|
||||
* arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h
|
||||
*/
|
||||
|
||||
#ifndef __ASM_ARCH_EP93XX_KEYPAD_H
|
||||
#define __ASM_ARCH_EP93XX_KEYPAD_H
|
||||
|
||||
struct matrix_keymap_data;
|
||||
|
||||
/* flags for the ep93xx_keypad driver */
|
||||
#define EP93XX_KEYPAD_DISABLE_3_KEY (1<<0) /* disable 3-key reset */
|
||||
#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 */
|
||||
|
||||
/**
|
||||
* struct ep93xx_keypad_platform_data - platform specific device structure
|
||||
* @keymap_data: pointer to &matrix_keymap_data
|
||||
* @debounce: debounce start count; terminal count is 0xff
|
||||
* @prescale: row/column counter pre-scaler load value
|
||||
* @flags: see above
|
||||
*/
|
||||
struct ep93xx_keypad_platform_data {
|
||||
struct matrix_keymap_data *keymap_data;
|
||||
unsigned int debounce;
|
||||
unsigned int prescale;
|
||||
unsigned int flags;
|
||||
};
|
||||
|
||||
#define EP93XX_MATRIX_ROWS (8)
|
||||
#define EP93XX_MATRIX_COLS (8)
|
||||
|
||||
#endif /* __ASM_ARCH_EP93XX_KEYPAD_H */
|
||||
@@ -1,29 +0,0 @@
|
||||
#ifndef __ASM_MACH_EP93XX_SPI_H
|
||||
#define __ASM_MACH_EP93XX_SPI_H
|
||||
|
||||
struct spi_device;
|
||||
|
||||
/**
|
||||
* struct ep93xx_spi_info - EP93xx specific SPI descriptor
|
||||
* @num_chipselect: number of chip selects on this board, must be
|
||||
* at least one
|
||||
* @use_dma: use DMA for the transfers
|
||||
*/
|
||||
struct ep93xx_spi_info {
|
||||
int num_chipselect;
|
||||
bool use_dma;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct ep93xx_spi_chip_ops - operation callbacks for SPI slave device
|
||||
* @setup: setup the chip select mechanism
|
||||
* @cleanup: cleanup the chip select mechanism
|
||||
* @cs_control: control the device chip select
|
||||
*/
|
||||
struct ep93xx_spi_chip_ops {
|
||||
int (*setup)(struct spi_device *spi);
|
||||
void (*cleanup)(struct spi_device *spi);
|
||||
void (*cs_control)(struct spi_device *spi, int value);
|
||||
};
|
||||
|
||||
#endif /* __ASM_MACH_EP93XX_SPI_H */
|
||||
@@ -1,56 +0,0 @@
|
||||
/*
|
||||
* arch/arm/mach-ep93xx/include/mach/fb.h
|
||||
*/
|
||||
|
||||
#ifndef __ASM_ARCH_EP93XXFB_H
|
||||
#define __ASM_ARCH_EP93XXFB_H
|
||||
|
||||
struct platform_device;
|
||||
struct fb_videomode;
|
||||
struct fb_info;
|
||||
|
||||
#define EP93XXFB_USE_MODEDB 0
|
||||
|
||||
/* VideoAttributes flags */
|
||||
#define EP93XXFB_STATE_MACHINE_ENABLE (1 << 0)
|
||||
#define EP93XXFB_PIXEL_CLOCK_ENABLE (1 << 1)
|
||||
#define EP93XXFB_VSYNC_ENABLE (1 << 2)
|
||||
#define EP93XXFB_PIXEL_DATA_ENABLE (1 << 3)
|
||||
#define EP93XXFB_COMPOSITE_SYNC (1 << 4)
|
||||
#define EP93XXFB_SYNC_VERT_HIGH (1 << 5)
|
||||
#define EP93XXFB_SYNC_HORIZ_HIGH (1 << 6)
|
||||
#define EP93XXFB_SYNC_BLANK_HIGH (1 << 7)
|
||||
#define EP93XXFB_PCLK_FALLING (1 << 8)
|
||||
#define EP93XXFB_ENABLE_AC (1 << 9)
|
||||
#define EP93XXFB_ENABLE_LCD (1 << 10)
|
||||
#define EP93XXFB_ENABLE_CCIR (1 << 12)
|
||||
#define EP93XXFB_USE_PARALLEL_INTERFACE (1 << 13)
|
||||
#define EP93XXFB_ENABLE_INTERRUPT (1 << 14)
|
||||
#define EP93XXFB_USB_INTERLACE (1 << 16)
|
||||
#define EP93XXFB_USE_EQUALIZATION (1 << 17)
|
||||
#define EP93XXFB_USE_DOUBLE_HORZ (1 << 18)
|
||||
#define EP93XXFB_USE_DOUBLE_VERT (1 << 19)
|
||||
#define EP93XXFB_USE_BLANK_PIXEL (1 << 20)
|
||||
#define EP93XXFB_USE_SDCSN0 (0 << 21)
|
||||
#define EP93XXFB_USE_SDCSN1 (1 << 21)
|
||||
#define EP93XXFB_USE_SDCSN2 (2 << 21)
|
||||
#define EP93XXFB_USE_SDCSN3 (3 << 21)
|
||||
|
||||
#define EP93XXFB_ENABLE (EP93XXFB_STATE_MACHINE_ENABLE | \
|
||||
EP93XXFB_PIXEL_CLOCK_ENABLE | \
|
||||
EP93XXFB_VSYNC_ENABLE | \
|
||||
EP93XXFB_PIXEL_DATA_ENABLE)
|
||||
|
||||
struct ep93xxfb_mach_info {
|
||||
unsigned int num_modes;
|
||||
const struct fb_videomode *modes;
|
||||
const struct fb_videomode *default_mode;
|
||||
int bpp;
|
||||
unsigned int flags;
|
||||
|
||||
int (*setup)(struct platform_device *pdev);
|
||||
void (*teardown)(struct platform_device *pdev);
|
||||
void (*blank)(int blank_mode, struct fb_info *info);
|
||||
};
|
||||
|
||||
#endif /* __ASM_ARCH_EP93XXFB_H */
|
||||
@@ -1 +0,0 @@
|
||||
/* empty */
|
||||
Reference in New Issue
Block a user