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

Commit ca851c78 authored by Kumar Gala's avatar Kumar Gala
Browse files

powerpc/cpm: Remove some cruft code and defines 



Kill of some old defines and macros that we no longer use like
CPM_MAP_ADDR and CPM_IRQ_OFFSET.

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 89d93347

arch/powerpc/include/asm/cpm2.h

+0 −4
Original line number Diff line number Diff line
@@ -14,10 +14,6 @@ 
#include <asm/cpm.h>

#include <sysdev/fsl_soc.h>



#ifdef CONFIG_PPC_85xx

#define CPM_MAP_ADDR (get_immrbase() + 0x80000)

#endif



/* CPM Command register.

*/

#define CPM_CR_RST	((uint)0x80000000)

arch/powerpc/platforms/82xx/pq2ads.h

+0 −13
Original line number Diff line number Diff line
@@ -24,10 +24,6 @@ 


#include <linux/seq_file.h>



/* Backword-compatibility stuff for the drivers */

#define CPM_MAP_ADDR		((uint)0xf0000000)

#define CPM_IRQ_OFFSET 0



/* The ADS8260 has 16, 32-bit wide control/status registers, accessed

 * only on word boundaries.

 * Not all are used (yet), or are interesting to us (yet).
@@ -44,14 +40,5 @@ 
#define BCSR3_FETHIEN2		((uint)0x10000000)      /* 0 == enable*/

#define BCSR3_FETH2_RST		((uint)0x80000000)      /* 0 == reset */



/* cpm serial driver works with constants below */



#define SIU_INT_SMC1		((uint)0x04+CPM_IRQ_OFFSET)

#define SIU_INT_SMC2		((uint)0x05+CPM_IRQ_OFFSET)

#define SIU_INT_SCC1		((uint)0x28+CPM_IRQ_OFFSET)

#define SIU_INT_SCC2		((uint)0x29+CPM_IRQ_OFFSET)

#define SIU_INT_SCC3		((uint)0x2a+CPM_IRQ_OFFSET)

#define SIU_INT_SCC4		((uint)0x2b+CPM_IRQ_OFFSET)



#endif /* __MACH_ADS8260_DEFS */

#endif /* __KERNEL__ */

arch/powerpc/platforms/8xx/mpc885ads.h

+0 −4
Original line number Diff line number Diff line
@@ -17,10 +17,6 @@ 


#include <sysdev/fsl_soc.h>



#define MPC8xx_CPM_OFFSET	(0x9c0)

#define CPM_MAP_ADDR		(get_immrbase() + MPC8xx_CPM_OFFSET)

#define CPM_IRQ_OFFSET		16     // for compability with cpm_uart driver



/* Bits of interest in the BCSRs.

 */

#define BCSR1_ETHEN		((uint)0x20000000)

arch/powerpc/sysdev/cpm2.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ EXPORT_SYMBOL(cpm2_immr); 
void __init cpm2_reset(void)

{

#ifdef CONFIG_PPC_85xx

	cpm2_immr = ioremap(CPM_MAP_ADDR, CPM_MAP_SIZE);

	cpm2_immr = ioremap(get_immrbase() + 0x80000, CPM_MAP_SIZE);

#else

	cpm2_immr = ioremap(get_immrbase(), CPM_MAP_SIZE);

#endif