Remove individual platform header files for dm365, dm355, dm644x and dm646x and consolidate it into a single and common header file davinci.h placed in arch/arm/mach-davinci. This reduces the pollution in the include/mach and is consistent with Russell's suggestions as part of his "pet peaves" mail. (See #4 in: http://lists.infradead.org/pipermail/linux-arm-kernel/2011-November/071516.html) While at it, fix the forward declaration of spi_board_info, and include the right header file instead. The further patches in the series take advantage of this consolidation for easy implementation of IO_ADDRESS elimination. Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com> [nsekhar@ti.com: make davinci.h the first local include file, fix forward declaration of spi_board_info and add back Deep Root Systems, LLC copyright] Signed-off-by: Sekhar Nori <nsekhar@ti.com>tirimbino
Manjunath Hadli
13 years ago
committed by
Sekhar Nori
parent
3d0914061f
commit
39c6d2d1d7
@ -0,0 +1,85 @@ |
||||
/*
|
||||
* This file contains the processor specific definitions |
||||
* of the TI DM644x, DM355, DM365, and DM646x. |
||||
* |
||||
* Copyright (C) 2011 Texas Instruments Incorporated |
||||
* Copyright (c) 2007 Deep Root Systems, LLC |
||||
* |
||||
* 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 version 2. |
||||
* |
||||
* This program is distributed "as is" WITHOUT ANY WARRANTY of any |
||||
* kind, whether express or implied; without even the implied warranty |
||||
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
* GNU General Public License for more details. |
||||
*/ |
||||
#ifndef __DAVINCI_H |
||||
#define __DAVINCI_H |
||||
|
||||
#include <linux/clk.h> |
||||
#include <linux/videodev2.h> |
||||
#include <linux/davinci_emac.h> |
||||
#include <linux/platform_device.h> |
||||
#include <linux/spi/spi.h> |
||||
|
||||
#include <mach/asp.h> |
||||
#include <mach/keyscan.h> |
||||
|
||||
#include <media/davinci/vpfe_capture.h> |
||||
#include <media/davinci/vpif_types.h> |
||||
|
||||
/* DM355 base addresses */ |
||||
#define DM355_ASYNC_EMIF_CONTROL_BASE 0x01e10000 |
||||
#define DM355_ASYNC_EMIF_DATA_CE0_BASE 0x02000000 |
||||
|
||||
#define ASP1_TX_EVT_EN 1 |
||||
#define ASP1_RX_EVT_EN 2 |
||||
|
||||
/* DM365 base addresses */ |
||||
#define DM365_ASYNC_EMIF_CONTROL_BASE 0x01d10000 |
||||
#define DM365_ASYNC_EMIF_DATA_CE0_BASE 0x02000000 |
||||
#define DM365_ASYNC_EMIF_DATA_CE1_BASE 0x04000000 |
||||
|
||||
/* DM644x base addresses */ |
||||
#define DM644X_ASYNC_EMIF_CONTROL_BASE 0x01e00000 |
||||
#define DM644X_ASYNC_EMIF_DATA_CE0_BASE 0x02000000 |
||||
#define DM644X_ASYNC_EMIF_DATA_CE1_BASE 0x04000000 |
||||
#define DM644X_ASYNC_EMIF_DATA_CE2_BASE 0x06000000 |
||||
#define DM644X_ASYNC_EMIF_DATA_CE3_BASE 0x08000000 |
||||
|
||||
/* DM646x base addresses */ |
||||
#define DM646X_ASYNC_EMIF_CONTROL_BASE 0x20008000 |
||||
#define DM646X_ASYNC_EMIF_CS2_SPACE_BASE 0x42000000 |
||||
|
||||
/* DM355 function declarations */ |
||||
void __init dm355_init(void); |
||||
void dm355_init_spi0(unsigned chipselect_mask, |
||||
struct spi_board_info *info, unsigned len); |
||||
void __init dm355_init_asp1(u32 evt_enable, struct snd_platform_data *pdata); |
||||
void dm355_set_vpfe_config(struct vpfe_config *cfg); |
||||
|
||||
/* DM365 function declarations */ |
||||
void __init dm365_init(void); |
||||
void __init dm365_init_asp(struct snd_platform_data *pdata); |
||||
void __init dm365_init_vc(struct snd_platform_data *pdata); |
||||
void __init dm365_init_ks(struct davinci_ks_platform_data *pdata); |
||||
void __init dm365_init_rtc(void); |
||||
void dm365_init_spi0(unsigned chipselect_mask, |
||||
struct spi_board_info *info, unsigned len); |
||||
void dm365_set_vpfe_config(struct vpfe_config *cfg); |
||||
|
||||
/* DM644x function declarations */ |
||||
void __init dm644x_init(void); |
||||
void __init dm644x_init_asp(struct snd_platform_data *pdata); |
||||
void dm644x_set_vpfe_config(struct vpfe_config *cfg); |
||||
|
||||
/* DM646x function declarations */ |
||||
void __init dm646x_init(void); |
||||
void __init dm646x_init_mcasp0(struct snd_platform_data *pdata); |
||||
void __init dm646x_init_mcasp1(struct snd_platform_data *pdata); |
||||
int __init dm646x_init_edma(struct edma_rsv_info *rsv); |
||||
void dm646x_video_init(void); |
||||
void dm646x_setup_vpif(struct vpif_display_config *, |
||||
struct vpif_capture_config *); |
||||
#endif /*__DAVINCI_H */ |
||||
@ -1,32 +0,0 @@ |
||||
/*
|
||||
* Chip specific defines for DM355 SoC |
||||
* |
||||
* Author: Kevin Hilman, Deep Root Systems, LLC |
||||
* |
||||
* 2007 (c) Deep Root Systems, LLC. 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 __ASM_ARCH_DM355_H |
||||
#define __ASM_ARCH_DM355_H |
||||
|
||||
#include <mach/hardware.h> |
||||
#include <mach/asp.h> |
||||
#include <media/davinci/vpfe_capture.h> |
||||
|
||||
#define DM355_ASYNC_EMIF_CONTROL_BASE 0x01E10000 |
||||
#define DM355_ASYNC_EMIF_DATA_CE0_BASE 0x02000000 |
||||
|
||||
#define ASP1_TX_EVT_EN 1 |
||||
#define ASP1_RX_EVT_EN 2 |
||||
|
||||
struct spi_board_info; |
||||
|
||||
void __init dm355_init(void); |
||||
void dm355_init_spi0(unsigned chipselect_mask, |
||||
struct spi_board_info *info, unsigned len); |
||||
void __init dm355_init_asp1(u32 evt_enable, struct snd_platform_data *pdata); |
||||
void dm355_set_vpfe_config(struct vpfe_config *cfg); |
||||
|
||||
#endif /* __ASM_ARCH_DM355_H */ |
||||
@ -1,36 +0,0 @@ |
||||
/*
|
||||
* Copyright (C) 2009 Texas Instruments Incorporated |
||||
* |
||||
* 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 version 2. |
||||
* |
||||
* This program is distributed "as is" WITHOUT ANY WARRANTY of any |
||||
* kind, whether express or implied; without even the implied warranty |
||||
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
* GNU General Public License for more details. |
||||
*/ |
||||
#ifndef __ASM_ARCH_DM365_H |
||||
#define __ASM_ARCH_DM665_H |
||||
|
||||
#include <linux/platform_device.h> |
||||
#include <linux/davinci_emac.h> |
||||
#include <mach/hardware.h> |
||||
#include <mach/asp.h> |
||||
#include <mach/keyscan.h> |
||||
#include <media/davinci/vpfe_capture.h> |
||||
|
||||
#define DM365_ASYNC_EMIF_CONTROL_BASE 0x01D10000 |
||||
#define DM365_ASYNC_EMIF_DATA_CE0_BASE 0x02000000 |
||||
#define DM365_ASYNC_EMIF_DATA_CE1_BASE 0x04000000 |
||||
|
||||
void __init dm365_init(void); |
||||
void __init dm365_init_asp(struct snd_platform_data *pdata); |
||||
void __init dm365_init_vc(struct snd_platform_data *pdata); |
||||
void __init dm365_init_ks(struct davinci_ks_platform_data *pdata); |
||||
void __init dm365_init_rtc(void); |
||||
void dm365_init_spi0(unsigned chipselect_mask, |
||||
struct spi_board_info *info, unsigned len); |
||||
|
||||
void dm365_set_vpfe_config(struct vpfe_config *cfg); |
||||
#endif /* __ASM_ARCH_DM365_H */ |
||||
@ -1,40 +0,0 @@ |
||||
/*
|
||||
* This file contains the processor specific definitions |
||||
* of the TI DM644x. |
||||
* |
||||
* Copyright (C) 2008 Texas Instruments. |
||||
* |
||||
* 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 |
||||
* |
||||
*/ |
||||
#ifndef __ASM_ARCH_DM644X_H |
||||
#define __ASM_ARCH_DM644X_H |
||||
|
||||
#include <linux/davinci_emac.h> |
||||
#include <mach/hardware.h> |
||||
#include <mach/asp.h> |
||||
#include <media/davinci/vpfe_capture.h> |
||||
|
||||
#define DM644X_ASYNC_EMIF_CONTROL_BASE 0x01E00000 |
||||
#define DM644X_ASYNC_EMIF_DATA_CE0_BASE 0x02000000 |
||||
#define DM644X_ASYNC_EMIF_DATA_CE1_BASE 0x04000000 |
||||
#define DM644X_ASYNC_EMIF_DATA_CE2_BASE 0x06000000 |
||||
#define DM644X_ASYNC_EMIF_DATA_CE3_BASE 0x08000000 |
||||
|
||||
void __init dm644x_init(void); |
||||
void __init dm644x_init_asp(struct snd_platform_data *pdata); |
||||
void dm644x_set_vpfe_config(struct vpfe_config *cfg); |
||||
|
||||
#endif /* __ASM_ARCH_DM644X_H */ |
||||
@ -1,34 +0,0 @@ |
||||
/*
|
||||
* Chip specific defines for DM646x SoC |
||||
* |
||||
* Author: Kevin Hilman, Deep Root Systems, LLC |
||||
* |
||||
* 2007 (c) Deep Root Systems, LLC. 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 __ASM_ARCH_DM646X_H |
||||
#define __ASM_ARCH_DM646X_H |
||||
|
||||
#include <mach/hardware.h> |
||||
#include <mach/asp.h> |
||||
#include <linux/i2c.h> |
||||
#include <linux/videodev2.h> |
||||
#include <linux/davinci_emac.h> |
||||
#include <media/davinci/vpif_types.h> |
||||
|
||||
#define DM646X_ASYNC_EMIF_CONTROL_BASE 0x20008000 |
||||
#define DM646X_ASYNC_EMIF_CS2_SPACE_BASE 0x42000000 |
||||
|
||||
void __init dm646x_init(void); |
||||
void __init dm646x_init_mcasp0(struct snd_platform_data *pdata); |
||||
void __init dm646x_init_mcasp1(struct snd_platform_data *pdata); |
||||
int __init dm646x_init_edma(struct edma_rsv_info *rsv); |
||||
|
||||
void dm646x_video_init(void); |
||||
|
||||
void dm646x_setup_vpif(struct vpif_display_config *, |
||||
struct vpif_capture_config *); |
||||
|
||||
#endif /* __ASM_ARCH_DM646X_H */ |
||||
Loading…
Reference in new issue