ARM: bcmring: remove include/csp/ subdir
The csp/*.h headers get into the way of multiplatform kernels and are generally not needed anyway. This removes the ones that are completely free of content and moves the other ones to mach/csp/, which already holds a bunch of these. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
parent
651ef18db9
commit
8a3fb8607a
|
@ -47,7 +47,6 @@
|
|||
|
||||
#include "clock.h"
|
||||
|
||||
#include <csp/secHw.h>
|
||||
#include <mach/csp/secHw_def.h>
|
||||
#include <mach/csp/chipcHw_inline.h>
|
||||
#include <mach/csp/tmrHw_reg.h>
|
||||
|
|
|
@ -26,15 +26,15 @@
|
|||
|
||||
/* ---- Include Files ---------------------------------------------------- */
|
||||
|
||||
#include <csp/errno.h>
|
||||
#include <csp/stdint.h>
|
||||
#include <csp/module.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/export.h>
|
||||
|
||||
#include <mach/csp/chipcHw_def.h>
|
||||
#include <mach/csp/chipcHw_inline.h>
|
||||
|
||||
#include <csp/reg.h>
|
||||
#include <csp/delay.h>
|
||||
#include <mach/csp/reg.h>
|
||||
#include <linux/delay.h>
|
||||
|
||||
/* ---- Private Constants and Types --------------------------------------- */
|
||||
|
||||
|
|
|
@ -26,15 +26,15 @@
|
|||
|
||||
/* ---- Include Files ---------------------------------------------------- */
|
||||
|
||||
#include <csp/errno.h>
|
||||
#include <csp/stdint.h>
|
||||
#include <csp/module.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/export.h>
|
||||
|
||||
#include <mach/csp/chipcHw_def.h>
|
||||
#include <mach/csp/chipcHw_inline.h>
|
||||
|
||||
#include <csp/reg.h>
|
||||
#include <csp/delay.h>
|
||||
#include <mach/csp/reg.h>
|
||||
#include <linux/delay.h>
|
||||
/* ---- Private Constants and Types --------------------------------------- */
|
||||
|
||||
/*
|
||||
|
|
|
@ -13,11 +13,11 @@
|
|||
*****************************************************************************/
|
||||
|
||||
/* ---- Include Files ---------------------------------------------------- */
|
||||
#include <csp/stdint.h>
|
||||
#include <linux/types.h>
|
||||
#include <mach/csp/chipcHw_def.h>
|
||||
#include <mach/csp/chipcHw_inline.h>
|
||||
#include <csp/intcHw.h>
|
||||
#include <csp/cache.h>
|
||||
#include <mach/csp/intcHw_reg.h>
|
||||
#include <asm/cacheflush.h>
|
||||
|
||||
/* ---- Private Constants and Types --------------------------------------- */
|
||||
/* ---- Private Variables ------------------------------------------------- */
|
||||
|
@ -60,7 +60,7 @@ void chipcHw_reset(uint32_t mask)
|
|||
i++;
|
||||
} while (((uint32_t *) MM_IO_BASE_ARAM)[i - 1] != 0xe1a0f00f); /* 0xe1a0f00f == asm ("mov r15, r15"); */
|
||||
|
||||
CSP_CACHE_FLUSH_ALL;
|
||||
flush_cache_all();
|
||||
|
||||
/* run the function from ARAM */
|
||||
runFunc();
|
||||
|
|
|
@ -25,11 +25,11 @@
|
|||
/****************************************************************************/
|
||||
|
||||
/* ---- Include Files ---------------------------------------------------- */
|
||||
#include <csp/stdint.h>
|
||||
#include <csp/string.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/string.h>
|
||||
#include <stddef.h>
|
||||
|
||||
#include <csp/dmacHw.h>
|
||||
#include <mach/csp/dmacHw.h>
|
||||
#include <mach/csp/dmacHw_reg.h>
|
||||
#include <mach/csp/dmacHw_priv.h>
|
||||
#include <mach/csp/chipcHw_inline.h>
|
||||
|
|
|
@ -26,10 +26,10 @@
|
|||
|
||||
/* ---- Include Files ---------------------------------------------------- */
|
||||
|
||||
#include <csp/stdint.h>
|
||||
#include <linux/types.h>
|
||||
#include <stddef.h>
|
||||
|
||||
#include <csp/dmacHw.h>
|
||||
#include <mach/csp/dmacHw.h>
|
||||
#include <mach/csp/dmacHw_reg.h>
|
||||
#include <mach/csp/dmacHw_priv.h>
|
||||
|
||||
|
|
|
@ -26,10 +26,10 @@
|
|||
|
||||
/* ---- Include Files ---------------------------------------------------- */
|
||||
|
||||
#include <csp/errno.h>
|
||||
#include <csp/stdint.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
#include <csp/tmrHw.h>
|
||||
#include <mach/csp/tmrHw.h>
|
||||
#include <mach/csp/tmrHw_reg.h>
|
||||
|
||||
#define tmrHw_ASSERT(a) if (!(a)) *(char *)0 = 0
|
||||
|
|
|
@ -1,35 +0,0 @@
|
|||
/*****************************************************************************
|
||||
* Copyright 2003 - 2008 Broadcom Corporation. All rights reserved.
|
||||
*
|
||||
* Unless you and Broadcom execute a separate written software license
|
||||
* agreement governing use of this software, this software is licensed to you
|
||||
* under the terms of the GNU General Public License version 2, available at
|
||||
* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
|
||||
*
|
||||
* Notwithstanding the above, under no circumstances may you combine this
|
||||
* software in any way with any other Broadcom software provided under a
|
||||
* license other than the GPL, without Broadcom's express prior written
|
||||
* consent.
|
||||
*****************************************************************************/
|
||||
|
||||
#ifndef CSP_CACHE_H
|
||||
#define CSP_CACHE_H
|
||||
|
||||
/* ---- Include Files ---------------------------------------------------- */
|
||||
|
||||
#include <csp/stdint.h>
|
||||
|
||||
/* ---- Public Constants and Types --------------------------------------- */
|
||||
|
||||
#if defined(__KERNEL__) && !defined(STANDALONE)
|
||||
#include <asm/cacheflush.h>
|
||||
|
||||
#define CSP_CACHE_FLUSH_ALL flush_cache_all()
|
||||
|
||||
#else
|
||||
|
||||
#define CSP_CACHE_FLUSH_ALL
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* CSP_CACHE_H */
|
|
@ -1,36 +0,0 @@
|
|||
/*****************************************************************************
|
||||
* Copyright 2003 - 2008 Broadcom Corporation. All rights reserved.
|
||||
*
|
||||
* Unless you and Broadcom execute a separate written software license
|
||||
* agreement governing use of this software, this software is licensed to you
|
||||
* under the terms of the GNU General Public License version 2, available at
|
||||
* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
|
||||
*
|
||||
* Notwithstanding the above, under no circumstances may you combine this
|
||||
* software in any way with any other Broadcom software provided under a
|
||||
* license other than the GPL, without Broadcom's express prior written
|
||||
* consent.
|
||||
*****************************************************************************/
|
||||
|
||||
|
||||
#ifndef CSP_DELAY_H
|
||||
#define CSP_DELAY_H
|
||||
|
||||
/* ---- Include Files ---------------------------------------------------- */
|
||||
|
||||
/* Some CSP routines require use of the following delay routines. Use the OS */
|
||||
/* version if available, otherwise use a CSP specific definition. */
|
||||
/* void udelay(unsigned long usecs); */
|
||||
/* void mdelay(unsigned long msecs); */
|
||||
|
||||
#if defined(__KERNEL__) && !defined(STANDALONE)
|
||||
#include <linux/delay.h>
|
||||
#else
|
||||
#include <mach/csp/delay.h>
|
||||
#endif
|
||||
|
||||
/* ---- Public Constants and Types --------------------------------------- */
|
||||
/* ---- Public Variable Externs ------------------------------------------ */
|
||||
/* ---- Public Function Prototypes --------------------------------------- */
|
||||
|
||||
#endif /* CSP_DELAY_H */
|
|
@ -1,32 +0,0 @@
|
|||
/*****************************************************************************
|
||||
* Copyright 2003 - 2008 Broadcom Corporation. All rights reserved.
|
||||
*
|
||||
* Unless you and Broadcom execute a separate written software license
|
||||
* agreement governing use of this software, this software is licensed to you
|
||||
* under the terms of the GNU General Public License version 2, available at
|
||||
* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
|
||||
*
|
||||
* Notwithstanding the above, under no circumstances may you combine this
|
||||
* software in any way with any other Broadcom software provided under a
|
||||
* license other than the GPL, without Broadcom's express prior written
|
||||
* consent.
|
||||
*****************************************************************************/
|
||||
|
||||
#ifndef CSP_ERRNO_H
|
||||
#define CSP_ERRNO_H
|
||||
|
||||
/* ---- Include Files ---------------------------------------------------- */
|
||||
|
||||
#if defined(__KERNEL__)
|
||||
#include <linux/errno.h>
|
||||
#elif defined(CSP_SIMULATION)
|
||||
#include <asm-generic/errno.h>
|
||||
#else
|
||||
#include <errno.h>
|
||||
#endif
|
||||
|
||||
/* ---- Public Constants and Types --------------------------------------- */
|
||||
/* ---- Public Variable Externs ------------------------------------------ */
|
||||
/* ---- Public Function Prototypes --------------------------------------- */
|
||||
|
||||
#endif /* CSP_ERRNO_H */
|
|
@ -1,40 +0,0 @@
|
|||
/*****************************************************************************
|
||||
* Copyright 2003 - 2008 Broadcom Corporation. All rights reserved.
|
||||
*
|
||||
* Unless you and Broadcom execute a separate written software license
|
||||
* agreement governing use of this software, this software is licensed to you
|
||||
* under the terms of the GNU General Public License version 2, available at
|
||||
* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
|
||||
*
|
||||
* Notwithstanding the above, under no circumstances may you combine this
|
||||
* software in any way with any other Broadcom software provided under a
|
||||
* license other than the GPL, without Broadcom's express prior written
|
||||
* consent.
|
||||
*****************************************************************************/
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/**
|
||||
* @file intcHw.h
|
||||
*
|
||||
* @brief generic interrupt controller API
|
||||
*
|
||||
* @note
|
||||
* None
|
||||
*/
|
||||
/****************************************************************************/
|
||||
|
||||
#ifndef _INTCHW_H
|
||||
#define _INTCHW_H
|
||||
|
||||
/* ---- Include Files ---------------------------------------------------- */
|
||||
#include <mach/csp/intcHw_reg.h>
|
||||
|
||||
/* ---- Public Constants and Types --------------------------------------- */
|
||||
/* ---- Public Variable Externs ------------------------------------------ */
|
||||
/* ---- Public Function Prototypes --------------------------------------- */
|
||||
static inline void intcHw_irq_disable(void *basep, uint32_t mask);
|
||||
static inline void intcHw_irq_enable(void *basep, uint32_t mask);
|
||||
|
||||
#endif /* _INTCHW_H */
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
/*****************************************************************************
|
||||
* Copyright 2003 - 2008 Broadcom Corporation. All rights reserved.
|
||||
*
|
||||
* Unless you and Broadcom execute a separate written software license
|
||||
* agreement governing use of this software, this software is licensed to you
|
||||
* under the terms of the GNU General Public License version 2, available at
|
||||
* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
|
||||
*
|
||||
* Notwithstanding the above, under no circumstances may you combine this
|
||||
* software in any way with any other Broadcom software provided under a
|
||||
* license other than the GPL, without Broadcom's express prior written
|
||||
* consent.
|
||||
*****************************************************************************/
|
||||
|
||||
|
||||
#ifndef CSP_MODULE_H
|
||||
#define CSP_MODULE_H
|
||||
|
||||
/* ---- Include Files ---------------------------------------------------- */
|
||||
|
||||
#ifdef __KERNEL__
|
||||
#include <linux/module.h>
|
||||
#else
|
||||
#define EXPORT_SYMBOL(symbol)
|
||||
#endif
|
||||
|
||||
/* ---- Public Constants and Types --------------------------------------- */
|
||||
/* ---- Public Variable Externs ------------------------------------------ */
|
||||
/* ---- Public Function Prototypes --------------------------------------- */
|
||||
|
||||
|
||||
#endif /* CSP_MODULE_H */
|
|
@ -1,65 +0,0 @@
|
|||
/*****************************************************************************
|
||||
* Copyright 2004 - 2008 Broadcom Corporation. All rights reserved.
|
||||
*
|
||||
* Unless you and Broadcom execute a separate written software license
|
||||
* agreement governing use of this software, this software is licensed to you
|
||||
* under the terms of the GNU General Public License version 2, available at
|
||||
* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
|
||||
*
|
||||
* Notwithstanding the above, under no circumstances may you combine this
|
||||
* software in any way with any other Broadcom software provided under a
|
||||
* license other than the GPL, without Broadcom's express prior written
|
||||
* consent.
|
||||
*****************************************************************************/
|
||||
|
||||
/****************************************************************************/
|
||||
/**
|
||||
* @file secHw.h
|
||||
*
|
||||
* @brief Definitions for accessing low level security features
|
||||
*
|
||||
*/
|
||||
/****************************************************************************/
|
||||
#ifndef SECHW_H
|
||||
#define SECHW_H
|
||||
|
||||
typedef void (*secHw_FUNC_t) (void);
|
||||
|
||||
typedef enum {
|
||||
secHw_MODE_SECURE = 0x0, /* Switches processor into secure mode */
|
||||
secHw_MODE_NONSECURE = 0x1 /* Switches processor into non-secure mode */
|
||||
} secHw_MODE;
|
||||
|
||||
/****************************************************************************/
|
||||
/**
|
||||
* @brief Requesting to execute the function in secure mode
|
||||
*
|
||||
* This function requests the given function to run in secure mode
|
||||
*
|
||||
*/
|
||||
/****************************************************************************/
|
||||
void secHw_RunSecure(secHw_FUNC_t /* Function to run in secure mode */
|
||||
);
|
||||
|
||||
/****************************************************************************/
|
||||
/**
|
||||
* @brief Sets the mode
|
||||
*
|
||||
* his function sets the processor mode (secure/non-secure)
|
||||
*
|
||||
*/
|
||||
/****************************************************************************/
|
||||
void secHw_SetMode(secHw_MODE /* Processor mode */
|
||||
);
|
||||
|
||||
/****************************************************************************/
|
||||
/**
|
||||
* @brief Get the current mode
|
||||
*
|
||||
* This function retieves the processor mode (secure/non-secure)
|
||||
*
|
||||
*/
|
||||
/****************************************************************************/
|
||||
void secHw_GetMode(secHw_MODE *);
|
||||
|
||||
#endif /* SECHW_H */
|
|
@ -1,30 +0,0 @@
|
|||
/*****************************************************************************
|
||||
* Copyright 2003 - 2008 Broadcom Corporation. All rights reserved.
|
||||
*
|
||||
* Unless you and Broadcom execute a separate written software license
|
||||
* agreement governing use of this software, this software is licensed to you
|
||||
* under the terms of the GNU General Public License version 2, available at
|
||||
* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
|
||||
*
|
||||
* Notwithstanding the above, under no circumstances may you combine this
|
||||
* software in any way with any other Broadcom software provided under a
|
||||
* license other than the GPL, without Broadcom's express prior written
|
||||
* consent.
|
||||
*****************************************************************************/
|
||||
|
||||
#ifndef CSP_STDINT_H
|
||||
#define CSP_STDINT_H
|
||||
|
||||
/* ---- Include Files ---------------------------------------------------- */
|
||||
|
||||
#ifdef __KERNEL__
|
||||
#include <linux/types.h>
|
||||
#else
|
||||
#include <stdint.h>
|
||||
#endif
|
||||
|
||||
/* ---- Public Constants and Types --------------------------------------- */
|
||||
/* ---- Public Variable Externs ------------------------------------------ */
|
||||
/* ---- Public Function Prototypes --------------------------------------- */
|
||||
|
||||
#endif /* CSP_STDINT_H */
|
|
@ -1,34 +0,0 @@
|
|||
/*****************************************************************************
|
||||
* Copyright 2003 - 2008 Broadcom Corporation. All rights reserved.
|
||||
*
|
||||
* Unless you and Broadcom execute a separate written software license
|
||||
* agreement governing use of this software, this software is licensed to you
|
||||
* under the terms of the GNU General Public License version 2, available at
|
||||
* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
|
||||
*
|
||||
* Notwithstanding the above, under no circumstances may you combine this
|
||||
* software in any way with any other Broadcom software provided under a
|
||||
* license other than the GPL, without Broadcom's express prior written
|
||||
* consent.
|
||||
*****************************************************************************/
|
||||
|
||||
|
||||
|
||||
#ifndef CSP_STRING_H
|
||||
#define CSP_STRING_H
|
||||
|
||||
/* ---- Include Files ---------------------------------------------------- */
|
||||
|
||||
#ifdef __KERNEL__
|
||||
#include <linux/string.h>
|
||||
#else
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
/* ---- Public Constants and Types --------------------------------------- */
|
||||
/* ---- Public Variable Externs ------------------------------------------ */
|
||||
/* ---- Public Function Prototypes --------------------------------------- */
|
||||
|
||||
|
||||
#endif /* CSP_STRING_H */
|
||||
|
|
@ -17,9 +17,9 @@
|
|||
|
||||
/* ---- Include Files ----------------------------------------------------- */
|
||||
|
||||
#include <csp/stdint.h>
|
||||
#include <csp/errno.h>
|
||||
#include <csp/reg.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/errno.h>
|
||||
#include <mach/csp/reg.h>
|
||||
#include <mach/csp/chipcHw_reg.h>
|
||||
|
||||
/* ---- Public Constants and Types ---------------------------------------- */
|
||||
|
|
|
@ -17,8 +17,8 @@
|
|||
|
||||
/* ---- Include Files ----------------------------------------------------- */
|
||||
|
||||
#include <csp/errno.h>
|
||||
#include <csp/reg.h>
|
||||
#include <linux/errno.h>
|
||||
#include <mach/csp/reg.h>
|
||||
#include <mach/csp/chipcHw_reg.h>
|
||||
#include <mach/csp/chipcHw_def.h>
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#define CHIPCHW_REG_H
|
||||
|
||||
#include <mach/csp/mm_io.h>
|
||||
#include <csp/reg.h>
|
||||
#include <mach/csp/reg.h>
|
||||
#include <mach/csp/ddrcReg.h>
|
||||
|
||||
#define chipcHw_BASE_ADDRESS MM_IO_BASE_CHIPC
|
||||
|
|
|
@ -30,8 +30,8 @@ extern "C" {
|
|||
|
||||
/* ---- Include Files ---------------------------------------------------- */
|
||||
|
||||
#include <csp/reg.h>
|
||||
#include <csp/stdint.h>
|
||||
#include <mach/csp/reg.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
#include <mach/csp/mm_io.h>
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
#include <stddef.h>
|
||||
|
||||
#include <csp/stdint.h>
|
||||
#include <linux/types.h>
|
||||
#include <mach/csp/dmacHw_reg.h>
|
||||
|
||||
/* Define DMA Channel ID using DMA controller number (m) and channel number (c).
|
|
@ -24,7 +24,7 @@
|
|||
#ifndef _DMACHW_PRIV_H
|
||||
#define _DMACHW_PRIV_H
|
||||
|
||||
#include <csp/stdint.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
/* Data type for DMA Link List Item */
|
||||
typedef struct {
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#ifndef _DMACHW_REG_H
|
||||
#define _DMACHW_REG_H
|
||||
|
||||
#include <csp/stdint.h>
|
||||
#include <linux/types.h>
|
||||
#include <mach/csp/mm_io.h>
|
||||
|
||||
/* Data type for 64 bit little endian register */
|
||||
|
|
|
@ -27,8 +27,8 @@
|
|||
#define _INTCHW_REG_H
|
||||
|
||||
/* ---- Include Files ---------------------------------------------------- */
|
||||
#include <csp/stdint.h>
|
||||
#include <csp/reg.h>
|
||||
#include <linux/types.h>
|
||||
#include <mach/csp/reg.h>
|
||||
#include <mach/csp/mm_io.h>
|
||||
|
||||
/* ---- Public Constants and Types --------------------------------------- */
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
/* ---- Include Files ---------------------------------------------------- */
|
||||
|
||||
#include <csp/stdint.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
/* ---- Public Constants and Types --------------------------------------- */
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
#ifndef _TMRHW_H
|
||||
#define _TMRHW_H
|
||||
|
||||
#include <csp/stdint.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
typedef uint32_t tmrHw_ID_t; /* Timer ID */
|
||||
typedef uint32_t tmrHw_COUNT_t; /* Timer count */
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/semaphore.h>
|
||||
#include <csp/dmacHw.h>
|
||||
#include <mach/csp/dmacHw.h>
|
||||
#include <mach/timer.h>
|
||||
|
||||
/* ---- Constants and Types ---------------------------------------------- */
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#define __ASM_ARCH_REG_NAND_H
|
||||
|
||||
/* ---- Include Files ---------------------------------------------------- */
|
||||
#include <csp/reg.h>
|
||||
#include <mach/csp/reg.h>
|
||||
#include <mach/reg_umi.h>
|
||||
|
||||
/* ---- Constants and Types ---------------------------------------------- */
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#define __ASM_ARCH_REG_UMI_H
|
||||
|
||||
/* ---- Include Files ---------------------------------------------------- */
|
||||
#include <csp/reg.h>
|
||||
#include <mach/csp/reg.h>
|
||||
#include <mach/csp/mm_io.h>
|
||||
|
||||
/* ---- Constants and Types ---------------------------------------------- */
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
#include <linux/types.h>
|
||||
#include <linux/module.h>
|
||||
#include <csp/tmrHw.h>
|
||||
#include <mach/csp/tmrHw.h>
|
||||
|
||||
#include <mach/timer.h>
|
||||
/* The core.c file initializes timers 1 and 3 as a linux clocksource. */
|
||||
|
|
Loading…
Reference in a new issue