Commit 72281c5c468a6d18c4433c4cf0bc20b5749f74f1
Committed by
Tom Rini
Tom Rini
1 parent
08dd988be5
Exists in
smarc_8mq_lf_v2020.04
and in
17 other branches
powerpc: Remove 8260 remainders
commit 2eb48ff7a210d ("powerpc, 8260: remove support for mpc8260") removed support for 8260 CPU. This patch remove some remainders. Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Showing 5 changed files with 2 additions and 32 deletions Side-by-side Diff
MAINTAINERS
| ... | ... | @@ -324,12 +324,6 @@ |
| 324 | 324 | T: git git://git.denx.de/u-boot-mpc8xx.git |
| 325 | 325 | F: arch/powerpc/cpu/mpc8xx/ |
| 326 | 326 | |
| 327 | -POWERPC MPC82XX | |
| 328 | -M: Wolfgang Denk <wd@denx.de> | |
| 329 | -S: Maintained | |
| 330 | -T: git git://git.denx.de/u-boot-mpc82xx.git | |
| 331 | -F: arch/powerpc/cpu/mpc82*/ | |
| 332 | - | |
| 333 | 327 | POWERPC MPC83XX |
| 334 | 328 | M: Mario Six <mario.six@gdsys.cc> |
| 335 | 329 | S: Maintained |
arch/powerpc/include/asm/processor.h
| ... | ... | @@ -978,20 +978,8 @@ |
| 978 | 978 | #define PVR_850 PVR_821 |
| 979 | 979 | #define PVR_860 PVR_821 |
| 980 | 980 | #define PVR_7400 0x000C0000 |
| 981 | -#define PVR_8240 0x00810100 | |
| 982 | 981 | |
| 983 | 982 | /* |
| 984 | - * PowerQUICC II family processors report different PVR values depending | |
| 985 | - * on silicon process (HiP3, HiP4, HiP7, etc.) | |
| 986 | - */ | |
| 987 | -#define PVR_8260 PVR_8240 | |
| 988 | -#define PVR_8260_HIP3 0x00810101 | |
| 989 | -#define PVR_8260_HIP4 0x80811014 | |
| 990 | -#define PVR_8260_HIP7 0x80822011 | |
| 991 | -#define PVR_8260_HIP7R1 0x80822013 | |
| 992 | -#define PVR_8260_HIP7RA 0x80822014 | |
| 993 | - | |
| 994 | -/* | |
| 995 | 983 | * MPC 52xx |
| 996 | 984 | */ |
| 997 | 985 | #define PVR_5200 0x80822011 |
| ... | ... | @@ -1345,8 +1333,6 @@ |
| 1345 | 1333 | void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val); |
| 1346 | 1334 | |
| 1347 | 1335 | int prt_83xx_rsr(void); |
| 1348 | -int prt_8260_rsr(void); | |
| 1349 | -int prt_8260_clks(void); | |
| 1350 | 1336 | |
| 1351 | 1337 | #endif /* ndef ASSEMBLY*/ |
| 1352 | 1338 |
drivers/i2c/soft_i2c.c
drivers/serial/serial.c
| ... | ... | @@ -133,9 +133,6 @@ |
| 133 | 133 | serial_initfunc(max3100_serial_initialize); |
| 134 | 134 | serial_initfunc(mcf_serial_initialize); |
| 135 | 135 | serial_initfunc(ml2_serial_initialize); |
| 136 | -serial_initfunc(mpc5xx_serial_initialize); | |
| 137 | -serial_initfunc(mpc8260_scc_serial_initialize); | |
| 138 | -serial_initfunc(mpc8260_smc_serial_initialize); | |
| 139 | 136 | serial_initfunc(mpc85xx_serial_initialize); |
| 140 | 137 | serial_initfunc(mpc8xx_serial_initialize); |
| 141 | 138 | serial_initfunc(mxc_serial_initialize); |
include/ioports.h
| 1 | 1 | /* |
| 2 | - * definitions for MPC8260 I/O Ports | |
| 2 | + * definitions for MPC8xxx I/O Ports | |
| 3 | 3 | * |
| 4 | - * (in addition to those provided in <asm/immap_8260.h>) | |
| 5 | - * | |
| 6 | 4 | * Murray.Jensen@cmst.csiro.au, 20-Oct-00 |
| 7 | 5 | */ |
| 8 | 6 | |
| 9 | 7 | /* |
| 10 | 8 | * this structure mirrors the layout of the five port registers in |
| 11 | - * the internal memory map - see iop8260_t in <asm/immap_8260.h> | |
| 9 | + * the internal memory map | |
| 12 | 10 | */ |
| 13 | 11 | typedef struct { |
| 14 | 12 | unsigned int pdir; /* Port Data Direction Register (35-3) */ |
| ... | ... | @@ -46,7 +44,6 @@ |
| 46 | 44 | |
| 47 | 45 | /* |
| 48 | 46 | * a table that contains configuration information for all 32 pins |
| 49 | - * of all four MPC8260 I/O ports. | |
| 50 | 47 | * |
| 51 | 48 | * NOTE: in the second dimension of this table, index 0 refers to pin 31 |
| 52 | 49 | * and index 31 refers to pin 0. this made the code in the table look more |