Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25e4b485 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'bcmring/cleanup' into bcmring/removal 



Doing a large-scale cleaning and removing the platform in another
branch don't mix well, so do the trivial merge here.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents abbb0db2 878040ef

arch/arm/mach-bcmring/include/cfg_global.h

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
#ifndef _CFG_GLOBAL_H_

#define _CFG_GLOBAL_H_



#include <cfg_global_defines.h>



#define CFG_GLOBAL_CHIP                         BCM11107

#define CFG_GLOBAL_CHIP_FAMILY                  CFG_GLOBAL_CHIP_FAMILY_BCMRING

#define CFG_GLOBAL_CHIP_REV                     0xB0

#define CFG_GLOBAL_RAM_SIZE                     0x10000000

#define CFG_GLOBAL_RAM_BASE                     0x00000000

#define CFG_GLOBAL_RAM_RESERVED_SIZE            0x000000



#endif /* _CFG_GLOBAL_H_ */

arch/arm/mach-bcmring/include/csp/cache.h

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
/*****************************************************************************

* 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 */

arch/arm/mach-bcmring/include/csp/delay.h

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
/*****************************************************************************

* 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 */

arch/arm/mach-bcmring/include/csp/errno.h

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
/*****************************************************************************

* 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 */

arch/arm/mach-bcmring/include/csp/intcHw.h

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
/*****************************************************************************

* 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 */