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

Commit 8a3fb860 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parent 651ef18d

arch/arm/mach-bcmring/core.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

arch/arm/mach-bcmring/csp/chipc/chipcHw.c

+5 −5
Original line number Diff line number Diff line
@@ -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 --------------------------------------- */

arch/arm/mach-bcmring/csp/chipc/chipcHw_init.c

+5 −5
Original line number Diff line number Diff line
@@ -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 --------------------------------------- */



/*

arch/arm/mach-bcmring/csp/chipc/chipcHw_reset.c

+4 −4
Original line number Diff line number Diff line
@@ -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();

arch/arm/mach-bcmring/csp/dmac/dmacHw.c

+3 −3
Original line number Diff line number Diff line
@@ -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>