aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-ppc
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2008-01-25 16:41:00 -0500
committerKumar Gala <galak@kernel.crashing.org>2008-01-28 09:33:09 -0500
commit3155f7f23f7865e64f7eb14e226a2dff8197e51f (patch)
tree1ab72855399616a248c967a15b6a2801a751f2d5 /include/asm-ppc
parent80f4ec7f5b81e7e238acfaf50ac82489b5fcee6f (diff)
[PPC] Remove 83xx from arch/ppc
83xx exists in arch/powerpc as well as cuImage support to boot from a u-boot that doesn't support device trees. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'include/asm-ppc')
-rw-r--r--include/asm-ppc/mpc83xx.h107
-rw-r--r--include/asm-ppc/ppc_sys.h2
-rw-r--r--include/asm-ppc/ppcboot.h5
-rw-r--r--include/asm-ppc/serial.h2
4 files changed, 2 insertions, 114 deletions
diff --git a/include/asm-ppc/mpc83xx.h b/include/asm-ppc/mpc83xx.h
deleted file mode 100644
index c3061972309b..000000000000
--- a/include/asm-ppc/mpc83xx.h
+++ /dev/null
@@ -1,107 +0,0 @@
1/*
2 * include/asm-ppc/mpc83xx.h
3 *
4 * MPC83xx definitions
5 *
6 * Maintainer: Kumar Gala <galak@kernel.crashing.org>
7 *
8 * Copyright 2005 Freescale Semiconductor, Inc
9 *
10 * This program is free software; you can redistribute it and/or modify it
11 * under the terms of the GNU General Public License as published by the
12 * Free Software Foundation; either version 2 of the License, or (at your
13 * option) any later version.
14 */
15
16#ifdef __KERNEL__
17#ifndef __ASM_MPC83xx_H__
18#define __ASM_MPC83xx_H__
19
20#include <asm/mmu.h>
21
22#ifdef CONFIG_83xx
23
24#ifdef CONFIG_MPC834x_SYS
25#include <platforms/83xx/mpc834x_sys.h>
26#endif
27
28/*
29 * The "residual" board information structure the boot loader passes
30 * into the kernel.
31 */
32extern unsigned char __res[];
33
34/* Internal IRQs on MPC83xx OpenPIC */
35/* Not all of these exist on all MPC83xx implementations */
36
37#ifndef MPC83xx_IPIC_IRQ_OFFSET
38#define MPC83xx_IPIC_IRQ_OFFSET 0
39#endif
40
41#define NR_IPIC_INTS 128
42
43#define MPC83xx_IRQ_UART1 ( 9 + MPC83xx_IPIC_IRQ_OFFSET)
44#define MPC83xx_IRQ_UART2 (10 + MPC83xx_IPIC_IRQ_OFFSET)
45#define MPC83xx_IRQ_SEC2 (11 + MPC83xx_IPIC_IRQ_OFFSET)
46#define MPC83xx_IRQ_IIC1 (14 + MPC83xx_IPIC_IRQ_OFFSET)
47#define MPC83xx_IRQ_IIC2 (15 + MPC83xx_IPIC_IRQ_OFFSET)
48#define MPC83xx_IRQ_SPI (16 + MPC83xx_IPIC_IRQ_OFFSET)
49#define MPC83xx_IRQ_EXT1 (17 + MPC83xx_IPIC_IRQ_OFFSET)
50#define MPC83xx_IRQ_EXT2 (18 + MPC83xx_IPIC_IRQ_OFFSET)
51#define MPC83xx_IRQ_EXT3 (19 + MPC83xx_IPIC_IRQ_OFFSET)
52#define MPC83xx_IRQ_EXT4 (20 + MPC83xx_IPIC_IRQ_OFFSET)
53#define MPC83xx_IRQ_EXT5 (21 + MPC83xx_IPIC_IRQ_OFFSET)
54#define MPC83xx_IRQ_EXT6 (22 + MPC83xx_IPIC_IRQ_OFFSET)
55#define MPC83xx_IRQ_EXT7 (23 + MPC83xx_IPIC_IRQ_OFFSET)
56#define MPC83xx_IRQ_TSEC1_TX (32 + MPC83xx_IPIC_IRQ_OFFSET)
57#define MPC83xx_IRQ_TSEC1_RX (33 + MPC83xx_IPIC_IRQ_OFFSET)
58#define MPC83xx_IRQ_TSEC1_ERROR (34 + MPC83xx_IPIC_IRQ_OFFSET)
59#define MPC83xx_IRQ_TSEC2_TX (35 + MPC83xx_IPIC_IRQ_OFFSET)
60#define MPC83xx_IRQ_TSEC2_RX (36 + MPC83xx_IPIC_IRQ_OFFSET)
61#define MPC83xx_IRQ_TSEC2_ERROR (37 + MPC83xx_IPIC_IRQ_OFFSET)
62#define MPC83xx_IRQ_USB2_DR (38 + MPC83xx_IPIC_IRQ_OFFSET)
63#define MPC83xx_IRQ_USB2_MPH (39 + MPC83xx_IPIC_IRQ_OFFSET)
64#define MPC83xx_IRQ_EXT0 (48 + MPC83xx_IPIC_IRQ_OFFSET)
65#define MPC83xx_IRQ_RTC_SEC (64 + MPC83xx_IPIC_IRQ_OFFSET)
66#define MPC83xx_IRQ_PIT (65 + MPC83xx_IPIC_IRQ_OFFSET)
67#define MPC83xx_IRQ_PCI1 (66 + MPC83xx_IPIC_IRQ_OFFSET)
68#define MPC83xx_IRQ_PCI2 (67 + MPC83xx_IPIC_IRQ_OFFSET)
69#define MPC83xx_IRQ_RTC_ALR (68 + MPC83xx_IPIC_IRQ_OFFSET)
70#define MPC83xx_IRQ_MU (69 + MPC83xx_IPIC_IRQ_OFFSET)
71#define MPC83xx_IRQ_SBA (70 + MPC83xx_IPIC_IRQ_OFFSET)
72#define MPC83xx_IRQ_DMA (71 + MPC83xx_IPIC_IRQ_OFFSET)
73#define MPC83xx_IRQ_GTM4 (72 + MPC83xx_IPIC_IRQ_OFFSET)
74#define MPC83xx_IRQ_GTM8 (73 + MPC83xx_IPIC_IRQ_OFFSET)
75#define MPC83xx_IRQ_GPIO1 (74 + MPC83xx_IPIC_IRQ_OFFSET)
76#define MPC83xx_IRQ_GPIO2 (75 + MPC83xx_IPIC_IRQ_OFFSET)
77#define MPC83xx_IRQ_DDR (76 + MPC83xx_IPIC_IRQ_OFFSET)
78#define MPC83xx_IRQ_LBC (77 + MPC83xx_IPIC_IRQ_OFFSET)
79#define MPC83xx_IRQ_GTM2 (78 + MPC83xx_IPIC_IRQ_OFFSET)
80#define MPC83xx_IRQ_GTM6 (79 + MPC83xx_IPIC_IRQ_OFFSET)
81#define MPC83xx_IRQ_PMC (80 + MPC83xx_IPIC_IRQ_OFFSET)
82#define MPC83xx_IRQ_GTM3 (84 + MPC83xx_IPIC_IRQ_OFFSET)
83#define MPC83xx_IRQ_GTM7 (85 + MPC83xx_IPIC_IRQ_OFFSET)
84#define MPC83xx_IRQ_GTM1 (90 + MPC83xx_IPIC_IRQ_OFFSET)
85#define MPC83xx_IRQ_GTM5 (91 + MPC83xx_IPIC_IRQ_OFFSET)
86
87#define MPC83xx_CCSRBAR_SIZE (1024*1024)
88
89/* Let modules/drivers get at immrbar (physical) */
90extern phys_addr_t immrbar;
91
92enum ppc_sys_devices {
93 MPC83xx_TSEC1,
94 MPC83xx_TSEC2,
95 MPC83xx_IIC1,
96 MPC83xx_IIC2,
97 MPC83xx_DUART,
98 MPC83xx_SEC2,
99 MPC83xx_USB2_DR,
100 MPC83xx_USB2_MPH,
101 MPC83xx_MDIO,
102 NUM_PPC_SYS_DEVS,
103};
104
105#endif /* CONFIG_83xx */
106#endif /* __ASM_MPC83xx_H__ */
107#endif /* __KERNEL__ */
diff --git a/include/asm-ppc/ppc_sys.h b/include/asm-ppc/ppc_sys.h
index de99e92d627b..80c5851972f5 100644
--- a/include/asm-ppc/ppc_sys.h
+++ b/include/asm-ppc/ppc_sys.h
@@ -23,8 +23,6 @@
23 23
24#if defined(CONFIG_8260) 24#if defined(CONFIG_8260)
25#include <asm/mpc8260.h> 25#include <asm/mpc8260.h>
26#elif defined(CONFIG_83xx)
27#include <asm/mpc83xx.h>
28#elif defined(CONFIG_85xx) 26#elif defined(CONFIG_85xx)
29#include <asm/mpc85xx.h> 27#include <asm/mpc85xx.h>
30#elif defined(CONFIG_8xx) 28#elif defined(CONFIG_8xx)
diff --git a/include/asm-ppc/ppcboot.h b/include/asm-ppc/ppcboot.h
index 6b7b63f71daa..18d04e8164ca 100644
--- a/include/asm-ppc/ppcboot.h
+++ b/include/asm-ppc/ppcboot.h
@@ -38,8 +38,7 @@ typedef struct bd_info {
38 unsigned long bi_flashoffset; /* reserved area for startup monitor */ 38 unsigned long bi_flashoffset; /* reserved area for startup monitor */
39 unsigned long bi_sramstart; /* start of SRAM memory */ 39 unsigned long bi_sramstart; /* start of SRAM memory */
40 unsigned long bi_sramsize; /* size of SRAM memory */ 40 unsigned long bi_sramsize; /* size of SRAM memory */
41#if defined(CONFIG_8xx) || defined(CONFIG_CPM2) || defined(CONFIG_85xx) ||\ 41#if defined(CONFIG_8xx) || defined(CONFIG_CPM2) || defined(CONFIG_85xx)
42 defined(CONFIG_83xx)
43 unsigned long bi_immr_base; /* base of IMMR register */ 42 unsigned long bi_immr_base; /* base of IMMR register */
44#endif 43#endif
45#if defined(CONFIG_PPC_MPC52xx) 44#if defined(CONFIG_PPC_MPC52xx)
@@ -74,7 +73,7 @@ typedef struct bd_info {
74 hymod_conf_t bi_hymod_conf; /* hymod configuration information */ 73 hymod_conf_t bi_hymod_conf; /* hymod configuration information */
75#endif 74#endif
76#if defined(CONFIG_EVB64260) || defined(CONFIG_405EP) || defined(CONFIG_44x) || \ 75#if defined(CONFIG_EVB64260) || defined(CONFIG_405EP) || defined(CONFIG_44x) || \
77 defined(CONFIG_85xx) || defined(CONFIG_83xx) 76 defined(CONFIG_85xx)
78 /* second onboard ethernet port */ 77 /* second onboard ethernet port */
79 unsigned char bi_enet1addr[6]; 78 unsigned char bi_enet1addr[6];
80#endif 79#endif
diff --git a/include/asm-ppc/serial.h b/include/asm-ppc/serial.h
index 8fc1b546613d..6220ef9ab8bc 100644
--- a/include/asm-ppc/serial.h
+++ b/include/asm-ppc/serial.h
@@ -29,8 +29,6 @@
29#include <platforms/spruce.h> 29#include <platforms/spruce.h>
30#elif defined(CONFIG_4xx) 30#elif defined(CONFIG_4xx)
31#include <asm/ibm4xx.h> 31#include <asm/ibm4xx.h>
32#elif defined(CONFIG_83xx)
33#include <asm/mpc83xx.h>
34#elif defined(CONFIG_85xx) 32#elif defined(CONFIG_85xx)
35#include <asm/mpc85xx.h> 33#include <asm/mpc85xx.h>
36#elif defined(CONFIG_RADSTONE_PPC7D) 34#elif defined(CONFIG_RADSTONE_PPC7D)
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-12 10:49:21 -0500