mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-20 09:31:09 +00:00
8287361abc
This is a collection of header file cleanups, mostly for OMAP and AT91, that keeps moving the platforms in the direction of multiplatform by removing the need for mach-dependent header files used in drivers and other places. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQx2reAAoJEIwa5zzehBx3Z/oQAIHp8aXbUD0GvbBPQ2vIydZ8 Qfdh2ypbyFB9GSLmPP6BhurEFUcwmW3MH2r9Kq68omPt4XxrFEt1SdEn3TgZlhTY YYzEv2DLbWfmKCDBFAEFullsfVkrpggyou5ty30YVp/u2lVLvChpkciE5/9HADy5 uoh/W2KZcLE51tvnbRy/1DBaOtxEdCjJ9hTaef7FCB9ugOG+yMDYwIPRW/b4fNA6 o/1NuZTWp0H4ePRG2oqLxYnjSiF63DVTJZjSJ+c5gW34bWgh8+/xzaLFA9U++/ig meGUD1Oe65+ctr+Wk2mV29eb02jauUe6qvkwt+iFIDDopgc2mn5BcW+ENpgpjhe3 6l3ClRd94qh4cMWzqDa5PZCdetshiKqSH2IGpKS/dHNB1h5sBP7CCbvbalwzWd5n qjfkPC7kSFyU3XV+9SEAXE6HLKsiMQy9kRcKOMdTE5BA4FEAZk0wfiG9WcVCvS2D 9tDC3X0aScyXx4Mkd4wIAZVhY68QuI17fPft9zZSj691YiUW5cR2yF1qbCka0yd5 pHu/QSZg1+dUitMUvMPQmWJ15jnAtEYUtV/8zQFFVchgkxlrW+UtvW3zxghB6D+J ZwcjAMfQQz9fLoMQXlVovjQIhYsjw3SlV62ReBH7eyPs3+KfPIBn7Ks6mVQs3dS5 AMUWORsB5u92XHl9EL9C =aggA -----END PGP SIGNATURE----- Merge tag 'headers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC Header cleanups from Olof Johansson: "This is a collection of header file cleanups, mostly for OMAP and AT91, that keeps moving the platforms in the direction of multiplatform by removing the need for mach-dependent header files used in drivers and other places." Fix up mostly trivial conflicts as per Olof. * tag 'headers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (106 commits) ARM: OMAP2+: Move iommu/iovmm headers to platform_data ARM: OMAP2+: Make some definitions local ARM: OMAP2+: Move iommu2 to drivers/iommu/omap-iommu2.c ARM: OMAP2+: Move plat/iovmm.h to include/linux/omap-iommu.h ARM: OMAP2+: Move iopgtable header to drivers/iommu/ ARM: OMAP: Merge iommu2.h into iommu.h atmel: move ATMEL_MAX_UART to platform_data/atmel.h ARM: OMAP: Remove omap_init_consistent_dma_size() arm: at91: move at91rm9200 rtc header in drivers/rtc arm: at91: move reset controller header to arm/arm/mach-at91 arm: at91: move pit define to the driver arm: at91: move at91_shdwc.h to arch/arm/mach-at91 arm: at91: move board header to arch/arm/mach-at91 arn: at91: move at91_tc.h to arch/arm/mach-at91 arm: at91 move at91_aic.h to arch/arm/mach-at91 arm: at91 move board.h to arch/arm/mach-at91 arm: at91: move platfarm_data to include/linux/platform_data/atmel.h arm: at91: drop machine defconfig ARM: OMAP: Remove NEED_MACH_GPIO_H ARM: OMAP: Remove unnecessary mach and plat includes ...
131 lines
4.1 KiB
C
131 lines
4.1 KiB
C
/*
|
|
* arch/arm/mach-at91/include/mach/board.h
|
|
*
|
|
* Copyright (C) 2005 HP Labs
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
/*
|
|
* These are data structures found in platform_device.dev.platform_data,
|
|
* and describing board-specific data needed by drivers. For example,
|
|
* which pin is used for a given GPIO role.
|
|
*
|
|
* In 2.6, drivers should strongly avoid board-specific knowledge so
|
|
* that supporting new boards normally won't require driver patches.
|
|
* Most board-specific knowledge should be in arch/.../board-*.c files.
|
|
*/
|
|
|
|
#ifndef __ASM_ARCH_BOARD_H
|
|
#define __ASM_ARCH_BOARD_H
|
|
|
|
#include <linux/platform_data/atmel.h>
|
|
|
|
/* USB Device */
|
|
extern void __init at91_add_device_udc(struct at91_udc_data *data);
|
|
|
|
/* USB High Speed Device */
|
|
extern void __init at91_add_device_usba(struct usba_platform_data *data);
|
|
|
|
/* Compact Flash */
|
|
extern void __init at91_add_device_cf(struct at91_cf_data *data);
|
|
|
|
/* MMC / SD */
|
|
/* atmel-mci platform config */
|
|
extern void __init at91_add_device_mci(short mmc_id, struct mci_platform_data *data);
|
|
|
|
extern void __init at91_add_device_eth(struct macb_platform_data *data);
|
|
|
|
/* USB Host */
|
|
extern void __init at91_add_device_usbh(struct at91_usbh_data *data);
|
|
extern void __init at91_add_device_usbh_ohci(struct at91_usbh_data *data);
|
|
extern void __init at91_add_device_usbh_ehci(struct at91_usbh_data *data);
|
|
|
|
extern void __init at91_add_device_nand(struct atmel_nand_data *data);
|
|
|
|
/* I2C*/
|
|
#if defined(CONFIG_ARCH_AT91SAM9G45)
|
|
extern void __init at91_add_device_i2c(short i2c_id, struct i2c_board_info *devices, int nr_devices);
|
|
#else
|
|
extern void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices);
|
|
#endif
|
|
|
|
/* SPI */
|
|
extern void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices);
|
|
|
|
/* Serial */
|
|
#define ATMEL_UART_CTS 0x01
|
|
#define ATMEL_UART_RTS 0x02
|
|
#define ATMEL_UART_DSR 0x04
|
|
#define ATMEL_UART_DTR 0x08
|
|
#define ATMEL_UART_DCD 0x10
|
|
#define ATMEL_UART_RI 0x20
|
|
|
|
extern void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins);
|
|
|
|
extern struct platform_device *atmel_default_console_device;
|
|
|
|
extern void __init at91_add_device_serial(void);
|
|
|
|
/*
|
|
* PWM
|
|
*/
|
|
#define AT91_PWM0 0
|
|
#define AT91_PWM1 1
|
|
#define AT91_PWM2 2
|
|
#define AT91_PWM3 3
|
|
|
|
extern void __init at91_add_device_pwm(u32 mask);
|
|
|
|
/*
|
|
* SSC -- accessed through ssc_request(id). Drivers don't bind to SSC
|
|
* platform devices. Their SSC ID is part of their configuration data,
|
|
* along with information about which SSC signals they should use.
|
|
*/
|
|
#define ATMEL_SSC_TK 0x01
|
|
#define ATMEL_SSC_TF 0x02
|
|
#define ATMEL_SSC_TD 0x04
|
|
#define ATMEL_SSC_TX (ATMEL_SSC_TK | ATMEL_SSC_TF | ATMEL_SSC_TD)
|
|
|
|
#define ATMEL_SSC_RK 0x10
|
|
#define ATMEL_SSC_RF 0x20
|
|
#define ATMEL_SSC_RD 0x40
|
|
#define ATMEL_SSC_RX (ATMEL_SSC_RK | ATMEL_SSC_RF | ATMEL_SSC_RD)
|
|
|
|
extern void __init at91_add_device_ssc(unsigned id, unsigned pins);
|
|
|
|
/* LCD Controller */
|
|
struct atmel_lcdfb_info;
|
|
extern void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data);
|
|
|
|
/* AC97 */
|
|
extern void __init at91_add_device_ac97(struct ac97c_platform_data *data);
|
|
|
|
/* ISI */
|
|
struct isi_platform_data;
|
|
extern void __init at91_add_device_isi(struct isi_platform_data *data,
|
|
bool use_pck_as_mck);
|
|
|
|
/* Touchscreen Controller */
|
|
extern void __init at91_add_device_tsadcc(struct at91_tsadcc_data *data);
|
|
|
|
/* CAN */
|
|
extern void __init at91_add_device_can(struct at91_can_data *data);
|
|
|
|
/* LEDs */
|
|
extern void __init at91_gpio_leds(struct gpio_led *leds, int nr);
|
|
extern void __init at91_pwm_leds(struct gpio_led *leds, int nr);
|
|
|
|
#endif
|