Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Kumar Gala <galak@kernel.crashing.org>

+1 -22
-4
arch/powerpc/include/asm/cpm2.h
··· 14 14 #include <asm/cpm.h> 15 15 #include <sysdev/fsl_soc.h> 16 16 17 - #ifdef CONFIG_PPC_85xx 18 - #define CPM_MAP_ADDR (get_immrbase() + 0x80000) 19 - #endif 20 - 21 17 /* CPM Command register. 22 18 */ 23 19 #define CPM_CR_RST ((uint)0x80000000)
-13
arch/powerpc/platforms/82xx/pq2ads.h
··· 24 24 25 25 #include <linux/seq_file.h> 26 26 27 - /* Backword-compatibility stuff for the drivers */ 28 - #define CPM_MAP_ADDR ((uint)0xf0000000) 29 - #define CPM_IRQ_OFFSET 0 30 - 31 27 /* The ADS8260 has 16, 32-bit wide control/status registers, accessed 32 28 * only on word boundaries. 33 29 * Not all are used (yet), or are interesting to us (yet). ··· 39 43 #define BCSR1_RS232_EN2 ((uint)0x01000000) /* 0 ==enable */ 40 44 #define BCSR3_FETHIEN2 ((uint)0x10000000) /* 0 == enable*/ 41 45 #define BCSR3_FETH2_RST ((uint)0x80000000) /* 0 == reset */ 42 - 43 - /* cpm serial driver works with constants below */ 44 - 45 - #define SIU_INT_SMC1 ((uint)0x04+CPM_IRQ_OFFSET) 46 - #define SIU_INT_SMC2 ((uint)0x05+CPM_IRQ_OFFSET) 47 - #define SIU_INT_SCC1 ((uint)0x28+CPM_IRQ_OFFSET) 48 - #define SIU_INT_SCC2 ((uint)0x29+CPM_IRQ_OFFSET) 49 - #define SIU_INT_SCC3 ((uint)0x2a+CPM_IRQ_OFFSET) 50 - #define SIU_INT_SCC4 ((uint)0x2b+CPM_IRQ_OFFSET) 51 46 52 47 #endif /* __MACH_ADS8260_DEFS */ 53 48 #endif /* __KERNEL__ */
-4
arch/powerpc/platforms/8xx/mpc885ads.h
··· 17 17 18 18 #include <sysdev/fsl_soc.h> 19 19 20 - #define MPC8xx_CPM_OFFSET (0x9c0) 21 - #define CPM_MAP_ADDR (get_immrbase() + MPC8xx_CPM_OFFSET) 22 - #define CPM_IRQ_OFFSET 16 // for compability with cpm_uart driver 23 - 24 20 /* Bits of interest in the BCSRs. 25 21 */ 26 22 #define BCSR1_ETHEN ((uint)0x20000000)
+1 -1
arch/powerpc/sysdev/cpm2.c
··· 61 61 void __init cpm2_reset(void) 62 62 { 63 63 #ifdef CONFIG_PPC_85xx 64 - cpm2_immr = ioremap(CPM_MAP_ADDR, CPM_MAP_SIZE); 64 + cpm2_immr = ioremap(get_immrbase() + 0x80000, CPM_MAP_SIZE); 65 65 #else 66 66 cpm2_immr = ioremap(get_immrbase(), CPM_MAP_SIZE); 67 67 #endif