40e71e7015
These are 18 branches on 9 platforms with board specific changes, mostly for defconfig files, but nothing really exciting in here. Since the shmobile platform still uses board files for some of the newer machines, we get a few changes there as the result of drivers getting enabled for those boards. This causes some conflicts with contents getting added from multiple branches in sh-mobile specific files. Renesas is putting a lot of work into migrating to device-tree based setup, which will make all those files obsolete in the future and avoid both the conflicts and the need to have these files in the first place. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIVAwUAUdLnmmCrR//JCVInAQKNuxAAxXpBslUGRpI8O28KHA3EeL+9HR5wBoKo K6q6fQlAv9dcGJOx7fkyHU4UfE1kV+M6l4R9BM8VcjflQjCnG4GrQo8qgJNY14nf OpQKSIHEtdBHzFpHEIxogByR1i05hL8nrm21TElgi/aYlDwKbXnApY23ubApPif4 oXmES9ppXvnz1D7bCE7PaZf+TIgufpPFkioQYcV93nD0x5tYu1mZn2xSfYDekAyU mUe1p2oX+77U0lohVQCo1H/ZOJBdoAN1U//2QCiL8YKJitQf/vOVs3QtHEUywIiU CyUaDhfM7sX4QKBWzwjxoVOcT6QC/qhaaqaases0gjgjepKaSqUTZMBdLI7oyF3o 2ExYv8BMGilbIyNUYoxeoqz9zA3IQ7wDxaBh3G1JY9k0/BhKmsEwtGYkSJPdOgpt XyX7N/xKzy0lTWf1N4eSWUiccfXdVjLFf3Jp2xA7e/KJfzFAF/RJXdGiV2Kzdr7m mZ7ESYRk+S3ENgpI/QI4C6kQ7EBynQjhn5t2+iK9k4gKNspNZ3TjLCQif0v0xE3H IIsaSqLBuj9IZ1r13fpQJZIyTr+dHsx2s6QQBFXYzeQ/cjfSRGZP4FmYyweGctfR Hh1AAshrOAwNl4ZdXgIT08JKtBocaGFUtt4syvPfAFYoojMN58xg5EG4FYtKpKHp xU6w43o6KnQ= =7bgc -----END PGP SIGNATURE----- Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC board specific changes from Arnd Bergmann: "These are 18 branches on 9 platforms with board specific changes, mostly for defconfig files, but nothing really exciting in here. Since the shmobile platform still uses board files for some of the newer machines, we get a few changes there as the result of drivers getting enabled for those boards. This causes some conflicts with contents getting added from multiple branches in sh-mobile specific files. Renesas is putting a lot of work into migrating to device-tree based setup, which will make all those files obsolete in the future and avoid both the conflicts and the need to have these files in the first place." * tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (49 commits) arm: multi_v7_defconfig: Enable initrd/initramfs support arm: multi_v7_defconfig: Enable Zynq UART driver ARM: omap2plus_defconfig: enable USB_PHY and NOP_USB_XCEIV ARM: OMAP1: nokia770: enable Tahvo ARM: OMAP3EVM: Marking omap3_evm_display_init() with CONFIG_BROKEN arm: omap: board-overo: reset GPIO for SMSC911x ARM: shmobile: BOCK-W: change Ether device name ARM: ux500: board-mop500: remove unused pin modes ARM: shmobile: bockw: add MMCIF support ARM: shmobile: bockw: add SPI FLASH support ARM: shmobile: bockw: add I2C device support ARM: shmobile: BOCK-W: add Ether support ARM: tegra: defconfig updates ARM: shmobile: bockw defconfig: add MMCIF support ARM: shmobile: bockw defconfig: add M25P80 support ARM: shmobile: bockw defconfig: add RTC RX8581 support ARM: shmobile: marzen: keep local function as static ARM: shmobile: bockw: add SDHI0 support ARM: shmobile: marzen: Use INTC External IRQ pin driver for SMSC ARM: shmobile: lager: support GPIO switches ...
189 lines
4.5 KiB
C
189 lines
4.5 KiB
C
/*
|
|
* arch/arm/mach-kirkwood/common.h
|
|
*
|
|
* Core functions for Marvell Kirkwood SoCs
|
|
*
|
|
* This file is licensed under the terms of the GNU General Public
|
|
* License version 2. This program is licensed "as is" without any
|
|
* warranty of any kind, whether express or implied.
|
|
*/
|
|
|
|
#ifndef __ARCH_KIRKWOOD_COMMON_H
|
|
#define __ARCH_KIRKWOOD_COMMON_H
|
|
|
|
struct dsa_platform_data;
|
|
struct mv643xx_eth_platform_data;
|
|
struct mv_sata_platform_data;
|
|
struct mvsdio_platform_data;
|
|
struct mtd_partition;
|
|
struct mtd_info;
|
|
struct kirkwood_asoc_platform_data;
|
|
|
|
#define KW_PCIE0 (1 << 0)
|
|
#define KW_PCIE1 (1 << 1)
|
|
|
|
/*
|
|
* Basic Kirkwood init functions used early by machine-setup.
|
|
*/
|
|
void kirkwood_map_io(void);
|
|
void kirkwood_init(void);
|
|
void kirkwood_init_early(void);
|
|
void kirkwood_init_irq(void);
|
|
|
|
void kirkwood_setup_wins(void);
|
|
|
|
void kirkwood_enable_pcie(void);
|
|
void kirkwood_pcie_id(u32 *dev, u32 *rev);
|
|
|
|
void kirkwood_ehci_init(void);
|
|
void kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data);
|
|
void kirkwood_ge01_init(struct mv643xx_eth_platform_data *eth_data);
|
|
void kirkwood_ge00_switch_init(struct dsa_platform_data *d, int irq);
|
|
void kirkwood_pcie_init(unsigned int portmask);
|
|
void kirkwood_sata_init(struct mv_sata_platform_data *sata_data);
|
|
void kirkwood_sdio_init(struct mvsdio_platform_data *mvsdio_data);
|
|
void kirkwood_spi_init(void);
|
|
void kirkwood_i2c_init(void);
|
|
void kirkwood_uart0_init(void);
|
|
void kirkwood_uart1_init(void);
|
|
void kirkwood_nand_init(struct mtd_partition *parts, int nr_parts, int delay);
|
|
void kirkwood_nand_init_rnb(struct mtd_partition *parts, int nr_parts,
|
|
int (*dev_ready)(struct mtd_info *));
|
|
void kirkwood_audio_init(void);
|
|
void kirkwood_cpuidle_init(void);
|
|
void kirkwood_cpufreq_init(void);
|
|
|
|
void kirkwood_restart(char, const char *);
|
|
void kirkwood_clk_init(void);
|
|
|
|
/* board init functions for boards not fully converted to fdt */
|
|
#ifdef CONFIG_MACH_DREAMPLUG_DT
|
|
void dreamplug_init(void);
|
|
#else
|
|
static inline void dreamplug_init(void) {};
|
|
#endif
|
|
#ifdef CONFIG_MACH_GURUPLUG_DT
|
|
void guruplug_dt_init(void);
|
|
#else
|
|
static inline void guruplug_dt_init(void) {};
|
|
#endif
|
|
#ifdef CONFIG_MACH_SHEEVAPLUG_DT
|
|
void sheevaplug_dt_init(void);
|
|
#else
|
|
static inline void sheevaplug_dt_init(void) {};
|
|
#endif
|
|
#ifdef CONFIG_MACH_TS219_DT
|
|
void qnap_dt_ts219_init(void);
|
|
#else
|
|
static inline void qnap_dt_ts219_init(void) {};
|
|
#endif
|
|
|
|
#ifdef CONFIG_MACH_DLINK_KIRKWOOD_DT
|
|
void dnskw_init(void);
|
|
#else
|
|
static inline void dnskw_init(void) {};
|
|
#endif
|
|
|
|
#ifdef CONFIG_MACH_ICONNECT_DT
|
|
void iconnect_init(void);
|
|
#else
|
|
static inline void iconnect_init(void) {};
|
|
#endif
|
|
|
|
#ifdef CONFIG_MACH_IB62X0_DT
|
|
void ib62x0_init(void);
|
|
#else
|
|
static inline void ib62x0_init(void) {};
|
|
#endif
|
|
|
|
#ifdef CONFIG_MACH_DOCKSTAR_DT
|
|
void dockstar_dt_init(void);
|
|
#else
|
|
static inline void dockstar_dt_init(void) {};
|
|
#endif
|
|
|
|
#ifdef CONFIG_MACH_GOFLEXNET_DT
|
|
void goflexnet_init(void);
|
|
#else
|
|
static inline void goflexnet_init(void) {};
|
|
#endif
|
|
|
|
#ifdef CONFIG_MACH_LSXL_DT
|
|
void lsxl_init(void);
|
|
#else
|
|
static inline void lsxl_init(void) {};
|
|
#endif
|
|
|
|
#ifdef CONFIG_MACH_IOMEGA_IX2_200_DT
|
|
void iomega_ix2_200_init(void);
|
|
#else
|
|
static inline void iomega_ix2_200_init(void) {};
|
|
#endif
|
|
|
|
#ifdef CONFIG_MACH_KM_KIRKWOOD_DT
|
|
void km_kirkwood_init(void);
|
|
#else
|
|
static inline void km_kirkwood_init(void) {};
|
|
#endif
|
|
|
|
#ifdef CONFIG_MACH_DB88F628X_BP_DT
|
|
void db88f628x_init(void);
|
|
#else
|
|
static inline void db88f628x_init(void) {};
|
|
#endif
|
|
|
|
#ifdef CONFIG_MACH_MPLCEC4_DT
|
|
void mplcec4_init(void);
|
|
#else
|
|
static inline void mplcec4_init(void) {};
|
|
#endif
|
|
|
|
#if defined(CONFIG_MACH_INETSPACE_V2_DT) || \
|
|
defined(CONFIG_MACH_NETSPACE_V2_DT) || \
|
|
defined(CONFIG_MACH_NETSPACE_MAX_V2_DT) || \
|
|
defined(CONFIG_MACH_NETSPACE_LITE_V2_DT) || \
|
|
defined(CONFIG_MACH_NETSPACE_MINI_V2_DT)
|
|
void ns2_init(void);
|
|
#else
|
|
static inline void ns2_init(void) {};
|
|
#endif
|
|
|
|
#ifdef CONFIG_MACH_OPENBLOCKS_A6_DT
|
|
void openblocks_a6_init(void);
|
|
#else
|
|
static inline void openblocks_a6_init(void) {};
|
|
#endif
|
|
|
|
#ifdef CONFIG_MACH_READYNAS_DT
|
|
void netgear_readynas_init(void);
|
|
#else
|
|
static inline void netgear_readynas_init(void) {};
|
|
#endif
|
|
|
|
#ifdef CONFIG_MACH_TOPKICK_DT
|
|
void usi_topkick_init(void);
|
|
#else
|
|
static inline void usi_topkick_init(void) {};
|
|
#endif
|
|
|
|
#ifdef CONFIG_MACH_CLOUDBOX_DT
|
|
void cloudbox_init(void);
|
|
#else
|
|
static inline void cloudbox_init(void) {};
|
|
#endif
|
|
|
|
/* early init functions not converted to fdt yet */
|
|
char *kirkwood_id(void);
|
|
void kirkwood_l2_init(void);
|
|
void kirkwood_wdt_init(void);
|
|
void kirkwood_xor0_init(void);
|
|
void kirkwood_xor1_init(void);
|
|
void kirkwood_crypto_init(void);
|
|
|
|
extern int kirkwood_tclk;
|
|
extern void kirkwood_timer_init(void);
|
|
|
|
#define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x)
|
|
|
|
#endif
|