diff options
Diffstat (limited to 'arch/ppc')
28 files changed, 1979 insertions, 63 deletions
diff --git a/arch/ppc/8xx_io/Kconfig b/arch/ppc/8xx_io/Kconfig index 9e2227ec3b34..57dacf978532 100644 --- a/arch/ppc/8xx_io/Kconfig +++ b/arch/ppc/8xx_io/Kconfig | |||
@@ -69,9 +69,9 @@ config FEC_QS6612 | |||
69 | 69 | ||
70 | config ENET_BIG_BUFFERS | 70 | config ENET_BIG_BUFFERS |
71 | bool "Use Big CPM Ethernet Buffers" | 71 | bool "Use Big CPM Ethernet Buffers" |
72 | depends on NET_ETHERNET | 72 | depends on SCC_ENET || FEC_ENET |
73 | help | 73 | help |
74 | Allocate large buffers for MPC8xx Etherenet. Increases throughput | 74 | Allocate large buffers for MPC8xx Ethernet. Increases throughput |
75 | and decreases the likelihood of dropped packets, but costs memory. | 75 | and decreases the likelihood of dropped packets, but costs memory. |
76 | 76 | ||
77 | config HTDMSOUND | 77 | config HTDMSOUND |
diff --git a/arch/ppc/8xx_io/commproc.c b/arch/ppc/8xx_io/commproc.c index 0cc2e7a9cb11..11726e2a4ec8 100644 --- a/arch/ppc/8xx_io/commproc.c +++ b/arch/ppc/8xx_io/commproc.c | |||
@@ -39,8 +39,6 @@ | |||
39 | #include <asm/tlbflush.h> | 39 | #include <asm/tlbflush.h> |
40 | #include <asm/rheap.h> | 40 | #include <asm/rheap.h> |
41 | 41 | ||
42 | extern int get_pteptr(struct mm_struct *mm, unsigned long addr, pte_t **ptep); | ||
43 | |||
44 | static void m8xx_cpm_dpinit(void); | 42 | static void m8xx_cpm_dpinit(void); |
45 | static uint host_buffer; /* One page of host buffer */ | 43 | static uint host_buffer; /* One page of host buffer */ |
46 | static uint host_end; /* end + 1 */ | 44 | static uint host_end; /* end + 1 */ |
@@ -108,14 +106,11 @@ struct hw_interrupt_type cpm_pic = { | |||
108 | .end = cpm_eoi, | 106 | .end = cpm_eoi, |
109 | }; | 107 | }; |
110 | 108 | ||
111 | extern void flush_tlb_page(struct vm_area_struct *vma, unsigned long vmaddr); | ||
112 | |||
113 | void | 109 | void |
114 | m8xx_cpm_reset(uint bootpage) | 110 | m8xx_cpm_reset(void) |
115 | { | 111 | { |
116 | volatile immap_t *imp; | 112 | volatile immap_t *imp; |
117 | volatile cpm8xx_t *commproc; | 113 | volatile cpm8xx_t *commproc; |
118 | pte_t *pte; | ||
119 | 114 | ||
120 | imp = (immap_t *)IMAP_ADDR; | 115 | imp = (immap_t *)IMAP_ADDR; |
121 | commproc = (cpm8xx_t *)&imp->im_cpm; | 116 | commproc = (cpm8xx_t *)&imp->im_cpm; |
@@ -143,17 +138,6 @@ m8xx_cpm_reset(uint bootpage) | |||
143 | /* Reclaim the DP memory for our use. */ | 138 | /* Reclaim the DP memory for our use. */ |
144 | m8xx_cpm_dpinit(); | 139 | m8xx_cpm_dpinit(); |
145 | 140 | ||
146 | /* get the PTE for the bootpage */ | ||
147 | if (!get_pteptr(&init_mm, bootpage, &pte)) | ||
148 | panic("get_pteptr failed\n"); | ||
149 | |||
150 | /* and make it uncachable */ | ||
151 | pte_val(*pte) |= _PAGE_NO_CACHE; | ||
152 | _tlbie(bootpage); | ||
153 | |||
154 | host_buffer = bootpage; | ||
155 | host_end = host_buffer + PAGE_SIZE; | ||
156 | |||
157 | /* Tell everyone where the comm processor resides. | 141 | /* Tell everyone where the comm processor resides. |
158 | */ | 142 | */ |
159 | cpmp = (cpm8xx_t *)commproc; | 143 | cpmp = (cpm8xx_t *)commproc; |
@@ -384,8 +368,6 @@ static rh_info_t cpm_dpmem_info; | |||
384 | 368 | ||
385 | void m8xx_cpm_dpinit(void) | 369 | void m8xx_cpm_dpinit(void) |
386 | { | 370 | { |
387 | cpm8xx_t *cp = &((immap_t *)IMAP_ADDR)->im_cpm; | ||
388 | |||
389 | spin_lock_init(&cpm_dpmem_lock); | 371 | spin_lock_init(&cpm_dpmem_lock); |
390 | 372 | ||
391 | /* Initialize the info header */ | 373 | /* Initialize the info header */ |
diff --git a/arch/ppc/8xx_io/fec.c b/arch/ppc/8xx_io/fec.c index 0730392dcc20..62f68d6181c6 100644 --- a/arch/ppc/8xx_io/fec.c +++ b/arch/ppc/8xx_io/fec.c | |||
@@ -173,7 +173,7 @@ struct fec_enet_private { | |||
173 | uint phy_status; | 173 | uint phy_status; |
174 | uint phy_speed; | 174 | uint phy_speed; |
175 | phy_info_t *phy; | 175 | phy_info_t *phy; |
176 | struct tq_struct phy_task; | 176 | struct work_struct phy_task; |
177 | 177 | ||
178 | uint sequence_done; | 178 | uint sequence_done; |
179 | 179 | ||
@@ -199,7 +199,8 @@ static int fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev); | |||
199 | #ifdef CONFIG_USE_MDIO | 199 | #ifdef CONFIG_USE_MDIO |
200 | static void fec_enet_mii(struct net_device *dev); | 200 | static void fec_enet_mii(struct net_device *dev); |
201 | #endif /* CONFIG_USE_MDIO */ | 201 | #endif /* CONFIG_USE_MDIO */ |
202 | static void fec_enet_interrupt(int irq, void * dev_id, struct pt_regs * regs); | 202 | static irqreturn_t fec_enet_interrupt(int irq, void * dev_id, |
203 | struct pt_regs * regs); | ||
203 | #ifdef CONFIG_FEC_PACKETHOOK | 204 | #ifdef CONFIG_FEC_PACKETHOOK |
204 | static void fec_enet_tx(struct net_device *dev, __u32 regval); | 205 | static void fec_enet_tx(struct net_device *dev, __u32 regval); |
205 | static void fec_enet_rx(struct net_device *dev, __u32 regval); | 206 | static void fec_enet_rx(struct net_device *dev, __u32 regval); |
@@ -471,7 +472,7 @@ fec_timeout(struct net_device *dev) | |||
471 | /* The interrupt handler. | 472 | /* The interrupt handler. |
472 | * This is called from the MPC core interrupt. | 473 | * This is called from the MPC core interrupt. |
473 | */ | 474 | */ |
474 | static void | 475 | static irqreturn_t |
475 | fec_enet_interrupt(int irq, void * dev_id, struct pt_regs * regs) | 476 | fec_enet_interrupt(int irq, void * dev_id, struct pt_regs * regs) |
476 | { | 477 | { |
477 | struct net_device *dev = dev_id; | 478 | struct net_device *dev = dev_id; |
@@ -525,6 +526,7 @@ printk("%s[%d] %s: unexpected FEC_ENET_MII event\n", __FILE__,__LINE__,__FUNCTIO | |||
525 | } | 526 | } |
526 | 527 | ||
527 | } | 528 | } |
529 | return IRQ_RETVAL(IRQ_HANDLED); | ||
528 | } | 530 | } |
529 | 531 | ||
530 | 532 | ||
@@ -1263,8 +1265,9 @@ static void mii_display_status(struct net_device *dev) | |||
1263 | printk(".\n"); | 1265 | printk(".\n"); |
1264 | } | 1266 | } |
1265 | 1267 | ||
1266 | static void mii_display_config(struct net_device *dev) | 1268 | static void mii_display_config(void *priv) |
1267 | { | 1269 | { |
1270 | struct net_device *dev = (struct net_device *)priv; | ||
1268 | struct fec_enet_private *fep = dev->priv; | 1271 | struct fec_enet_private *fep = dev->priv; |
1269 | volatile uint *s = &(fep->phy_status); | 1272 | volatile uint *s = &(fep->phy_status); |
1270 | 1273 | ||
@@ -1294,8 +1297,9 @@ static void mii_display_config(struct net_device *dev) | |||
1294 | fep->sequence_done = 1; | 1297 | fep->sequence_done = 1; |
1295 | } | 1298 | } |
1296 | 1299 | ||
1297 | static void mii_relink(struct net_device *dev) | 1300 | static void mii_relink(void *priv) |
1298 | { | 1301 | { |
1302 | struct net_device *dev = (struct net_device *)priv; | ||
1299 | struct fec_enet_private *fep = dev->priv; | 1303 | struct fec_enet_private *fep = dev->priv; |
1300 | int duplex; | 1304 | int duplex; |
1301 | 1305 | ||
@@ -1323,18 +1327,16 @@ static void mii_queue_relink(uint mii_reg, struct net_device *dev) | |||
1323 | { | 1327 | { |
1324 | struct fec_enet_private *fep = dev->priv; | 1328 | struct fec_enet_private *fep = dev->priv; |
1325 | 1329 | ||
1326 | fep->phy_task.routine = (void *)mii_relink; | 1330 | INIT_WORK(&fep->phy_task, mii_relink, (void *)dev); |
1327 | fep->phy_task.data = dev; | 1331 | schedule_work(&fep->phy_task); |
1328 | schedule_task(&fep->phy_task); | ||
1329 | } | 1332 | } |
1330 | 1333 | ||
1331 | static void mii_queue_config(uint mii_reg, struct net_device *dev) | 1334 | static void mii_queue_config(uint mii_reg, struct net_device *dev) |
1332 | { | 1335 | { |
1333 | struct fec_enet_private *fep = dev->priv; | 1336 | struct fec_enet_private *fep = dev->priv; |
1334 | 1337 | ||
1335 | fep->phy_task.routine = (void *)mii_display_config; | 1338 | INIT_WORK(&fep->phy_task, mii_display_config, (void *)dev); |
1336 | fep->phy_task.data = dev; | 1339 | schedule_work(&fep->phy_task); |
1337 | schedule_task(&fep->phy_task); | ||
1338 | } | 1340 | } |
1339 | 1341 | ||
1340 | 1342 | ||
@@ -1403,11 +1405,11 @@ mii_discover_phy(uint mii_reg, struct net_device *dev) | |||
1403 | 1405 | ||
1404 | /* This interrupt occurs when the PHY detects a link change. | 1406 | /* This interrupt occurs when the PHY detects a link change. |
1405 | */ | 1407 | */ |
1406 | static void | 1408 | static |
1407 | #ifdef CONFIG_RPXCLASSIC | 1409 | #ifdef CONFIG_RPXCLASSIC |
1408 | mii_link_interrupt(void *dev_id) | 1410 | void mii_link_interrupt(void *dev_id) |
1409 | #else | 1411 | #else |
1410 | mii_link_interrupt(int irq, void * dev_id, struct pt_regs * regs) | 1412 | irqreturn_t mii_link_interrupt(int irq, void * dev_id, struct pt_regs * regs) |
1411 | #endif | 1413 | #endif |
1412 | { | 1414 | { |
1413 | #ifdef CONFIG_USE_MDIO | 1415 | #ifdef CONFIG_USE_MDIO |
@@ -1440,6 +1442,9 @@ mii_link_interrupt(int irq, void * dev_id, struct pt_regs * regs) | |||
1440 | printk("%s[%d] %s: unexpected Link interrupt\n", __FILE__,__LINE__,__FUNCTION__); | 1442 | printk("%s[%d] %s: unexpected Link interrupt\n", __FILE__,__LINE__,__FUNCTION__); |
1441 | #endif /* CONFIG_USE_MDIO */ | 1443 | #endif /* CONFIG_USE_MDIO */ |
1442 | 1444 | ||
1445 | #ifndef CONFIG_RPXCLASSIC | ||
1446 | return IRQ_RETVAL(IRQ_HANDLED); | ||
1447 | #endif /* CONFIG_RPXCLASSIC */ | ||
1443 | } | 1448 | } |
1444 | 1449 | ||
1445 | static int | 1450 | static int |
@@ -1575,7 +1580,7 @@ static int __init fec_enet_init(void) | |||
1575 | struct fec_enet_private *fep; | 1580 | struct fec_enet_private *fep; |
1576 | int i, j, k, err; | 1581 | int i, j, k, err; |
1577 | unsigned char *eap, *iap, *ba; | 1582 | unsigned char *eap, *iap, *ba; |
1578 | unsigned long mem_addr; | 1583 | dma_addr_t mem_addr; |
1579 | volatile cbd_t *bdp; | 1584 | volatile cbd_t *bdp; |
1580 | cbd_t *cbd_base; | 1585 | cbd_t *cbd_base; |
1581 | volatile immap_t *immap; | 1586 | volatile immap_t *immap; |
@@ -1640,7 +1645,8 @@ static int __init fec_enet_init(void) | |||
1640 | printk("FEC initialization failed.\n"); | 1645 | printk("FEC initialization failed.\n"); |
1641 | return 1; | 1646 | return 1; |
1642 | } | 1647 | } |
1643 | cbd_base = (cbd_t *)consistent_alloc(GFP_KERNEL, PAGE_SIZE, &mem_addr); | 1648 | cbd_base = (cbd_t *)dma_alloc_coherent(dev->class_dev.dev, PAGE_SIZE, |
1649 | &mem_addr, GFP_KERNEL); | ||
1644 | 1650 | ||
1645 | /* Set receive and transmit descriptor base. | 1651 | /* Set receive and transmit descriptor base. |
1646 | */ | 1652 | */ |
@@ -1657,7 +1663,10 @@ static int __init fec_enet_init(void) | |||
1657 | 1663 | ||
1658 | /* Allocate a page. | 1664 | /* Allocate a page. |
1659 | */ | 1665 | */ |
1660 | ba = (unsigned char *)consistent_alloc(GFP_KERNEL, PAGE_SIZE, &mem_addr); | 1666 | ba = (unsigned char *)dma_alloc_coherent(dev->class_dev.dev, |
1667 | PAGE_SIZE, | ||
1668 | &mem_addr, | ||
1669 | GFP_KERNEL); | ||
1661 | /* BUG: no check for failure */ | 1670 | /* BUG: no check for failure */ |
1662 | 1671 | ||
1663 | /* Initialize the BD for every fragment in the page. | 1672 | /* Initialize the BD for every fragment in the page. |
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index 2c2da9b43b7a..f6db3b385fea 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig | |||
@@ -558,6 +558,7 @@ config PPC_MULTIPLATFORM | |||
558 | 558 | ||
559 | config APUS | 559 | config APUS |
560 | bool "Amiga-APUS" | 560 | bool "Amiga-APUS" |
561 | depends on BROKEN | ||
561 | help | 562 | help |
562 | Select APUS if configuring for a PowerUP Amiga. | 563 | Select APUS if configuring for a PowerUP Amiga. |
563 | More information is available at: | 564 | More information is available at: |
@@ -647,6 +648,7 @@ config PAL4 | |||
647 | 648 | ||
648 | config GEMINI | 649 | config GEMINI |
649 | bool "Synergy-Gemini" | 650 | bool "Synergy-Gemini" |
651 | depends on BROKEN | ||
650 | help | 652 | help |
651 | Select Gemini if configuring for a Synergy Microsystems' Gemini | 653 | Select Gemini if configuring for a Synergy Microsystems' Gemini |
652 | series Single Board Computer. More information is available at: | 654 | series Single Board Computer. More information is available at: |
diff --git a/arch/ppc/boot/simple/Makefile b/arch/ppc/boot/simple/Makefile index 991b4cbb83c8..d4dc4fa79647 100644 --- a/arch/ppc/boot/simple/Makefile +++ b/arch/ppc/boot/simple/Makefile | |||
@@ -61,6 +61,12 @@ zimageinitrd-$(CONFIG_IBM_OPENBIOS) := zImage.initrd-TREE | |||
61 | end-$(CONFIG_EMBEDDEDBOOT) := embedded | 61 | end-$(CONFIG_EMBEDDEDBOOT) := embedded |
62 | misc-$(CONFIG_EMBEDDEDBOOT) := misc-embedded.o | 62 | misc-$(CONFIG_EMBEDDEDBOOT) := misc-embedded.o |
63 | 63 | ||
64 | zimage-$(CONFIG_BAMBOO) := zImage-TREE | ||
65 | zimageinitrd-$(CONFIG_BAMBOO) := zImage.initrd-TREE | ||
66 | end-$(CONFIG_BAMBOO) := bamboo | ||
67 | entrypoint-$(CONFIG_BAMBOO) := 0x01000000 | ||
68 | extra.o-$(CONFIG_BAMBOO) := pibs.o | ||
69 | |||
64 | zimage-$(CONFIG_EBONY) := zImage-TREE | 70 | zimage-$(CONFIG_EBONY) := zImage-TREE |
65 | zimageinitrd-$(CONFIG_EBONY) := zImage.initrd-TREE | 71 | zimageinitrd-$(CONFIG_EBONY) := zImage.initrd-TREE |
66 | end-$(CONFIG_EBONY) := ebony | 72 | end-$(CONFIG_EBONY) := ebony |
diff --git a/arch/ppc/boot/simple/pibs.c b/arch/ppc/boot/simple/pibs.c index 1348740e503f..67222d57c345 100644 --- a/arch/ppc/boot/simple/pibs.c +++ b/arch/ppc/boot/simple/pibs.c | |||
@@ -91,9 +91,11 @@ load_kernel(unsigned long load_addr, int num_words, unsigned long cksum, | |||
91 | 91 | ||
92 | mac64 = simple_strtoull((char *)PIBS_MAC_BASE, 0, 16); | 92 | mac64 = simple_strtoull((char *)PIBS_MAC_BASE, 0, 16); |
93 | memcpy(hold_residual->bi_enetaddr, (char *)&mac64+2, 6); | 93 | memcpy(hold_residual->bi_enetaddr, (char *)&mac64+2, 6); |
94 | #ifdef CONFIG_440GX | 94 | #if defined(CONFIG_440GX) || defined(CONFIG_440EP) |
95 | mac64 = simple_strtoull((char *)(PIBS_MAC_BASE+PIBS_MAC_OFFSET), 0, 16); | 95 | mac64 = simple_strtoull((char *)(PIBS_MAC_BASE+PIBS_MAC_OFFSET), 0, 16); |
96 | memcpy(hold_residual->bi_enet1addr, (char *)&mac64+2, 6); | 96 | memcpy(hold_residual->bi_enet1addr, (char *)&mac64+2, 6); |
97 | #endif | ||
98 | #ifdef CONFIG_440GX | ||
97 | mac64 = simple_strtoull((char *)(PIBS_MAC_BASE+PIBS_MAC_OFFSET*2), 0, 16); | 99 | mac64 = simple_strtoull((char *)(PIBS_MAC_BASE+PIBS_MAC_OFFSET*2), 0, 16); |
98 | memcpy(hold_residual->bi_enet2addr, (char *)&mac64+2, 6); | 100 | memcpy(hold_residual->bi_enet2addr, (char *)&mac64+2, 6); |
99 | mac64 = simple_strtoull((char *)(PIBS_MAC_BASE+PIBS_MAC_OFFSET*3), 0, 16); | 101 | mac64 = simple_strtoull((char *)(PIBS_MAC_BASE+PIBS_MAC_OFFSET*3), 0, 16); |
diff --git a/arch/ppc/configs/bamboo_defconfig b/arch/ppc/configs/bamboo_defconfig new file mode 100644 index 000000000000..0ba4e70d50b6 --- /dev/null +++ b/arch/ppc/configs/bamboo_defconfig | |||
@@ -0,0 +1,943 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.12 | ||
4 | # Tue Jun 28 15:24:25 2005 | ||
5 | # | ||
6 | CONFIG_MMU=y | ||
7 | CONFIG_GENERIC_HARDIRQS=y | ||
8 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | ||
9 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
10 | CONFIG_HAVE_DEC_LOCK=y | ||
11 | CONFIG_PPC=y | ||
12 | CONFIG_PPC32=y | ||
13 | CONFIG_GENERIC_NVRAM=y | ||
14 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
15 | |||
16 | # | ||
17 | # Code maturity level options | ||
18 | # | ||
19 | CONFIG_EXPERIMENTAL=y | ||
20 | CONFIG_CLEAN_COMPILE=y | ||
21 | CONFIG_BROKEN_ON_SMP=y | ||
22 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
23 | |||
24 | # | ||
25 | # General setup | ||
26 | # | ||
27 | CONFIG_LOCALVERSION="" | ||
28 | CONFIG_SWAP=y | ||
29 | CONFIG_SYSVIPC=y | ||
30 | # CONFIG_POSIX_MQUEUE is not set | ||
31 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
32 | CONFIG_SYSCTL=y | ||
33 | # CONFIG_AUDIT is not set | ||
34 | # CONFIG_HOTPLUG is not set | ||
35 | CONFIG_KOBJECT_UEVENT=y | ||
36 | # CONFIG_IKCONFIG is not set | ||
37 | CONFIG_EMBEDDED=y | ||
38 | CONFIG_KALLSYMS=y | ||
39 | # CONFIG_KALLSYMS_ALL is not set | ||
40 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
41 | CONFIG_PRINTK=y | ||
42 | CONFIG_BUG=y | ||
43 | CONFIG_BASE_FULL=y | ||
44 | CONFIG_FUTEX=y | ||
45 | CONFIG_EPOLL=y | ||
46 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
47 | CONFIG_SHMEM=y | ||
48 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
49 | CONFIG_CC_ALIGN_LABELS=0 | ||
50 | CONFIG_CC_ALIGN_LOOPS=0 | ||
51 | CONFIG_CC_ALIGN_JUMPS=0 | ||
52 | # CONFIG_TINY_SHMEM is not set | ||
53 | CONFIG_BASE_SMALL=0 | ||
54 | |||
55 | # | ||
56 | # Loadable module support | ||
57 | # | ||
58 | CONFIG_MODULES=y | ||
59 | CONFIG_MODULE_UNLOAD=y | ||
60 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
61 | CONFIG_OBSOLETE_MODPARM=y | ||
62 | # CONFIG_MODVERSIONS is not set | ||
63 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
64 | CONFIG_KMOD=y | ||
65 | |||
66 | # | ||
67 | # Processor | ||
68 | # | ||
69 | # CONFIG_6xx is not set | ||
70 | # CONFIG_40x is not set | ||
71 | CONFIG_44x=y | ||
72 | # CONFIG_POWER3 is not set | ||
73 | # CONFIG_POWER4 is not set | ||
74 | # CONFIG_8xx is not set | ||
75 | # CONFIG_E200 is not set | ||
76 | # CONFIG_E500 is not set | ||
77 | CONFIG_PPC_FPU=y | ||
78 | CONFIG_BOOKE=y | ||
79 | CONFIG_PTE_64BIT=y | ||
80 | CONFIG_PHYS_64BIT=y | ||
81 | # CONFIG_MATH_EMULATION is not set | ||
82 | # CONFIG_KEXEC is not set | ||
83 | # CONFIG_CPU_FREQ is not set | ||
84 | CONFIG_4xx=y | ||
85 | |||
86 | # | ||
87 | # IBM 4xx options | ||
88 | # | ||
89 | CONFIG_BAMBOO=y | ||
90 | # CONFIG_EBONY is not set | ||
91 | # CONFIG_LUAN is not set | ||
92 | # CONFIG_OCOTEA is not set | ||
93 | CONFIG_440EP=y | ||
94 | CONFIG_440=y | ||
95 | CONFIG_IBM440EP_ERR42=y | ||
96 | CONFIG_IBM_OCP=y | ||
97 | # CONFIG_PPC4xx_DMA is not set | ||
98 | CONFIG_PPC_GEN550=y | ||
99 | # CONFIG_PM is not set | ||
100 | CONFIG_NOT_COHERENT_CACHE=y | ||
101 | |||
102 | # | ||
103 | # Platform options | ||
104 | # | ||
105 | # CONFIG_PC_KEYBOARD is not set | ||
106 | # CONFIG_SMP is not set | ||
107 | # CONFIG_PREEMPT is not set | ||
108 | # CONFIG_HIGHMEM is not set | ||
109 | CONFIG_SELECT_MEMORY_MODEL=y | ||
110 | CONFIG_FLATMEM_MANUAL=y | ||
111 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
112 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
113 | CONFIG_FLATMEM=y | ||
114 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
115 | CONFIG_BINFMT_ELF=y | ||
116 | # CONFIG_BINFMT_MISC is not set | ||
117 | CONFIG_CMDLINE_BOOL=y | ||
118 | CONFIG_CMDLINE="ip=on" | ||
119 | CONFIG_SECCOMP=y | ||
120 | CONFIG_ISA_DMA_API=y | ||
121 | |||
122 | # | ||
123 | # Bus options | ||
124 | # | ||
125 | CONFIG_PCI=y | ||
126 | CONFIG_PCI_DOMAINS=y | ||
127 | # CONFIG_PCI_LEGACY_PROC is not set | ||
128 | # CONFIG_PCI_NAMES is not set | ||
129 | # CONFIG_PCI_DEBUG is not set | ||
130 | |||
131 | # | ||
132 | # PCCARD (PCMCIA/CardBus) support | ||
133 | # | ||
134 | # CONFIG_PCCARD is not set | ||
135 | |||
136 | # | ||
137 | # Advanced setup | ||
138 | # | ||
139 | # CONFIG_ADVANCED_OPTIONS is not set | ||
140 | |||
141 | # | ||
142 | # Default settings for advanced configuration options are used | ||
143 | # | ||
144 | CONFIG_HIGHMEM_START=0xfe000000 | ||
145 | CONFIG_LOWMEM_SIZE=0x30000000 | ||
146 | CONFIG_KERNEL_START=0xc0000000 | ||
147 | CONFIG_TASK_SIZE=0x80000000 | ||
148 | CONFIG_CONSISTENT_START=0xff100000 | ||
149 | CONFIG_CONSISTENT_SIZE=0x00200000 | ||
150 | CONFIG_BOOT_LOAD=0x01000000 | ||
151 | |||
152 | # | ||
153 | # Device Drivers | ||
154 | # | ||
155 | |||
156 | # | ||
157 | # Generic Driver Options | ||
158 | # | ||
159 | # CONFIG_STANDALONE is not set | ||
160 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
161 | # CONFIG_FW_LOADER is not set | ||
162 | # CONFIG_DEBUG_DRIVER is not set | ||
163 | |||
164 | # | ||
165 | # Memory Technology Devices (MTD) | ||
166 | # | ||
167 | # CONFIG_MTD is not set | ||
168 | |||
169 | # | ||
170 | # Parallel port support | ||
171 | # | ||
172 | # CONFIG_PARPORT is not set | ||
173 | |||
174 | # | ||
175 | # Plug and Play support | ||
176 | # | ||
177 | |||
178 | # | ||
179 | # Block devices | ||
180 | # | ||
181 | # CONFIG_BLK_DEV_FD is not set | ||
182 | # CONFIG_BLK_CPQ_DA is not set | ||
183 | # CONFIG_BLK_CPQ_CISS_DA is not set | ||
184 | # CONFIG_BLK_DEV_DAC960 is not set | ||
185 | # CONFIG_BLK_DEV_UMEM is not set | ||
186 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
187 | # CONFIG_BLK_DEV_LOOP is not set | ||
188 | # CONFIG_BLK_DEV_NBD is not set | ||
189 | # CONFIG_BLK_DEV_SX8 is not set | ||
190 | # CONFIG_BLK_DEV_UB is not set | ||
191 | # CONFIG_BLK_DEV_RAM is not set | ||
192 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
193 | CONFIG_INITRAMFS_SOURCE="" | ||
194 | # CONFIG_LBD is not set | ||
195 | # CONFIG_CDROM_PKTCDVD is not set | ||
196 | |||
197 | # | ||
198 | # IO Schedulers | ||
199 | # | ||
200 | CONFIG_IOSCHED_NOOP=y | ||
201 | CONFIG_IOSCHED_AS=y | ||
202 | CONFIG_IOSCHED_DEADLINE=y | ||
203 | CONFIG_IOSCHED_CFQ=y | ||
204 | # CONFIG_ATA_OVER_ETH is not set | ||
205 | |||
206 | # | ||
207 | # ATA/ATAPI/MFM/RLL support | ||
208 | # | ||
209 | CONFIG_IDE=y | ||
210 | CONFIG_BLK_DEV_IDE=y | ||
211 | |||
212 | # | ||
213 | # Please see Documentation/ide.txt for help/info on IDE drives | ||
214 | # | ||
215 | # CONFIG_BLK_DEV_IDE_SATA is not set | ||
216 | CONFIG_BLK_DEV_IDEDISK=y | ||
217 | # CONFIG_IDEDISK_MULTI_MODE is not set | ||
218 | # CONFIG_BLK_DEV_IDECD is not set | ||
219 | # CONFIG_BLK_DEV_IDETAPE is not set | ||
220 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | ||
221 | # CONFIG_BLK_DEV_IDESCSI is not set | ||
222 | # CONFIG_IDE_TASK_IOCTL is not set | ||
223 | |||
224 | # | ||
225 | # IDE chipset support/bugfixes | ||
226 | # | ||
227 | CONFIG_IDE_GENERIC=y | ||
228 | CONFIG_BLK_DEV_IDEPCI=y | ||
229 | # CONFIG_IDEPCI_SHARE_IRQ is not set | ||
230 | # CONFIG_BLK_DEV_OFFBOARD is not set | ||
231 | # CONFIG_BLK_DEV_GENERIC is not set | ||
232 | # CONFIG_BLK_DEV_OPTI621 is not set | ||
233 | # CONFIG_BLK_DEV_SL82C105 is not set | ||
234 | CONFIG_BLK_DEV_IDEDMA_PCI=y | ||
235 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | ||
236 | # CONFIG_IDEDMA_PCI_AUTO is not set | ||
237 | # CONFIG_BLK_DEV_AEC62XX is not set | ||
238 | # CONFIG_BLK_DEV_ALI15X3 is not set | ||
239 | # CONFIG_BLK_DEV_AMD74XX is not set | ||
240 | CONFIG_BLK_DEV_CMD64X=y | ||
241 | # CONFIG_BLK_DEV_TRIFLEX is not set | ||
242 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
243 | # CONFIG_BLK_DEV_CS5520 is not set | ||
244 | # CONFIG_BLK_DEV_CS5530 is not set | ||
245 | # CONFIG_BLK_DEV_HPT34X is not set | ||
246 | # CONFIG_BLK_DEV_HPT366 is not set | ||
247 | # CONFIG_BLK_DEV_SC1200 is not set | ||
248 | # CONFIG_BLK_DEV_PIIX is not set | ||
249 | # CONFIG_BLK_DEV_IT821X is not set | ||
250 | # CONFIG_BLK_DEV_NS87415 is not set | ||
251 | # CONFIG_BLK_DEV_PDC202XX_OLD is not set | ||
252 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set | ||
253 | # CONFIG_BLK_DEV_SVWKS is not set | ||
254 | # CONFIG_BLK_DEV_SIIMAGE is not set | ||
255 | # CONFIG_BLK_DEV_SLC90E66 is not set | ||
256 | # CONFIG_BLK_DEV_TRM290 is not set | ||
257 | # CONFIG_BLK_DEV_VIA82CXXX is not set | ||
258 | # CONFIG_IDE_ARM is not set | ||
259 | CONFIG_BLK_DEV_IDEDMA=y | ||
260 | # CONFIG_IDEDMA_IVB is not set | ||
261 | # CONFIG_IDEDMA_AUTO is not set | ||
262 | # CONFIG_BLK_DEV_HD is not set | ||
263 | |||
264 | # | ||
265 | # SCSI device support | ||
266 | # | ||
267 | CONFIG_SCSI=y | ||
268 | CONFIG_SCSI_PROC_FS=y | ||
269 | |||
270 | # | ||
271 | # SCSI support type (disk, tape, CD-ROM) | ||
272 | # | ||
273 | # CONFIG_BLK_DEV_SD is not set | ||
274 | CONFIG_CHR_DEV_ST=y | ||
275 | # CONFIG_CHR_DEV_OSST is not set | ||
276 | # CONFIG_BLK_DEV_SR is not set | ||
277 | # CONFIG_CHR_DEV_SG is not set | ||
278 | # CONFIG_CHR_DEV_SCH is not set | ||
279 | |||
280 | # | ||
281 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
282 | # | ||
283 | # CONFIG_SCSI_MULTI_LUN is not set | ||
284 | # CONFIG_SCSI_CONSTANTS is not set | ||
285 | # CONFIG_SCSI_LOGGING is not set | ||
286 | |||
287 | # | ||
288 | # SCSI Transport Attributes | ||
289 | # | ||
290 | CONFIG_SCSI_SPI_ATTRS=y | ||
291 | # CONFIG_SCSI_FC_ATTRS is not set | ||
292 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
293 | |||
294 | # | ||
295 | # SCSI low-level drivers | ||
296 | # | ||
297 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | ||
298 | # CONFIG_SCSI_3W_9XXX is not set | ||
299 | # CONFIG_SCSI_ACARD is not set | ||
300 | # CONFIG_SCSI_AACRAID is not set | ||
301 | # CONFIG_SCSI_AIC7XXX is not set | ||
302 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
303 | # CONFIG_SCSI_AIC79XX is not set | ||
304 | # CONFIG_SCSI_DPT_I2O is not set | ||
305 | # CONFIG_MEGARAID_NEWGEN is not set | ||
306 | # CONFIG_MEGARAID_LEGACY is not set | ||
307 | # CONFIG_SCSI_SATA is not set | ||
308 | # CONFIG_SCSI_BUSLOGIC is not set | ||
309 | # CONFIG_SCSI_DMX3191D is not set | ||
310 | # CONFIG_SCSI_EATA is not set | ||
311 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
312 | # CONFIG_SCSI_GDTH is not set | ||
313 | # CONFIG_SCSI_IPS is not set | ||
314 | # CONFIG_SCSI_INITIO is not set | ||
315 | # CONFIG_SCSI_INIA100 is not set | ||
316 | CONFIG_SCSI_SYM53C8XX_2=y | ||
317 | CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 | ||
318 | CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 | ||
319 | CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 | ||
320 | # CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set | ||
321 | # CONFIG_SCSI_IPR is not set | ||
322 | # CONFIG_SCSI_QLOGIC_FC is not set | ||
323 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
324 | CONFIG_SCSI_QLA2XXX=y | ||
325 | # CONFIG_SCSI_QLA21XX is not set | ||
326 | # CONFIG_SCSI_QLA22XX is not set | ||
327 | # CONFIG_SCSI_QLA2300 is not set | ||
328 | # CONFIG_SCSI_QLA2322 is not set | ||
329 | # CONFIG_SCSI_QLA6312 is not set | ||
330 | # CONFIG_SCSI_LPFC is not set | ||
331 | # CONFIG_SCSI_DC395x is not set | ||
332 | # CONFIG_SCSI_DC390T is not set | ||
333 | # CONFIG_SCSI_NSP32 is not set | ||
334 | # CONFIG_SCSI_DEBUG is not set | ||
335 | |||
336 | # | ||
337 | # Multi-device support (RAID and LVM) | ||
338 | # | ||
339 | # CONFIG_MD is not set | ||
340 | |||
341 | # | ||
342 | # Fusion MPT device support | ||
343 | # | ||
344 | # CONFIG_FUSION is not set | ||
345 | # CONFIG_FUSION_SPI is not set | ||
346 | # CONFIG_FUSION_FC is not set | ||
347 | |||
348 | # | ||
349 | # IEEE 1394 (FireWire) support | ||
350 | # | ||
351 | # CONFIG_IEEE1394 is not set | ||
352 | |||
353 | # | ||
354 | # I2O device support | ||
355 | # | ||
356 | # CONFIG_I2O is not set | ||
357 | |||
358 | # | ||
359 | # Macintosh device drivers | ||
360 | # | ||
361 | |||
362 | # | ||
363 | # Networking support | ||
364 | # | ||
365 | CONFIG_NET=y | ||
366 | |||
367 | # | ||
368 | # Networking options | ||
369 | # | ||
370 | CONFIG_PACKET=y | ||
371 | # CONFIG_PACKET_MMAP is not set | ||
372 | CONFIG_UNIX=y | ||
373 | # CONFIG_NET_KEY is not set | ||
374 | CONFIG_INET=y | ||
375 | # CONFIG_IP_MULTICAST is not set | ||
376 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
377 | CONFIG_IP_FIB_HASH=y | ||
378 | CONFIG_IP_PNP=y | ||
379 | # CONFIG_IP_PNP_DHCP is not set | ||
380 | CONFIG_IP_PNP_BOOTP=y | ||
381 | # CONFIG_IP_PNP_RARP is not set | ||
382 | # CONFIG_NET_IPIP is not set | ||
383 | # CONFIG_NET_IPGRE is not set | ||
384 | # CONFIG_ARPD is not set | ||
385 | # CONFIG_SYN_COOKIES is not set | ||
386 | # CONFIG_INET_AH is not set | ||
387 | # CONFIG_INET_ESP is not set | ||
388 | # CONFIG_INET_IPCOMP is not set | ||
389 | # CONFIG_INET_TUNNEL is not set | ||
390 | CONFIG_IP_TCPDIAG=y | ||
391 | # CONFIG_IP_TCPDIAG_IPV6 is not set | ||
392 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
393 | CONFIG_TCP_CONG_BIC=y | ||
394 | |||
395 | # | ||
396 | # IP: Virtual Server Configuration | ||
397 | # | ||
398 | # CONFIG_IP_VS is not set | ||
399 | # CONFIG_IPV6 is not set | ||
400 | CONFIG_NETFILTER=y | ||
401 | # CONFIG_NETFILTER_DEBUG is not set | ||
402 | |||
403 | # | ||
404 | # IP: Netfilter Configuration | ||
405 | # | ||
406 | # CONFIG_IP_NF_CONNTRACK is not set | ||
407 | # CONFIG_IP_NF_CONNTRACK_MARK is not set | ||
408 | # CONFIG_IP_NF_QUEUE is not set | ||
409 | # CONFIG_IP_NF_IPTABLES is not set | ||
410 | # CONFIG_IP_NF_ARPTABLES is not set | ||
411 | |||
412 | # | ||
413 | # SCTP Configuration (EXPERIMENTAL) | ||
414 | # | ||
415 | # CONFIG_IP_SCTP is not set | ||
416 | # CONFIG_ATM is not set | ||
417 | # CONFIG_BRIDGE is not set | ||
418 | # CONFIG_VLAN_8021Q is not set | ||
419 | # CONFIG_DECNET is not set | ||
420 | # CONFIG_LLC2 is not set | ||
421 | # CONFIG_IPX is not set | ||
422 | # CONFIG_ATALK is not set | ||
423 | # CONFIG_X25 is not set | ||
424 | # CONFIG_LAPB is not set | ||
425 | # CONFIG_NET_DIVERT is not set | ||
426 | # CONFIG_ECONET is not set | ||
427 | # CONFIG_WAN_ROUTER is not set | ||
428 | |||
429 | # | ||
430 | # QoS and/or fair queueing | ||
431 | # | ||
432 | # CONFIG_NET_SCHED is not set | ||
433 | # CONFIG_NET_CLS_ROUTE is not set | ||
434 | |||
435 | # | ||
436 | # Network testing | ||
437 | # | ||
438 | # CONFIG_NET_PKTGEN is not set | ||
439 | # CONFIG_NETPOLL is not set | ||
440 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
441 | # CONFIG_HAMRADIO is not set | ||
442 | # CONFIG_IRDA is not set | ||
443 | # CONFIG_BT is not set | ||
444 | CONFIG_NETDEVICES=y | ||
445 | # CONFIG_DUMMY is not set | ||
446 | # CONFIG_BONDING is not set | ||
447 | # CONFIG_EQUALIZER is not set | ||
448 | # CONFIG_TUN is not set | ||
449 | |||
450 | # | ||
451 | # ARCnet devices | ||
452 | # | ||
453 | # CONFIG_ARCNET is not set | ||
454 | |||
455 | # | ||
456 | # Ethernet (10 or 100Mbit) | ||
457 | # | ||
458 | CONFIG_NET_ETHERNET=y | ||
459 | CONFIG_MII=y | ||
460 | # CONFIG_HAPPYMEAL is not set | ||
461 | # CONFIG_SUNGEM is not set | ||
462 | # CONFIG_NET_VENDOR_3COM is not set | ||
463 | |||
464 | # | ||
465 | # Tulip family network device support | ||
466 | # | ||
467 | # CONFIG_NET_TULIP is not set | ||
468 | # CONFIG_HP100 is not set | ||
469 | CONFIG_IBM_EMAC=y | ||
470 | # CONFIG_IBM_EMAC_ERRMSG is not set | ||
471 | CONFIG_IBM_EMAC_RXB=64 | ||
472 | CONFIG_IBM_EMAC_TXB=8 | ||
473 | CONFIG_IBM_EMAC_FGAP=8 | ||
474 | CONFIG_IBM_EMAC_SKBRES=0 | ||
475 | CONFIG_NET_PCI=y | ||
476 | # CONFIG_PCNET32 is not set | ||
477 | # CONFIG_AMD8111_ETH is not set | ||
478 | # CONFIG_ADAPTEC_STARFIRE is not set | ||
479 | # CONFIG_B44 is not set | ||
480 | # CONFIG_FORCEDETH is not set | ||
481 | # CONFIG_DGRS is not set | ||
482 | CONFIG_EEPRO100=y | ||
483 | # CONFIG_E100 is not set | ||
484 | # CONFIG_FEALNX is not set | ||
485 | CONFIG_NATSEMI=y | ||
486 | # CONFIG_NE2K_PCI is not set | ||
487 | # CONFIG_8139CP is not set | ||
488 | # CONFIG_8139TOO is not set | ||
489 | # CONFIG_SIS900 is not set | ||
490 | # CONFIG_EPIC100 is not set | ||
491 | # CONFIG_SUNDANCE is not set | ||
492 | # CONFIG_TLAN is not set | ||
493 | # CONFIG_VIA_RHINE is not set | ||
494 | |||
495 | # | ||
496 | # Ethernet (1000 Mbit) | ||
497 | # | ||
498 | # CONFIG_ACENIC is not set | ||
499 | # CONFIG_DL2K is not set | ||
500 | CONFIG_E1000=y | ||
501 | # CONFIG_E1000_NAPI is not set | ||
502 | # CONFIG_NS83820 is not set | ||
503 | # CONFIG_HAMACHI is not set | ||
504 | # CONFIG_YELLOWFIN is not set | ||
505 | # CONFIG_R8169 is not set | ||
506 | # CONFIG_SKGE is not set | ||
507 | # CONFIG_SK98LIN is not set | ||
508 | # CONFIG_VIA_VELOCITY is not set | ||
509 | # CONFIG_TIGON3 is not set | ||
510 | # CONFIG_BNX2 is not set | ||
511 | |||
512 | # | ||
513 | # Ethernet (10000 Mbit) | ||
514 | # | ||
515 | # CONFIG_IXGB is not set | ||
516 | # CONFIG_S2IO is not set | ||
517 | |||
518 | # | ||
519 | # Token Ring devices | ||
520 | # | ||
521 | # CONFIG_TR is not set | ||
522 | |||
523 | # | ||
524 | # Wireless LAN (non-hamradio) | ||
525 | # | ||
526 | # CONFIG_NET_RADIO is not set | ||
527 | |||
528 | # | ||
529 | # Wan interfaces | ||
530 | # | ||
531 | # CONFIG_WAN is not set | ||
532 | # CONFIG_FDDI is not set | ||
533 | # CONFIG_HIPPI is not set | ||
534 | # CONFIG_PPP is not set | ||
535 | # CONFIG_SLIP is not set | ||
536 | # CONFIG_NET_FC is not set | ||
537 | # CONFIG_SHAPER is not set | ||
538 | # CONFIG_NETCONSOLE is not set | ||
539 | |||
540 | # | ||
541 | # ISDN subsystem | ||
542 | # | ||
543 | # CONFIG_ISDN is not set | ||
544 | |||
545 | # | ||
546 | # Telephony Support | ||
547 | # | ||
548 | # CONFIG_PHONE is not set | ||
549 | |||
550 | # | ||
551 | # Input device support | ||
552 | # | ||
553 | CONFIG_INPUT=y | ||
554 | |||
555 | # | ||
556 | # Userland interfaces | ||
557 | # | ||
558 | CONFIG_INPUT_MOUSEDEV=y | ||
559 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
560 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
561 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
562 | # CONFIG_INPUT_JOYDEV is not set | ||
563 | # CONFIG_INPUT_TSDEV is not set | ||
564 | # CONFIG_INPUT_EVDEV is not set | ||
565 | # CONFIG_INPUT_EVBUG is not set | ||
566 | |||
567 | # | ||
568 | # Input Device Drivers | ||
569 | # | ||
570 | # CONFIG_INPUT_KEYBOARD is not set | ||
571 | # CONFIG_INPUT_MOUSE is not set | ||
572 | # CONFIG_INPUT_JOYSTICK is not set | ||
573 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
574 | # CONFIG_INPUT_MISC is not set | ||
575 | |||
576 | # | ||
577 | # Hardware I/O ports | ||
578 | # | ||
579 | CONFIG_SERIO=y | ||
580 | # CONFIG_SERIO_I8042 is not set | ||
581 | # CONFIG_SERIO_SERPORT is not set | ||
582 | # CONFIG_SERIO_PCIPS2 is not set | ||
583 | # CONFIG_SERIO_LIBPS2 is not set | ||
584 | # CONFIG_SERIO_RAW is not set | ||
585 | # CONFIG_GAMEPORT is not set | ||
586 | |||
587 | # | ||
588 | # Character devices | ||
589 | # | ||
590 | # CONFIG_VT is not set | ||
591 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
592 | |||
593 | # | ||
594 | # Serial drivers | ||
595 | # | ||
596 | CONFIG_SERIAL_8250=y | ||
597 | CONFIG_SERIAL_8250_CONSOLE=y | ||
598 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
599 | CONFIG_SERIAL_8250_EXTENDED=y | ||
600 | # CONFIG_SERIAL_8250_MANY_PORTS is not set | ||
601 | CONFIG_SERIAL_8250_SHARE_IRQ=y | ||
602 | # CONFIG_SERIAL_8250_DETECT_IRQ is not set | ||
603 | # CONFIG_SERIAL_8250_RSA is not set | ||
604 | |||
605 | # | ||
606 | # Non-8250 serial port support | ||
607 | # | ||
608 | CONFIG_SERIAL_CORE=y | ||
609 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
610 | # CONFIG_SERIAL_JSM is not set | ||
611 | CONFIG_UNIX98_PTYS=y | ||
612 | CONFIG_LEGACY_PTYS=y | ||
613 | CONFIG_LEGACY_PTY_COUNT=256 | ||
614 | |||
615 | # | ||
616 | # IPMI | ||
617 | # | ||
618 | # CONFIG_IPMI_HANDLER is not set | ||
619 | |||
620 | # | ||
621 | # Watchdog Cards | ||
622 | # | ||
623 | # CONFIG_WATCHDOG is not set | ||
624 | # CONFIG_NVRAM is not set | ||
625 | # CONFIG_GEN_RTC is not set | ||
626 | # CONFIG_DTLK is not set | ||
627 | # CONFIG_R3964 is not set | ||
628 | # CONFIG_APPLICOM is not set | ||
629 | |||
630 | # | ||
631 | # Ftape, the floppy tape device driver | ||
632 | # | ||
633 | # CONFIG_AGP is not set | ||
634 | # CONFIG_DRM is not set | ||
635 | # CONFIG_RAW_DRIVER is not set | ||
636 | |||
637 | # | ||
638 | # TPM devices | ||
639 | # | ||
640 | # CONFIG_TCG_TPM is not set | ||
641 | |||
642 | # | ||
643 | # I2C support | ||
644 | # | ||
645 | # CONFIG_I2C is not set | ||
646 | |||
647 | # | ||
648 | # Dallas's 1-wire bus | ||
649 | # | ||
650 | # CONFIG_W1 is not set | ||
651 | |||
652 | # | ||
653 | # Misc devices | ||
654 | # | ||
655 | |||
656 | # | ||
657 | # Multimedia devices | ||
658 | # | ||
659 | # CONFIG_VIDEO_DEV is not set | ||
660 | |||
661 | # | ||
662 | # Digital Video Broadcasting Devices | ||
663 | # | ||
664 | # CONFIG_DVB is not set | ||
665 | |||
666 | # | ||
667 | # Graphics support | ||
668 | # | ||
669 | # CONFIG_FB is not set | ||
670 | |||
671 | # | ||
672 | # Sound | ||
673 | # | ||
674 | # CONFIG_SOUND is not set | ||
675 | |||
676 | # | ||
677 | # USB support | ||
678 | # | ||
679 | CONFIG_USB_ARCH_HAS_HCD=y | ||
680 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
681 | CONFIG_USB=y | ||
682 | CONFIG_USB_DEBUG=y | ||
683 | |||
684 | # | ||
685 | # Miscellaneous USB options | ||
686 | # | ||
687 | # CONFIG_USB_DEVICEFS is not set | ||
688 | # CONFIG_USB_BANDWIDTH is not set | ||
689 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
690 | # CONFIG_USB_OTG is not set | ||
691 | |||
692 | # | ||
693 | # USB Host Controller Drivers | ||
694 | # | ||
695 | # CONFIG_USB_EHCI_HCD is not set | ||
696 | # CONFIG_USB_ISP116X_HCD is not set | ||
697 | # CONFIG_USB_OHCI_HCD is not set | ||
698 | # CONFIG_USB_UHCI_HCD is not set | ||
699 | # CONFIG_USB_SL811_HCD is not set | ||
700 | |||
701 | # | ||
702 | # USB Device Class drivers | ||
703 | # | ||
704 | # CONFIG_USB_BLUETOOTH_TTY is not set | ||
705 | # CONFIG_USB_ACM is not set | ||
706 | # CONFIG_USB_PRINTER is not set | ||
707 | |||
708 | # | ||
709 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information | ||
710 | # | ||
711 | # CONFIG_USB_STORAGE is not set | ||
712 | |||
713 | # | ||
714 | # USB Input Devices | ||
715 | # | ||
716 | # CONFIG_USB_HID is not set | ||
717 | |||
718 | # | ||
719 | # USB HID Boot Protocol drivers | ||
720 | # | ||
721 | # CONFIG_USB_KBD is not set | ||
722 | # CONFIG_USB_MOUSE is not set | ||
723 | # CONFIG_USB_AIPTEK is not set | ||
724 | # CONFIG_USB_WACOM is not set | ||
725 | # CONFIG_USB_ACECAD is not set | ||
726 | # CONFIG_USB_KBTAB is not set | ||
727 | # CONFIG_USB_POWERMATE is not set | ||
728 | # CONFIG_USB_MTOUCH is not set | ||
729 | # CONFIG_USB_ITMTOUCH is not set | ||
730 | # CONFIG_USB_EGALAX is not set | ||
731 | # CONFIG_USB_XPAD is not set | ||
732 | # CONFIG_USB_ATI_REMOTE is not set | ||
733 | |||
734 | # | ||
735 | # USB Imaging devices | ||
736 | # | ||
737 | # CONFIG_USB_MDC800 is not set | ||
738 | # CONFIG_USB_MICROTEK is not set | ||
739 | |||
740 | # | ||
741 | # USB Multimedia devices | ||
742 | # | ||
743 | # CONFIG_USB_DABUSB is not set | ||
744 | |||
745 | # | ||
746 | # Video4Linux support is needed for USB Multimedia device support | ||
747 | # | ||
748 | |||
749 | # | ||
750 | # USB Network Adapters | ||
751 | # | ||
752 | # CONFIG_USB_CATC is not set | ||
753 | # CONFIG_USB_KAWETH is not set | ||
754 | CONFIG_USB_PEGASUS=y | ||
755 | # CONFIG_USB_RTL8150 is not set | ||
756 | # CONFIG_USB_USBNET is not set | ||
757 | CONFIG_USB_MON=y | ||
758 | |||
759 | # | ||
760 | # USB port drivers | ||
761 | # | ||
762 | |||
763 | # | ||
764 | # USB Serial Converter support | ||
765 | # | ||
766 | # CONFIG_USB_SERIAL is not set | ||
767 | |||
768 | # | ||
769 | # USB Miscellaneous drivers | ||
770 | # | ||
771 | # CONFIG_USB_EMI62 is not set | ||
772 | # CONFIG_USB_EMI26 is not set | ||
773 | # CONFIG_USB_AUERSWALD is not set | ||
774 | # CONFIG_USB_RIO500 is not set | ||
775 | # CONFIG_USB_LEGOTOWER is not set | ||
776 | # CONFIG_USB_LCD is not set | ||
777 | # CONFIG_USB_LED is not set | ||
778 | # CONFIG_USB_CYTHERM is not set | ||
779 | # CONFIG_USB_PHIDGETKIT is not set | ||
780 | # CONFIG_USB_PHIDGETSERVO is not set | ||
781 | # CONFIG_USB_IDMOUSE is not set | ||
782 | |||
783 | # | ||
784 | # USB DSL modem support | ||
785 | # | ||
786 | |||
787 | # | ||
788 | # USB Gadget Support | ||
789 | # | ||
790 | # CONFIG_USB_GADGET is not set | ||
791 | |||
792 | # | ||
793 | # MMC/SD Card support | ||
794 | # | ||
795 | # CONFIG_MMC is not set | ||
796 | |||
797 | # | ||
798 | # InfiniBand support | ||
799 | # | ||
800 | # CONFIG_INFINIBAND is not set | ||
801 | |||
802 | # | ||
803 | # SN Devices | ||
804 | # | ||
805 | |||
806 | # | ||
807 | # File systems | ||
808 | # | ||
809 | # CONFIG_EXT2_FS is not set | ||
810 | # CONFIG_EXT3_FS is not set | ||
811 | # CONFIG_JBD is not set | ||
812 | # CONFIG_REISERFS_FS is not set | ||
813 | # CONFIG_JFS_FS is not set | ||
814 | |||
815 | # | ||
816 | # XFS support | ||
817 | # | ||
818 | # CONFIG_XFS_FS is not set | ||
819 | # CONFIG_MINIX_FS is not set | ||
820 | # CONFIG_ROMFS_FS is not set | ||
821 | # CONFIG_QUOTA is not set | ||
822 | CONFIG_DNOTIFY=y | ||
823 | # CONFIG_AUTOFS_FS is not set | ||
824 | # CONFIG_AUTOFS4_FS is not set | ||
825 | |||
826 | # | ||
827 | # CD-ROM/DVD Filesystems | ||
828 | # | ||
829 | # CONFIG_ISO9660_FS is not set | ||
830 | # CONFIG_UDF_FS is not set | ||
831 | |||
832 | # | ||
833 | # DOS/FAT/NT Filesystems | ||
834 | # | ||
835 | # CONFIG_MSDOS_FS is not set | ||
836 | # CONFIG_VFAT_FS is not set | ||
837 | # CONFIG_NTFS_FS is not set | ||
838 | |||
839 | # | ||
840 | # Pseudo filesystems | ||
841 | # | ||
842 | CONFIG_PROC_FS=y | ||
843 | CONFIG_PROC_KCORE=y | ||
844 | CONFIG_SYSFS=y | ||
845 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
846 | # CONFIG_TMPFS is not set | ||
847 | # CONFIG_HUGETLB_PAGE is not set | ||
848 | CONFIG_RAMFS=y | ||
849 | |||
850 | # | ||
851 | # Miscellaneous filesystems | ||
852 | # | ||
853 | # CONFIG_ADFS_FS is not set | ||
854 | # CONFIG_AFFS_FS is not set | ||
855 | # CONFIG_HFS_FS is not set | ||
856 | # CONFIG_HFSPLUS_FS is not set | ||
857 | # CONFIG_BEFS_FS is not set | ||
858 | # CONFIG_BFS_FS is not set | ||
859 | # CONFIG_EFS_FS is not set | ||
860 | # CONFIG_CRAMFS is not set | ||
861 | # CONFIG_VXFS_FS is not set | ||
862 | # CONFIG_HPFS_FS is not set | ||
863 | # CONFIG_QNX4FS_FS is not set | ||
864 | # CONFIG_SYSV_FS is not set | ||
865 | # CONFIG_UFS_FS is not set | ||
866 | |||
867 | # | ||
868 | # Network File Systems | ||
869 | # | ||
870 | CONFIG_NFS_FS=y | ||
871 | # CONFIG_NFS_V3 is not set | ||
872 | # CONFIG_NFS_V4 is not set | ||
873 | # CONFIG_NFS_DIRECTIO is not set | ||
874 | # CONFIG_NFSD is not set | ||
875 | CONFIG_ROOT_NFS=y | ||
876 | CONFIG_LOCKD=y | ||
877 | CONFIG_NFS_COMMON=y | ||
878 | CONFIG_SUNRPC=y | ||
879 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
880 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
881 | # CONFIG_SMB_FS is not set | ||
882 | # CONFIG_CIFS is not set | ||
883 | # CONFIG_NCP_FS is not set | ||
884 | # CONFIG_CODA_FS is not set | ||
885 | # CONFIG_AFS_FS is not set | ||
886 | |||
887 | # | ||
888 | # Partition Types | ||
889 | # | ||
890 | # CONFIG_PARTITION_ADVANCED is not set | ||
891 | CONFIG_MSDOS_PARTITION=y | ||
892 | |||
893 | # | ||
894 | # Native Language Support | ||
895 | # | ||
896 | # CONFIG_NLS is not set | ||
897 | |||
898 | # | ||
899 | # Library routines | ||
900 | # | ||
901 | # CONFIG_CRC_CCITT is not set | ||
902 | CONFIG_CRC32=y | ||
903 | # CONFIG_LIBCRC32C is not set | ||
904 | |||
905 | # | ||
906 | # Profiling support | ||
907 | # | ||
908 | # CONFIG_PROFILING is not set | ||
909 | |||
910 | # | ||
911 | # Kernel hacking | ||
912 | # | ||
913 | # CONFIG_PRINTK_TIME is not set | ||
914 | CONFIG_DEBUG_KERNEL=y | ||
915 | CONFIG_MAGIC_SYSRQ=y | ||
916 | CONFIG_LOG_BUF_SHIFT=14 | ||
917 | # CONFIG_SCHEDSTATS is not set | ||
918 | # CONFIG_DEBUG_SLAB is not set | ||
919 | # CONFIG_DEBUG_SPINLOCK is not set | ||
920 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
921 | # CONFIG_DEBUG_KOBJECT is not set | ||
922 | CONFIG_DEBUG_INFO=y | ||
923 | # CONFIG_DEBUG_FS is not set | ||
924 | # CONFIG_KGDB is not set | ||
925 | # CONFIG_XMON is not set | ||
926 | CONFIG_BDI_SWITCH=y | ||
927 | # CONFIG_SERIAL_TEXT_DEBUG is not set | ||
928 | CONFIG_PPC_OCP=y | ||
929 | |||
930 | # | ||
931 | # Security options | ||
932 | # | ||
933 | # CONFIG_KEYS is not set | ||
934 | # CONFIG_SECURITY is not set | ||
935 | |||
936 | # | ||
937 | # Cryptographic options | ||
938 | # | ||
939 | # CONFIG_CRYPTO is not set | ||
940 | |||
941 | # | ||
942 | # Hardware crypto devices | ||
943 | # | ||
diff --git a/arch/ppc/kernel/cputable.c b/arch/ppc/kernel/cputable.c index 50936cda0af9..8a3d74f2531e 100644 --- a/arch/ppc/kernel/cputable.c +++ b/arch/ppc/kernel/cputable.c | |||
@@ -852,6 +852,26 @@ struct cpu_spec cpu_specs[] = { | |||
852 | 852 | ||
853 | #endif /* CONFIG_40x */ | 853 | #endif /* CONFIG_40x */ |
854 | #ifdef CONFIG_44x | 854 | #ifdef CONFIG_44x |
855 | { | ||
856 | .pvr_mask = 0xf0000fff, | ||
857 | .pvr_value = 0x40000850, | ||
858 | .cpu_name = "440EP Rev. A", | ||
859 | .cpu_features = CPU_FTR_SPLIT_ID_CACHE | | ||
860 | CPU_FTR_USE_TB, | ||
861 | .cpu_user_features = COMMON_PPC, /* 440EP has an FPU */ | ||
862 | .icache_bsize = 32, | ||
863 | .dcache_bsize = 32, | ||
864 | }, | ||
865 | { | ||
866 | .pvr_mask = 0xf0000fff, | ||
867 | .pvr_value = 0x400008d3, | ||
868 | .cpu_name = "440EP Rev. B", | ||
869 | .cpu_features = CPU_FTR_SPLIT_ID_CACHE | | ||
870 | CPU_FTR_USE_TB, | ||
871 | .cpu_user_features = COMMON_PPC, /* 440EP has an FPU */ | ||
872 | .icache_bsize = 32, | ||
873 | .dcache_bsize = 32, | ||
874 | }, | ||
855 | { /* 440GP Rev. B */ | 875 | { /* 440GP Rev. B */ |
856 | .pvr_mask = 0xf0000fff, | 876 | .pvr_mask = 0xf0000fff, |
857 | .pvr_value = 0x40000440, | 877 | .pvr_value = 0x40000440, |
diff --git a/arch/ppc/kernel/entry.S b/arch/ppc/kernel/entry.S index d4df68629cc6..cb83045e2edf 100644 --- a/arch/ppc/kernel/entry.S +++ b/arch/ppc/kernel/entry.S | |||
@@ -215,6 +215,7 @@ syscall_dotrace_cont: | |||
215 | lwzx r10,r10,r0 /* Fetch system call handler [ptr] */ | 215 | lwzx r10,r10,r0 /* Fetch system call handler [ptr] */ |
216 | mtlr r10 | 216 | mtlr r10 |
217 | addi r9,r1,STACK_FRAME_OVERHEAD | 217 | addi r9,r1,STACK_FRAME_OVERHEAD |
218 | PPC440EP_ERR42 | ||
218 | blrl /* Call handler */ | 219 | blrl /* Call handler */ |
219 | .globl ret_from_syscall | 220 | .globl ret_from_syscall |
220 | ret_from_syscall: | 221 | ret_from_syscall: |
diff --git a/arch/ppc/kernel/head_44x.S b/arch/ppc/kernel/head_44x.S index 6c7ae6052464..69ff3a9961e8 100644 --- a/arch/ppc/kernel/head_44x.S +++ b/arch/ppc/kernel/head_44x.S | |||
@@ -179,24 +179,26 @@ skpinv: addi r4,r4,1 /* Increment */ | |||
179 | 4: | 179 | 4: |
180 | #ifdef CONFIG_SERIAL_TEXT_DEBUG | 180 | #ifdef CONFIG_SERIAL_TEXT_DEBUG |
181 | /* | 181 | /* |
182 | * Add temporary UART mapping for early debug. This | 182 | * Add temporary UART mapping for early debug. |
183 | * mapping must be identical to that used by the early | 183 | * We can map UART registers wherever we want as long as they don't |
184 | * bootloader code since the same asm/serial.h parameters | 184 | * interfere with other system mappings (e.g. with pinned entries). |
185 | * are used for polled operation. | 185 | * For an example of how we handle this - see ocotea.h. --ebs |
186 | */ | 186 | */ |
187 | /* pageid fields */ | 187 | /* pageid fields */ |
188 | lis r3,UART0_IO_BASE@h | 188 | lis r3,UART0_IO_BASE@h |
189 | ori r3,r3,PPC44x_TLB_VALID | PPC44x_TLB_256M | 189 | ori r3,r3,PPC44x_TLB_VALID | PPC44x_TLB_4K |
190 | 190 | ||
191 | /* xlat fields */ | 191 | /* xlat fields */ |
192 | lis r4,UART0_PHYS_IO_BASE@h /* RPN depends on SoC */ | 192 | lis r4,UART0_PHYS_IO_BASE@h /* RPN depends on SoC */ |
193 | #ifndef CONFIG_440EP | ||
193 | ori r4,r4,0x0001 /* ERPN is 1 for second 4GB page */ | 194 | ori r4,r4,0x0001 /* ERPN is 1 for second 4GB page */ |
195 | #endif | ||
194 | 196 | ||
195 | /* attrib fields */ | 197 | /* attrib fields */ |
196 | li r5,0 | 198 | li r5,0 |
197 | ori r5,r5,(PPC44x_TLB_SW | PPC44x_TLB_SR | PPC44x_TLB_I | PPC44x_TLB_G) | 199 | ori r5,r5,(PPC44x_TLB_SW | PPC44x_TLB_SR | PPC44x_TLB_I | PPC44x_TLB_G) |
198 | 200 | ||
199 | li r0,1 /* TLB slot 1 */ | 201 | li r0,0 /* TLB slot 0 */ |
200 | 202 | ||
201 | tlbwe r3,r0,PPC44x_TLB_PAGEID /* Load the pageid fields */ | 203 | tlbwe r3,r0,PPC44x_TLB_PAGEID /* Load the pageid fields */ |
202 | tlbwe r4,r0,PPC44x_TLB_XLAT /* Load the translation fields */ | 204 | tlbwe r4,r0,PPC44x_TLB_XLAT /* Load the translation fields */ |
@@ -228,6 +230,16 @@ skpinv: addi r4,r4,1 /* Increment */ | |||
228 | lis r4,interrupt_base@h /* IVPR only uses the high 16-bits */ | 230 | lis r4,interrupt_base@h /* IVPR only uses the high 16-bits */ |
229 | mtspr SPRN_IVPR,r4 | 231 | mtspr SPRN_IVPR,r4 |
230 | 232 | ||
233 | #ifdef CONFIG_440EP | ||
234 | /* Clear DAPUIB flag in CCR0 (enable APU between CPU and FPU) */ | ||
235 | mfspr r2,SPRN_CCR0 | ||
236 | lis r3,0xffef | ||
237 | ori r3,r3,0xffff | ||
238 | and r2,r2,r3 | ||
239 | mtspr SPRN_CCR0,r2 | ||
240 | isync | ||
241 | #endif | ||
242 | |||
231 | /* | 243 | /* |
232 | * This is where the main kernel code starts. | 244 | * This is where the main kernel code starts. |
233 | */ | 245 | */ |
diff --git a/arch/ppc/kernel/misc.S b/arch/ppc/kernel/misc.S index 191a8def3bdb..ce71b4a01585 100644 --- a/arch/ppc/kernel/misc.S +++ b/arch/ppc/kernel/misc.S | |||
@@ -1145,6 +1145,7 @@ _GLOBAL(kernel_thread) | |||
1145 | stwu r0,-16(r1) | 1145 | stwu r0,-16(r1) |
1146 | mtlr r30 /* fn addr in lr */ | 1146 | mtlr r30 /* fn addr in lr */ |
1147 | mr r3,r31 /* load arg and call fn */ | 1147 | mr r3,r31 /* load arg and call fn */ |
1148 | PPC440EP_ERR42 | ||
1148 | blrl | 1149 | blrl |
1149 | li r0,__NR_exit /* exit if function returns */ | 1150 | li r0,__NR_exit /* exit if function returns */ |
1150 | li r3,0 | 1151 | li r3,0 |
@@ -1451,3 +1452,6 @@ _GLOBAL(sys_call_table) | |||
1451 | .long sys_waitid | 1452 | .long sys_waitid |
1452 | .long sys_ioprio_set | 1453 | .long sys_ioprio_set |
1453 | .long sys_ioprio_get | 1454 | .long sys_ioprio_get |
1455 | .long sys_inotify_init /* 275 */ | ||
1456 | .long sys_inotify_add_watch | ||
1457 | .long sys_inotify_rm_watch | ||
diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c index 70cfb6ffd877..7b3586a3bf30 100644 --- a/arch/ppc/kernel/pci.c +++ b/arch/ppc/kernel/pci.c | |||
@@ -160,6 +160,21 @@ void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, | |||
160 | } | 160 | } |
161 | EXPORT_SYMBOL(pcibios_resource_to_bus); | 161 | EXPORT_SYMBOL(pcibios_resource_to_bus); |
162 | 162 | ||
163 | void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, | ||
164 | struct pci_bus_region *region) | ||
165 | { | ||
166 | unsigned long offset = 0; | ||
167 | struct pci_controller *hose = dev->sysdata; | ||
168 | |||
169 | if (hose && res->flags & IORESOURCE_IO) | ||
170 | offset = (unsigned long)hose->io_base_virt - isa_io_base; | ||
171 | else if (hose && res->flags & IORESOURCE_MEM) | ||
172 | offset = hose->pci_mem_offset; | ||
173 | res->start = region->start + offset; | ||
174 | res->end = region->end + offset; | ||
175 | } | ||
176 | EXPORT_SYMBOL(pcibios_bus_to_resource); | ||
177 | |||
163 | /* | 178 | /* |
164 | * We need to avoid collisions with `mirrored' VGA ports | 179 | * We need to avoid collisions with `mirrored' VGA ports |
165 | * and other strange ISA hardware, so we always want the | 180 | * and other strange ISA hardware, so we always want the |
diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c index d59ad07de8e7..e7d40cc6c1b6 100644 --- a/arch/ppc/kernel/ppc_ksyms.c +++ b/arch/ppc/kernel/ppc_ksyms.c | |||
@@ -324,7 +324,7 @@ EXPORT_SYMBOL(__res); | |||
324 | 324 | ||
325 | EXPORT_SYMBOL(next_mmu_context); | 325 | EXPORT_SYMBOL(next_mmu_context); |
326 | EXPORT_SYMBOL(set_context); | 326 | EXPORT_SYMBOL(set_context); |
327 | EXPORT_SYMBOL(handle_mm_fault); /* For MOL */ | 327 | EXPORT_SYMBOL_GPL(__handle_mm_fault); /* For MOL */ |
328 | EXPORT_SYMBOL(disarm_decr); | 328 | EXPORT_SYMBOL(disarm_decr); |
329 | #ifdef CONFIG_PPC_STD_MMU | 329 | #ifdef CONFIG_PPC_STD_MMU |
330 | extern long mol_trampoline; | 330 | extern long mol_trampoline; |
diff --git a/arch/ppc/platforms/4xx/Kconfig b/arch/ppc/platforms/4xx/Kconfig index a0612a86455a..f7c045764e04 100644 --- a/arch/ppc/platforms/4xx/Kconfig +++ b/arch/ppc/platforms/4xx/Kconfig | |||
@@ -68,6 +68,11 @@ choice | |||
68 | depends on 44x | 68 | depends on 44x |
69 | default EBONY | 69 | default EBONY |
70 | 70 | ||
71 | config BAMBOO | ||
72 | bool "Bamboo" | ||
73 | help | ||
74 | This option enables support for the IBM PPC440EP evaluation board. | ||
75 | |||
71 | config EBONY | 76 | config EBONY |
72 | bool "Ebony" | 77 | bool "Ebony" |
73 | help | 78 | help |
@@ -98,6 +103,12 @@ config NP405H | |||
98 | depends on ASH | 103 | depends on ASH |
99 | default y | 104 | default y |
100 | 105 | ||
106 | config 440EP | ||
107 | bool | ||
108 | depends on BAMBOO | ||
109 | select PPC_FPU | ||
110 | default y | ||
111 | |||
101 | config 440GP | 112 | config 440GP |
102 | bool | 113 | bool |
103 | depends on EBONY | 114 | depends on EBONY |
@@ -115,7 +126,7 @@ config 440SP | |||
115 | 126 | ||
116 | config 440 | 127 | config 440 |
117 | bool | 128 | bool |
118 | depends on 440GP || 440SP | 129 | depends on 440GP || 440SP || 440EP |
119 | default y | 130 | default y |
120 | 131 | ||
121 | config 440A | 132 | config 440A |
@@ -123,6 +134,11 @@ config 440A | |||
123 | depends on 440GX | 134 | depends on 440GX |
124 | default y | 135 | default y |
125 | 136 | ||
137 | config IBM440EP_ERR42 | ||
138 | bool | ||
139 | depends on 440EP | ||
140 | default y | ||
141 | |||
126 | # All 405-based cores up until the 405GPR and 405EP have this errata. | 142 | # All 405-based cores up until the 405GPR and 405EP have this errata. |
127 | config IBM405_ERR77 | 143 | config IBM405_ERR77 |
128 | bool | 144 | bool |
@@ -142,7 +158,7 @@ config BOOKE | |||
142 | 158 | ||
143 | config IBM_OCP | 159 | config IBM_OCP |
144 | bool | 160 | bool |
145 | depends on ASH || BUBINGA || CPCI405 || EBONY || EP405 || LUAN || OCOTEA || REDWOOD_5 || REDWOOD_6 || SYCAMORE || WALNUT | 161 | depends on ASH || BAMBOO || BUBINGA || CPCI405 || EBONY || EP405 || LUAN || OCOTEA || REDWOOD_5 || REDWOOD_6 || SYCAMORE || WALNUT |
146 | default y | 162 | default y |
147 | 163 | ||
148 | config XILINX_OCP | 164 | config XILINX_OCP |
diff --git a/arch/ppc/platforms/4xx/Makefile b/arch/ppc/platforms/4xx/Makefile index ea470c6adbb6..844c3b5066e8 100644 --- a/arch/ppc/platforms/4xx/Makefile +++ b/arch/ppc/platforms/4xx/Makefile | |||
@@ -2,6 +2,7 @@ | |||
2 | # Makefile for the PowerPC 4xx linux kernel. | 2 | # Makefile for the PowerPC 4xx linux kernel. |
3 | 3 | ||
4 | obj-$(CONFIG_ASH) += ash.o | 4 | obj-$(CONFIG_ASH) += ash.o |
5 | obj-$(CONFIG_BAMBOO) += bamboo.o | ||
5 | obj-$(CONFIG_CPCI405) += cpci405.o | 6 | obj-$(CONFIG_CPCI405) += cpci405.o |
6 | obj-$(CONFIG_EBONY) += ebony.o | 7 | obj-$(CONFIG_EBONY) += ebony.o |
7 | obj-$(CONFIG_EP405) += ep405.o | 8 | obj-$(CONFIG_EP405) += ep405.o |
@@ -19,6 +20,7 @@ obj-$(CONFIG_405GP) += ibm405gp.o | |||
19 | obj-$(CONFIG_REDWOOD_5) += ibmstb4.o | 20 | obj-$(CONFIG_REDWOOD_5) += ibmstb4.o |
20 | obj-$(CONFIG_NP405H) += ibmnp405h.o | 21 | obj-$(CONFIG_NP405H) += ibmnp405h.o |
21 | obj-$(CONFIG_REDWOOD_6) += ibmstbx25.o | 22 | obj-$(CONFIG_REDWOOD_6) += ibmstbx25.o |
23 | obj-$(CONFIG_440EP) += ibm440ep.o | ||
22 | obj-$(CONFIG_440GP) += ibm440gp.o | 24 | obj-$(CONFIG_440GP) += ibm440gp.o |
23 | obj-$(CONFIG_440GX) += ibm440gx.o | 25 | obj-$(CONFIG_440GX) += ibm440gx.o |
24 | obj-$(CONFIG_440SP) += ibm440sp.o | 26 | obj-$(CONFIG_440SP) += ibm440sp.o |
diff --git a/arch/ppc/platforms/4xx/bamboo.c b/arch/ppc/platforms/4xx/bamboo.c new file mode 100644 index 000000000000..f116787b0b76 --- /dev/null +++ b/arch/ppc/platforms/4xx/bamboo.c | |||
@@ -0,0 +1,427 @@ | |||
1 | /* | ||
2 | * arch/ppc/platforms/4xx/bamboo.c | ||
3 | * | ||
4 | * Bamboo board specific routines | ||
5 | * | ||
6 | * Wade Farnsworth <wfarnsworth@mvista.com> | ||
7 | * Copyright 2004 MontaVista Software Inc. | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify it | ||
10 | * under the terms of the GNU General Public License as published by the | ||
11 | * Free Software Foundation; either version 2 of the License, or (at your | ||
12 | * option) any later version. | ||
13 | */ | ||
14 | |||
15 | #include <linux/config.h> | ||
16 | #include <linux/stddef.h> | ||
17 | #include <linux/kernel.h> | ||
18 | #include <linux/init.h> | ||
19 | #include <linux/errno.h> | ||
20 | #include <linux/reboot.h> | ||
21 | #include <linux/pci.h> | ||
22 | #include <linux/kdev_t.h> | ||
23 | #include <linux/types.h> | ||
24 | #include <linux/major.h> | ||
25 | #include <linux/blkdev.h> | ||
26 | #include <linux/console.h> | ||
27 | #include <linux/delay.h> | ||
28 | #include <linux/ide.h> | ||
29 | #include <linux/initrd.h> | ||
30 | #include <linux/irq.h> | ||
31 | #include <linux/seq_file.h> | ||
32 | #include <linux/root_dev.h> | ||
33 | #include <linux/tty.h> | ||
34 | #include <linux/serial.h> | ||
35 | #include <linux/serial_core.h> | ||
36 | #include <linux/ethtool.h> | ||
37 | |||
38 | #include <asm/system.h> | ||
39 | #include <asm/pgtable.h> | ||
40 | #include <asm/page.h> | ||
41 | #include <asm/dma.h> | ||
42 | #include <asm/io.h> | ||
43 | #include <asm/machdep.h> | ||
44 | #include <asm/ocp.h> | ||
45 | #include <asm/pci-bridge.h> | ||
46 | #include <asm/time.h> | ||
47 | #include <asm/todc.h> | ||
48 | #include <asm/bootinfo.h> | ||
49 | #include <asm/ppc4xx_pic.h> | ||
50 | #include <asm/ppcboot.h> | ||
51 | |||
52 | #include <syslib/gen550.h> | ||
53 | #include <syslib/ibm440gx_common.h> | ||
54 | |||
55 | /* | ||
56 | * This is a horrible kludge, we eventually need to abstract this | ||
57 | * generic PHY stuff, so the standard phy mode defines can be | ||
58 | * easily used from arch code. | ||
59 | */ | ||
60 | #include "../../../../drivers/net/ibm_emac/ibm_emac_phy.h" | ||
61 | |||
62 | bd_t __res; | ||
63 | |||
64 | static struct ibm44x_clocks clocks __initdata; | ||
65 | |||
66 | /* | ||
67 | * Bamboo external IRQ triggering/polarity settings | ||
68 | */ | ||
69 | unsigned char ppc4xx_uic_ext_irq_cfg[] __initdata = { | ||
70 | (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* IRQ0: Ethernet transceiver */ | ||
71 | (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* IRQ1: Expansion connector */ | ||
72 | (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* IRQ2: PCI slot 0 */ | ||
73 | (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* IRQ3: PCI slot 1 */ | ||
74 | (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* IRQ4: PCI slot 2 */ | ||
75 | (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* IRQ5: PCI slot 3 */ | ||
76 | (IRQ_SENSE_EDGE | IRQ_POLARITY_NEGATIVE), /* IRQ6: SMI pushbutton */ | ||
77 | (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* IRQ7: EXT */ | ||
78 | (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* IRQ8: EXT */ | ||
79 | (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* IRQ9: EXT */ | ||
80 | }; | ||
81 | |||
82 | static void __init | ||
83 | bamboo_calibrate_decr(void) | ||
84 | { | ||
85 | unsigned int freq; | ||
86 | |||
87 | if (mfspr(SPRN_CCR1) & CCR1_TCS) | ||
88 | freq = BAMBOO_TMRCLK; | ||
89 | else | ||
90 | freq = clocks.cpu; | ||
91 | |||
92 | ibm44x_calibrate_decr(freq); | ||
93 | |||
94 | } | ||
95 | |||
96 | static int | ||
97 | bamboo_show_cpuinfo(struct seq_file *m) | ||
98 | { | ||
99 | seq_printf(m, "vendor\t\t: IBM\n"); | ||
100 | seq_printf(m, "machine\t\t: PPC440EP EVB (Bamboo)\n"); | ||
101 | |||
102 | return 0; | ||
103 | } | ||
104 | |||
105 | static inline int | ||
106 | bamboo_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin) | ||
107 | { | ||
108 | static char pci_irq_table[][4] = | ||
109 | /* | ||
110 | * PCI IDSEL/INTPIN->INTLINE | ||
111 | * A B C D | ||
112 | */ | ||
113 | { | ||
114 | { 28, 28, 28, 28 }, /* IDSEL 1 - PCI Slot 0 */ | ||
115 | { 27, 27, 27, 27 }, /* IDSEL 2 - PCI Slot 1 */ | ||
116 | { 26, 26, 26, 26 }, /* IDSEL 3 - PCI Slot 2 */ | ||
117 | { 25, 25, 25, 25 }, /* IDSEL 4 - PCI Slot 3 */ | ||
118 | }; | ||
119 | |||
120 | const long min_idsel = 1, max_idsel = 4, irqs_per_slot = 4; | ||
121 | return PCI_IRQ_TABLE_LOOKUP; | ||
122 | } | ||
123 | |||
124 | static void __init bamboo_set_emacdata(void) | ||
125 | { | ||
126 | unsigned char * selection1_base; | ||
127 | struct ocp_def *def; | ||
128 | struct ocp_func_emac_data *emacdata; | ||
129 | u8 selection1_val; | ||
130 | int mode; | ||
131 | |||
132 | selection1_base = ioremap64(BAMBOO_FPGA_SELECTION1_REG_ADDR, 16); | ||
133 | selection1_val = readb(selection1_base); | ||
134 | iounmap((void *) selection1_base); | ||
135 | if (BAMBOO_SEL_MII(selection1_val)) | ||
136 | mode = PHY_MODE_MII; | ||
137 | else if (BAMBOO_SEL_RMII(selection1_val)) | ||
138 | mode = PHY_MODE_RMII; | ||
139 | else | ||
140 | mode = PHY_MODE_SMII; | ||
141 | |||
142 | /* Set mac_addr and phy mode for each EMAC */ | ||
143 | |||
144 | def = ocp_get_one_device(OCP_VENDOR_IBM, OCP_FUNC_EMAC, 0); | ||
145 | emacdata = def->additions; | ||
146 | memcpy(emacdata->mac_addr, __res.bi_enetaddr, 6); | ||
147 | emacdata->phy_mode = mode; | ||
148 | |||
149 | def = ocp_get_one_device(OCP_VENDOR_IBM, OCP_FUNC_EMAC, 1); | ||
150 | emacdata = def->additions; | ||
151 | memcpy(emacdata->mac_addr, __res.bi_enet1addr, 6); | ||
152 | emacdata->phy_mode = mode; | ||
153 | } | ||
154 | |||
155 | static int | ||
156 | bamboo_exclude_device(unsigned char bus, unsigned char devfn) | ||
157 | { | ||
158 | return (bus == 0 && devfn == 0); | ||
159 | } | ||
160 | |||
161 | #define PCI_READW(offset) \ | ||
162 | (readw((void *)((u32)pci_reg_base+offset))) | ||
163 | |||
164 | #define PCI_WRITEW(value, offset) \ | ||
165 | (writew(value, (void *)((u32)pci_reg_base+offset))) | ||
166 | |||
167 | #define PCI_WRITEL(value, offset) \ | ||
168 | (writel(value, (void *)((u32)pci_reg_base+offset))) | ||
169 | |||
170 | static void __init | ||
171 | bamboo_setup_pci(void) | ||
172 | { | ||
173 | void *pci_reg_base; | ||
174 | unsigned long memory_size; | ||
175 | memory_size = ppc_md.find_end_of_memory(); | ||
176 | |||
177 | pci_reg_base = ioremap64(BAMBOO_PCIL0_BASE, BAMBOO_PCIL0_SIZE); | ||
178 | |||
179 | /* Enable PCI I/O, Mem, and Busmaster cycles */ | ||
180 | PCI_WRITEW(PCI_READW(PCI_COMMAND) | | ||
181 | PCI_COMMAND_MEMORY | | ||
182 | PCI_COMMAND_MASTER, PCI_COMMAND); | ||
183 | |||
184 | /* Disable region first */ | ||
185 | PCI_WRITEL(0, BAMBOO_PCIL0_PMM0MA); | ||
186 | |||
187 | /* PLB starting addr: 0x00000000A0000000 */ | ||
188 | PCI_WRITEL(BAMBOO_PCI_PHY_MEM_BASE, BAMBOO_PCIL0_PMM0LA); | ||
189 | |||
190 | /* PCI start addr, 0xA0000000 (PCI Address) */ | ||
191 | PCI_WRITEL(BAMBOO_PCI_MEM_BASE, BAMBOO_PCIL0_PMM0PCILA); | ||
192 | PCI_WRITEL(0, BAMBOO_PCIL0_PMM0PCIHA); | ||
193 | |||
194 | /* Enable no pre-fetch, enable region */ | ||
195 | PCI_WRITEL(((0xffffffff - | ||
196 | (BAMBOO_PCI_UPPER_MEM - BAMBOO_PCI_MEM_BASE)) | 0x01), | ||
197 | BAMBOO_PCIL0_PMM0MA); | ||
198 | |||
199 | /* Disable region one */ | ||
200 | PCI_WRITEL(0, BAMBOO_PCIL0_PMM1MA); | ||
201 | PCI_WRITEL(0, BAMBOO_PCIL0_PMM1LA); | ||
202 | PCI_WRITEL(0, BAMBOO_PCIL0_PMM1PCILA); | ||
203 | PCI_WRITEL(0, BAMBOO_PCIL0_PMM1PCIHA); | ||
204 | PCI_WRITEL(0, BAMBOO_PCIL0_PMM1MA); | ||
205 | |||
206 | /* Disable region two */ | ||
207 | PCI_WRITEL(0, BAMBOO_PCIL0_PMM2MA); | ||
208 | PCI_WRITEL(0, BAMBOO_PCIL0_PMM2LA); | ||
209 | PCI_WRITEL(0, BAMBOO_PCIL0_PMM2PCILA); | ||
210 | PCI_WRITEL(0, BAMBOO_PCIL0_PMM2PCIHA); | ||
211 | PCI_WRITEL(0, BAMBOO_PCIL0_PMM2MA); | ||
212 | |||
213 | /* Now configure the PCI->PLB windows, we only use PTM1 | ||
214 | * | ||
215 | * For Inbound flow, set the window size to all available memory | ||
216 | * This is required because if size is smaller, | ||
217 | * then Eth/PCI DD would fail as PCI card not able to access | ||
218 | * the memory allocated by DD. | ||
219 | */ | ||
220 | |||
221 | PCI_WRITEL(0, BAMBOO_PCIL0_PTM1MS); /* disabled region 1 */ | ||
222 | PCI_WRITEL(0, BAMBOO_PCIL0_PTM1LA); /* begin of address map */ | ||
223 | |||
224 | memory_size = 1 << fls(memory_size - 1); | ||
225 | |||
226 | /* Size low + Enabled */ | ||
227 | PCI_WRITEL((0xffffffff - (memory_size - 1)) | 0x1, BAMBOO_PCIL0_PTM1MS); | ||
228 | |||
229 | eieio(); | ||
230 | iounmap(pci_reg_base); | ||
231 | } | ||
232 | |||
233 | static void __init | ||
234 | bamboo_setup_hose(void) | ||
235 | { | ||
236 | unsigned int bar_response, bar; | ||
237 | struct pci_controller *hose; | ||
238 | |||
239 | bamboo_setup_pci(); | ||
240 | |||
241 | hose = pcibios_alloc_controller(); | ||
242 | |||
243 | if (!hose) | ||
244 | return; | ||
245 | |||
246 | hose->first_busno = 0; | ||
247 | hose->last_busno = 0xff; | ||
248 | |||
249 | hose->pci_mem_offset = BAMBOO_PCI_MEM_OFFSET; | ||
250 | |||
251 | pci_init_resource(&hose->io_resource, | ||
252 | BAMBOO_PCI_LOWER_IO, | ||
253 | BAMBOO_PCI_UPPER_IO, | ||
254 | IORESOURCE_IO, | ||
255 | "PCI host bridge"); | ||
256 | |||
257 | pci_init_resource(&hose->mem_resources[0], | ||
258 | BAMBOO_PCI_LOWER_MEM, | ||
259 | BAMBOO_PCI_UPPER_MEM, | ||
260 | IORESOURCE_MEM, | ||
261 | "PCI host bridge"); | ||
262 | |||
263 | ppc_md.pci_exclude_device = bamboo_exclude_device; | ||
264 | |||
265 | hose->io_space.start = BAMBOO_PCI_LOWER_IO; | ||
266 | hose->io_space.end = BAMBOO_PCI_UPPER_IO; | ||
267 | hose->mem_space.start = BAMBOO_PCI_LOWER_MEM; | ||
268 | hose->mem_space.end = BAMBOO_PCI_UPPER_MEM; | ||
269 | isa_io_base = | ||
270 | (unsigned long)ioremap64(BAMBOO_PCI_IO_BASE, BAMBOO_PCI_IO_SIZE); | ||
271 | hose->io_base_virt = (void *)isa_io_base; | ||
272 | |||
273 | setup_indirect_pci(hose, | ||
274 | BAMBOO_PCI_CFGA_PLB32, | ||
275 | BAMBOO_PCI_CFGD_PLB32); | ||
276 | hose->set_cfg_type = 1; | ||
277 | |||
278 | /* Zero config bars */ | ||
279 | for (bar = PCI_BASE_ADDRESS_1; bar <= PCI_BASE_ADDRESS_2; bar += 4) { | ||
280 | early_write_config_dword(hose, hose->first_busno, | ||
281 | PCI_FUNC(hose->first_busno), bar, | ||
282 | 0x00000000); | ||
283 | early_read_config_dword(hose, hose->first_busno, | ||
284 | PCI_FUNC(hose->first_busno), bar, | ||
285 | &bar_response); | ||
286 | } | ||
287 | |||
288 | hose->last_busno = pciauto_bus_scan(hose, hose->first_busno); | ||
289 | |||
290 | ppc_md.pci_swizzle = common_swizzle; | ||
291 | ppc_md.pci_map_irq = bamboo_map_irq; | ||
292 | } | ||
293 | |||
294 | TODC_ALLOC(); | ||
295 | |||
296 | static void __init | ||
297 | bamboo_early_serial_map(void) | ||
298 | { | ||
299 | struct uart_port port; | ||
300 | |||
301 | /* Setup ioremapped serial port access */ | ||
302 | memset(&port, 0, sizeof(port)); | ||
303 | port.membase = ioremap64(PPC440EP_UART0_ADDR, 8); | ||
304 | port.irq = 0; | ||
305 | port.uartclk = clocks.uart0; | ||
306 | port.regshift = 0; | ||
307 | port.iotype = SERIAL_IO_MEM; | ||
308 | port.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST; | ||
309 | port.line = 0; | ||
310 | |||
311 | if (early_serial_setup(&port) != 0) { | ||
312 | printk("Early serial init of port 0 failed\n"); | ||
313 | } | ||
314 | |||
315 | #if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB) | ||
316 | /* Configure debug serial access */ | ||
317 | gen550_init(0, &port); | ||
318 | #endif | ||
319 | |||
320 | port.membase = ioremap64(PPC440EP_UART1_ADDR, 8); | ||
321 | port.irq = 1; | ||
322 | port.uartclk = clocks.uart1; | ||
323 | port.line = 1; | ||
324 | |||
325 | if (early_serial_setup(&port) != 0) { | ||
326 | printk("Early serial init of port 1 failed\n"); | ||
327 | } | ||
328 | |||
329 | #if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB) | ||
330 | /* Configure debug serial access */ | ||
331 | gen550_init(1, &port); | ||
332 | #endif | ||
333 | |||
334 | port.membase = ioremap64(PPC440EP_UART2_ADDR, 8); | ||
335 | port.irq = 3; | ||
336 | port.uartclk = clocks.uart2; | ||
337 | port.line = 2; | ||
338 | |||
339 | if (early_serial_setup(&port) != 0) { | ||
340 | printk("Early serial init of port 2 failed\n"); | ||
341 | } | ||
342 | |||
343 | #if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB) | ||
344 | /* Configure debug serial access */ | ||
345 | gen550_init(2, &port); | ||
346 | #endif | ||
347 | |||
348 | port.membase = ioremap64(PPC440EP_UART3_ADDR, 8); | ||
349 | port.irq = 4; | ||
350 | port.uartclk = clocks.uart3; | ||
351 | port.line = 3; | ||
352 | |||
353 | if (early_serial_setup(&port) != 0) { | ||
354 | printk("Early serial init of port 3 failed\n"); | ||
355 | } | ||
356 | } | ||
357 | |||
358 | static void __init | ||
359 | bamboo_setup_arch(void) | ||
360 | { | ||
361 | |||
362 | bamboo_set_emacdata(); | ||
363 | |||
364 | ibm440gx_get_clocks(&clocks, 33333333, 6 * 1843200); | ||
365 | ocp_sys_info.opb_bus_freq = clocks.opb; | ||
366 | |||
367 | /* Setup TODC access */ | ||
368 | TODC_INIT(TODC_TYPE_DS1743, | ||
369 | 0, | ||
370 | 0, | ||
371 | ioremap64(BAMBOO_RTC_ADDR, BAMBOO_RTC_SIZE), | ||
372 | 8); | ||
373 | |||
374 | /* init to some ~sane value until calibrate_delay() runs */ | ||
375 | loops_per_jiffy = 50000000/HZ; | ||
376 | |||
377 | /* Setup PCI host bridge */ | ||
378 | bamboo_setup_hose(); | ||
379 | |||
380 | #ifdef CONFIG_BLK_DEV_INITRD | ||
381 | if (initrd_start) | ||
382 | ROOT_DEV = Root_RAM0; | ||
383 | else | ||
384 | #endif | ||
385 | #ifdef CONFIG_ROOT_NFS | ||
386 | ROOT_DEV = Root_NFS; | ||
387 | #else | ||
388 | ROOT_DEV = Root_HDA1; | ||
389 | #endif | ||
390 | |||
391 | bamboo_early_serial_map(); | ||
392 | |||
393 | /* Identify the system */ | ||
394 | printk("IBM Bamboo port (MontaVista Software, Inc. (source@mvista.com))\n"); | ||
395 | } | ||
396 | |||
397 | void __init platform_init(unsigned long r3, unsigned long r4, | ||
398 | unsigned long r5, unsigned long r6, unsigned long r7) | ||
399 | { | ||
400 | parse_bootinfo(find_bootinfo()); | ||
401 | |||
402 | /* | ||
403 | * If we were passed in a board information, copy it into the | ||
404 | * residual data area. | ||
405 | */ | ||
406 | if (r3) | ||
407 | __res = *(bd_t *)(r3 + KERNELBASE); | ||
408 | |||
409 | |||
410 | ibm44x_platform_init(); | ||
411 | |||
412 | ppc_md.setup_arch = bamboo_setup_arch; | ||
413 | ppc_md.show_cpuinfo = bamboo_show_cpuinfo; | ||
414 | ppc_md.get_irq = NULL; /* Set in ppc4xx_pic_init() */ | ||
415 | |||
416 | ppc_md.calibrate_decr = bamboo_calibrate_decr; | ||
417 | ppc_md.time_init = todc_time_init; | ||
418 | ppc_md.set_rtc_time = todc_set_rtc_time; | ||
419 | ppc_md.get_rtc_time = todc_get_rtc_time; | ||
420 | |||
421 | ppc_md.nvram_read_val = todc_direct_read_val; | ||
422 | ppc_md.nvram_write_val = todc_direct_write_val; | ||
423 | #ifdef CONFIG_KGDB | ||
424 | ppc_md.early_serial_map = bamboo_early_serial_map; | ||
425 | #endif | ||
426 | } | ||
427 | |||
diff --git a/arch/ppc/platforms/4xx/bamboo.h b/arch/ppc/platforms/4xx/bamboo.h new file mode 100644 index 000000000000..63d714504148 --- /dev/null +++ b/arch/ppc/platforms/4xx/bamboo.h | |||
@@ -0,0 +1,136 @@ | |||
1 | /* | ||
2 | * arch/ppc/platforms/bamboo.h | ||
3 | * | ||
4 | * Bamboo board definitions | ||
5 | * | ||
6 | * Wade Farnsworth <wfarnsworth@mvista.com> | ||
7 | * | ||
8 | * Copyright 2004 MontaVista Software 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_BAMBOO_H__ | ||
18 | #define __ASM_BAMBOO_H__ | ||
19 | |||
20 | #include <linux/config.h> | ||
21 | #include <platforms/4xx/ibm440ep.h> | ||
22 | |||
23 | /* F/W TLB mapping used in bootloader glue to reset EMAC */ | ||
24 | #define PPC44x_EMAC0_MR0 0x0EF600E00 | ||
25 | |||
26 | /* Location of MAC addresses in PIBS image */ | ||
27 | #define PIBS_FLASH_BASE 0xfff00000 | ||
28 | #define PIBS_MAC_BASE (PIBS_FLASH_BASE+0xc0400) | ||
29 | #define PIBS_MAC_SIZE 0x200 | ||
30 | #define PIBS_MAC_OFFSET 0x100 | ||
31 | |||
32 | /* Default clock rate */ | ||
33 | #define BAMBOO_TMRCLK 25000000 | ||
34 | |||
35 | /* RTC/NVRAM location */ | ||
36 | #define BAMBOO_RTC_ADDR 0x080000000ULL | ||
37 | #define BAMBOO_RTC_SIZE 0x2000 | ||
38 | |||
39 | /* FPGA Registers */ | ||
40 | #define BAMBOO_FPGA_ADDR 0x080002000ULL | ||
41 | |||
42 | #define BAMBOO_FPGA_CONFIG2_REG_ADDR (BAMBOO_FPGA_ADDR + 0x1) | ||
43 | #define BAMBOO_FULL_DUPLEX_EN(x) (x & 0x08) | ||
44 | #define BAMBOO_FORCE_100Mbps(x) (x & 0x04) | ||
45 | #define BAMBOO_AUTONEGOTIATE(x) (x & 0x02) | ||
46 | |||
47 | #define BAMBOO_FPGA_SETTING_REG_ADDR (BAMBOO_FPGA_ADDR + 0x3) | ||
48 | #define BAMBOO_BOOT_SMALL_FLASH(x) (!(x & 0x80)) | ||
49 | #define BAMBOO_LARGE_FLASH_EN(x) (!(x & 0x40)) | ||
50 | #define BAMBOO_BOOT_NAND_FLASH(x) (!(x & 0x20)) | ||
51 | |||
52 | #define BAMBOO_FPGA_SELECTION1_REG_ADDR (BAMBOO_FPGA_ADDR + 0x4) | ||
53 | #define BAMBOO_SEL_MII(x) (x & 0x80) | ||
54 | #define BAMBOO_SEL_RMII(x) (x & 0x40) | ||
55 | #define BAMBOO_SEL_SMII(x) (x & 0x20) | ||
56 | |||
57 | /* Flash */ | ||
58 | #define BAMBOO_SMALL_FLASH_LOW 0x087f00000ULL | ||
59 | #define BAMBOO_SMALL_FLASH_HIGH 0x0fff00000ULL | ||
60 | #define BAMBOO_SMALL_FLASH_SIZE 0x100000 | ||
61 | #define BAMBOO_LARGE_FLASH_LOW 0x087800000ULL | ||
62 | #define BAMBOO_LARGE_FLASH_HIGH1 0x0ff800000ULL | ||
63 | #define BAMBOO_LARGE_FLASH_HIGH2 0x0ffc00000ULL | ||
64 | #define BAMBOO_LARGE_FLASH_SIZE 0x400000 | ||
65 | #define BAMBOO_SRAM_LOW 0x087f00000ULL | ||
66 | #define BAMBOO_SRAM_HIGH1 0x0fff00000ULL | ||
67 | #define BAMBOO_SRAM_HIGH2 0x0ff800000ULL | ||
68 | #define BAMBOO_SRAM_SIZE 0x100000 | ||
69 | #define BAMBOO_NAND_FLASH_REG_ADDR 0x090000000ULL | ||
70 | #define BAMBOO_NAND_FLASH_REG_SIZE 0x2000 | ||
71 | |||
72 | /* | ||
73 | * Serial port defines | ||
74 | */ | ||
75 | #define RS_TABLE_SIZE 4 | ||
76 | |||
77 | #define UART0_IO_BASE 0xEF600300 | ||
78 | #define UART1_IO_BASE 0xEF600400 | ||
79 | #define UART2_IO_BASE 0xEF600500 | ||
80 | #define UART3_IO_BASE 0xEF600600 | ||
81 | |||
82 | #define BASE_BAUD 33177600/3/16 | ||
83 | #define UART0_INT 0 | ||
84 | #define UART1_INT 1 | ||
85 | #define UART2_INT 3 | ||
86 | #define UART3_INT 4 | ||
87 | |||
88 | #define STD_UART_OP(num) \ | ||
89 | { 0, BASE_BAUD, 0, UART##num##_INT, \ | ||
90 | (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST), \ | ||
91 | iomem_base: UART##num##_IO_BASE, \ | ||
92 | io_type: SERIAL_IO_MEM}, | ||
93 | |||
94 | #define SERIAL_PORT_DFNS \ | ||
95 | STD_UART_OP(0) \ | ||
96 | STD_UART_OP(1) \ | ||
97 | STD_UART_OP(2) \ | ||
98 | STD_UART_OP(3) | ||
99 | |||
100 | /* PCI support */ | ||
101 | #define BAMBOO_PCI_CFGA_PLB32 0xeec00000 | ||
102 | #define BAMBOO_PCI_CFGD_PLB32 0xeec00004 | ||
103 | |||
104 | #define BAMBOO_PCI_IO_BASE 0x00000000e8000000ULL | ||
105 | #define BAMBOO_PCI_IO_SIZE 0x00010000 | ||
106 | #define BAMBOO_PCI_MEM_OFFSET 0x00000000 | ||
107 | #define BAMBOO_PCI_PHY_MEM_BASE 0x00000000a0000000ULL | ||
108 | |||
109 | #define BAMBOO_PCI_LOWER_IO 0x00000000 | ||
110 | #define BAMBOO_PCI_UPPER_IO 0x0000ffff | ||
111 | #define BAMBOO_PCI_LOWER_MEM 0xa0000000 | ||
112 | #define BAMBOO_PCI_UPPER_MEM 0xafffffff | ||
113 | #define BAMBOO_PCI_MEM_BASE 0xa0000000 | ||
114 | |||
115 | #define BAMBOO_PCIL0_BASE 0x00000000ef400000ULL | ||
116 | #define BAMBOO_PCIL0_SIZE 0x40 | ||
117 | |||
118 | #define BAMBOO_PCIL0_PMM0LA 0x000 | ||
119 | #define BAMBOO_PCIL0_PMM0MA 0x004 | ||
120 | #define BAMBOO_PCIL0_PMM0PCILA 0x008 | ||
121 | #define BAMBOO_PCIL0_PMM0PCIHA 0x00C | ||
122 | #define BAMBOO_PCIL0_PMM1LA 0x010 | ||
123 | #define BAMBOO_PCIL0_PMM1MA 0x014 | ||
124 | #define BAMBOO_PCIL0_PMM1PCILA 0x018 | ||
125 | #define BAMBOO_PCIL0_PMM1PCIHA 0x01C | ||
126 | #define BAMBOO_PCIL0_PMM2LA 0x020 | ||
127 | #define BAMBOO_PCIL0_PMM2MA 0x024 | ||
128 | #define BAMBOO_PCIL0_PMM2PCILA 0x028 | ||
129 | #define BAMBOO_PCIL0_PMM2PCIHA 0x02C | ||
130 | #define BAMBOO_PCIL0_PTM1MS 0x030 | ||
131 | #define BAMBOO_PCIL0_PTM1LA 0x034 | ||
132 | #define BAMBOO_PCIL0_PTM2MS 0x038 | ||
133 | #define BAMBOO_PCIL0_PTM2LA 0x03C | ||
134 | |||
135 | #endif /* __ASM_BAMBOO_H__ */ | ||
136 | #endif /* __KERNEL__ */ | ||
diff --git a/arch/ppc/platforms/4xx/ebony.c b/arch/ppc/platforms/4xx/ebony.c index cd11734ef7c5..509e69a095f0 100644 --- a/arch/ppc/platforms/4xx/ebony.c +++ b/arch/ppc/platforms/4xx/ebony.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * Copyright 2002-2005 MontaVista Software Inc. | 7 | * Copyright 2002-2005 MontaVista Software Inc. |
8 | * | 8 | * |
9 | * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net> | 9 | * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net> |
10 | * Copyright (c) 2003, 2004 Zultys Technologies | 10 | * Copyright (c) 2003-2005 Zultys Technologies |
11 | * | 11 | * |
12 | * This program is free software; you can redistribute it and/or modify it | 12 | * This program is free software; you can redistribute it and/or modify it |
13 | * under the terms of the GNU General Public License as published by the | 13 | * under the terms of the GNU General Public License as published by the |
@@ -50,6 +50,7 @@ | |||
50 | #include <asm/bootinfo.h> | 50 | #include <asm/bootinfo.h> |
51 | #include <asm/ppc4xx_pic.h> | 51 | #include <asm/ppc4xx_pic.h> |
52 | #include <asm/ppcboot.h> | 52 | #include <asm/ppcboot.h> |
53 | #include <asm/tlbflush.h> | ||
53 | 54 | ||
54 | #include <syslib/gen550.h> | 55 | #include <syslib/gen550.h> |
55 | #include <syslib/ibm440gp_common.h> | 56 | #include <syslib/ibm440gp_common.h> |
@@ -248,6 +249,9 @@ ebony_early_serial_map(void) | |||
248 | #if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB) | 249 | #if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB) |
249 | /* Configure debug serial access */ | 250 | /* Configure debug serial access */ |
250 | gen550_init(0, &port); | 251 | gen550_init(0, &port); |
252 | |||
253 | /* Purge TLB entry added in head_44x.S for early serial access */ | ||
254 | _tlbie(UART0_IO_BASE); | ||
251 | #endif | 255 | #endif |
252 | 256 | ||
253 | port.membase = ioremap64(PPC440GP_UART1_ADDR, 8); | 257 | port.membase = ioremap64(PPC440GP_UART1_ADDR, 8); |
diff --git a/arch/ppc/platforms/4xx/ebony.h b/arch/ppc/platforms/4xx/ebony.h index 47c391c9174d..d08faa46a0ae 100644 --- a/arch/ppc/platforms/4xx/ebony.h +++ b/arch/ppc/platforms/4xx/ebony.h | |||
@@ -56,9 +56,18 @@ | |||
56 | * Serial port defines | 56 | * Serial port defines |
57 | */ | 57 | */ |
58 | 58 | ||
59 | /* OpenBIOS defined UART mappings, used before early_serial_setup */ | 59 | #if defined(__BOOTER__) |
60 | /* OpenBIOS defined UART mappings, used by bootloader shim */ | ||
60 | #define UART0_IO_BASE 0xE0000200 | 61 | #define UART0_IO_BASE 0xE0000200 |
61 | #define UART1_IO_BASE 0xE0000300 | 62 | #define UART1_IO_BASE 0xE0000300 |
63 | #else | ||
64 | /* head_44x.S created UART mapping, used before early_serial_setup. | ||
65 | * We cannot use default OpenBIOS UART mappings because they | ||
66 | * don't work for configurations with more than 512M RAM. --ebs | ||
67 | */ | ||
68 | #define UART0_IO_BASE 0xF0000200 | ||
69 | #define UART1_IO_BASE 0xF0000300 | ||
70 | #endif | ||
62 | 71 | ||
63 | /* external Epson SG-615P */ | 72 | /* external Epson SG-615P */ |
64 | #define BASE_BAUD 691200 | 73 | #define BASE_BAUD 691200 |
@@ -66,7 +75,7 @@ | |||
66 | #define STD_UART_OP(num) \ | 75 | #define STD_UART_OP(num) \ |
67 | { 0, BASE_BAUD, 0, UART##num##_INT, \ | 76 | { 0, BASE_BAUD, 0, UART##num##_INT, \ |
68 | (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST), \ | 77 | (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST), \ |
69 | iomem_base: UART##num##_IO_BASE, \ | 78 | iomem_base: (void*)UART##num##_IO_BASE, \ |
70 | io_type: SERIAL_IO_MEM}, | 79 | io_type: SERIAL_IO_MEM}, |
71 | 80 | ||
72 | #define SERIAL_PORT_DFNS \ | 81 | #define SERIAL_PORT_DFNS \ |
diff --git a/arch/ppc/platforms/4xx/ibm440ep.c b/arch/ppc/platforms/4xx/ibm440ep.c new file mode 100644 index 000000000000..284da01f1ffd --- /dev/null +++ b/arch/ppc/platforms/4xx/ibm440ep.c | |||
@@ -0,0 +1,220 @@ | |||
1 | /* | ||
2 | * arch/ppc/platforms/4xx/ibm440ep.c | ||
3 | * | ||
4 | * PPC440EP I/O descriptions | ||
5 | * | ||
6 | * Wade Farnsworth <wfarnsworth@mvista.com> | ||
7 | * Copyright 2004 MontaVista Software Inc. | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify it | ||
10 | * under the terms of the GNU General Public License as published by the | ||
11 | * Free Software Foundation; either version 2 of the License, or (at your | ||
12 | * option) any later version. | ||
13 | * | ||
14 | */ | ||
15 | #include <linux/init.h> | ||
16 | #include <linux/module.h> | ||
17 | #include <platforms/4xx/ibm440ep.h> | ||
18 | #include <asm/ocp.h> | ||
19 | #include <asm/ppc4xx_pic.h> | ||
20 | |||
21 | static struct ocp_func_emac_data ibm440ep_emac0_def = { | ||
22 | .rgmii_idx = -1, /* No RGMII */ | ||
23 | .rgmii_mux = -1, /* No RGMII */ | ||
24 | .zmii_idx = 0, /* ZMII device index */ | ||
25 | .zmii_mux = 0, /* ZMII input of this EMAC */ | ||
26 | .mal_idx = 0, /* MAL device index */ | ||
27 | .mal_rx_chan = 0, /* MAL rx channel number */ | ||
28 | .mal_tx_chan = 0, /* MAL tx channel number */ | ||
29 | .wol_irq = 61, /* WOL interrupt number */ | ||
30 | .mdio_idx = -1, /* No shared MDIO */ | ||
31 | .tah_idx = -1, /* No TAH */ | ||
32 | }; | ||
33 | |||
34 | static struct ocp_func_emac_data ibm440ep_emac1_def = { | ||
35 | .rgmii_idx = -1, /* No RGMII */ | ||
36 | .rgmii_mux = -1, /* No RGMII */ | ||
37 | .zmii_idx = 0, /* ZMII device index */ | ||
38 | .zmii_mux = 1, /* ZMII input of this EMAC */ | ||
39 | .mal_idx = 0, /* MAL device index */ | ||
40 | .mal_rx_chan = 1, /* MAL rx channel number */ | ||
41 | .mal_tx_chan = 2, /* MAL tx channel number */ | ||
42 | .wol_irq = 63, /* WOL interrupt number */ | ||
43 | .mdio_idx = -1, /* No shared MDIO */ | ||
44 | .tah_idx = -1, /* No TAH */ | ||
45 | }; | ||
46 | OCP_SYSFS_EMAC_DATA() | ||
47 | |||
48 | static struct ocp_func_mal_data ibm440ep_mal0_def = { | ||
49 | .num_tx_chans = 4, /* Number of TX channels */ | ||
50 | .num_rx_chans = 2, /* Number of RX channels */ | ||
51 | .txeob_irq = 10, /* TX End Of Buffer IRQ */ | ||
52 | .rxeob_irq = 11, /* RX End Of Buffer IRQ */ | ||
53 | .txde_irq = 33, /* TX Descriptor Error IRQ */ | ||
54 | .rxde_irq = 34, /* RX Descriptor Error IRQ */ | ||
55 | .serr_irq = 32, /* MAL System Error IRQ */ | ||
56 | }; | ||
57 | OCP_SYSFS_MAL_DATA() | ||
58 | |||
59 | static struct ocp_func_iic_data ibm440ep_iic0_def = { | ||
60 | .fast_mode = 0, /* Use standad mode (100Khz) */ | ||
61 | }; | ||
62 | |||
63 | static struct ocp_func_iic_data ibm440ep_iic1_def = { | ||
64 | .fast_mode = 0, /* Use standad mode (100Khz) */ | ||
65 | }; | ||
66 | OCP_SYSFS_IIC_DATA() | ||
67 | |||
68 | struct ocp_def core_ocp[] = { | ||
69 | { .vendor = OCP_VENDOR_IBM, | ||
70 | .function = OCP_FUNC_OPB, | ||
71 | .index = 0, | ||
72 | .paddr = 0x0EF600000ULL, | ||
73 | .irq = OCP_IRQ_NA, | ||
74 | .pm = OCP_CPM_NA, | ||
75 | }, | ||
76 | { .vendor = OCP_VENDOR_IBM, | ||
77 | .function = OCP_FUNC_16550, | ||
78 | .index = 0, | ||
79 | .paddr = PPC440EP_UART0_ADDR, | ||
80 | .irq = UART0_INT, | ||
81 | .pm = IBM_CPM_UART0, | ||
82 | }, | ||
83 | { .vendor = OCP_VENDOR_IBM, | ||
84 | .function = OCP_FUNC_16550, | ||
85 | .index = 1, | ||
86 | .paddr = PPC440EP_UART1_ADDR, | ||
87 | .irq = UART1_INT, | ||
88 | .pm = IBM_CPM_UART1, | ||
89 | }, | ||
90 | { .vendor = OCP_VENDOR_IBM, | ||
91 | .function = OCP_FUNC_16550, | ||
92 | .index = 2, | ||
93 | .paddr = PPC440EP_UART2_ADDR, | ||
94 | .irq = UART2_INT, | ||
95 | .pm = IBM_CPM_UART2, | ||
96 | }, | ||
97 | { .vendor = OCP_VENDOR_IBM, | ||
98 | .function = OCP_FUNC_16550, | ||
99 | .index = 3, | ||
100 | .paddr = PPC440EP_UART3_ADDR, | ||
101 | .irq = UART3_INT, | ||
102 | .pm = IBM_CPM_UART3, | ||
103 | }, | ||
104 | { .vendor = OCP_VENDOR_IBM, | ||
105 | .function = OCP_FUNC_IIC, | ||
106 | .index = 0, | ||
107 | .paddr = 0x0EF600700ULL, | ||
108 | .irq = 2, | ||
109 | .pm = IBM_CPM_IIC0, | ||
110 | .additions = &ibm440ep_iic0_def, | ||
111 | .show = &ocp_show_iic_data | ||
112 | }, | ||
113 | { .vendor = OCP_VENDOR_IBM, | ||
114 | .function = OCP_FUNC_IIC, | ||
115 | .index = 1, | ||
116 | .paddr = 0x0EF600800ULL, | ||
117 | .irq = 7, | ||
118 | .pm = IBM_CPM_IIC1, | ||
119 | .additions = &ibm440ep_iic1_def, | ||
120 | .show = &ocp_show_iic_data | ||
121 | }, | ||
122 | { .vendor = OCP_VENDOR_IBM, | ||
123 | .function = OCP_FUNC_GPIO, | ||
124 | .index = 0, | ||
125 | .paddr = 0x0EF600B00ULL, | ||
126 | .irq = OCP_IRQ_NA, | ||
127 | .pm = IBM_CPM_GPIO0, | ||
128 | }, | ||
129 | { .vendor = OCP_VENDOR_IBM, | ||
130 | .function = OCP_FUNC_GPIO, | ||
131 | .index = 1, | ||
132 | .paddr = 0x0EF600C00ULL, | ||
133 | .irq = OCP_IRQ_NA, | ||
134 | .pm = OCP_CPM_NA, | ||
135 | }, | ||
136 | { .vendor = OCP_VENDOR_IBM, | ||
137 | .function = OCP_FUNC_MAL, | ||
138 | .paddr = OCP_PADDR_NA, | ||
139 | .irq = OCP_IRQ_NA, | ||
140 | .pm = OCP_CPM_NA, | ||
141 | .additions = &ibm440ep_mal0_def, | ||
142 | .show = &ocp_show_mal_data, | ||
143 | }, | ||
144 | { .vendor = OCP_VENDOR_IBM, | ||
145 | .function = OCP_FUNC_EMAC, | ||
146 | .index = 0, | ||
147 | .paddr = 0x0EF600E00ULL, | ||
148 | .irq = 60, | ||
149 | .pm = OCP_CPM_NA, | ||
150 | .additions = &ibm440ep_emac0_def, | ||
151 | .show = &ocp_show_emac_data, | ||
152 | }, | ||
153 | { .vendor = OCP_VENDOR_IBM, | ||
154 | .function = OCP_FUNC_EMAC, | ||
155 | .index = 1, | ||
156 | .paddr = 0x0EF600F00ULL, | ||
157 | .irq = 62, | ||
158 | .pm = OCP_CPM_NA, | ||
159 | .additions = &ibm440ep_emac1_def, | ||
160 | .show = &ocp_show_emac_data, | ||
161 | }, | ||
162 | { .vendor = OCP_VENDOR_IBM, | ||
163 | .function = OCP_FUNC_ZMII, | ||
164 | .paddr = 0x0EF600D00ULL, | ||
165 | .irq = OCP_IRQ_NA, | ||
166 | .pm = OCP_CPM_NA, | ||
167 | }, | ||
168 | { .vendor = OCP_VENDOR_INVALID | ||
169 | } | ||
170 | }; | ||
171 | |||
172 | /* Polarity and triggering settings for internal interrupt sources */ | ||
173 | struct ppc4xx_uic_settings ppc4xx_core_uic_cfg[] __initdata = { | ||
174 | { .polarity = 0xffbffe03, | ||
175 | .triggering = 0xfffffe00, | ||
176 | .ext_irq_mask = 0x000001fc, /* IRQ0 - IRQ6 */ | ||
177 | }, | ||
178 | { .polarity = 0xffffc6ef, | ||
179 | .triggering = 0xffffc7ff, | ||
180 | .ext_irq_mask = 0x00003800, /* IRQ7 - IRQ9 */ | ||
181 | }, | ||
182 | }; | ||
183 | |||
184 | static struct resource usb_gadget_resources[] = { | ||
185 | [0] = { | ||
186 | .start = 0x050000100ULL, | ||
187 | .end = 0x05000017FULL, | ||
188 | .flags = IORESOURCE_MEM, | ||
189 | }, | ||
190 | [1] = { | ||
191 | .start = 55, | ||
192 | .end = 55, | ||
193 | .flags = IORESOURCE_IRQ, | ||
194 | }, | ||
195 | }; | ||
196 | |||
197 | static u64 dma_mask = 0xffffffffULL; | ||
198 | |||
199 | static struct platform_device usb_gadget_device = { | ||
200 | .name = "musbhsfc", | ||
201 | .id = 0, | ||
202 | .num_resources = ARRAY_SIZE(usb_gadget_resources), | ||
203 | .resource = usb_gadget_resources, | ||
204 | .dev = { | ||
205 | .dma_mask = &dma_mask, | ||
206 | .coherent_dma_mask = 0xffffffffULL, | ||
207 | } | ||
208 | }; | ||
209 | |||
210 | static struct platform_device *ibm440ep_devs[] __initdata = { | ||
211 | &usb_gadget_device, | ||
212 | }; | ||
213 | |||
214 | static int __init | ||
215 | ibm440ep_platform_add_devices(void) | ||
216 | { | ||
217 | return platform_add_devices(ibm440ep_devs, ARRAY_SIZE(ibm440ep_devs)); | ||
218 | } | ||
219 | arch_initcall(ibm440ep_platform_add_devices); | ||
220 | |||
diff --git a/arch/ppc/platforms/4xx/ibm440ep.h b/arch/ppc/platforms/4xx/ibm440ep.h new file mode 100644 index 000000000000..97c80b8e3e10 --- /dev/null +++ b/arch/ppc/platforms/4xx/ibm440ep.h | |||
@@ -0,0 +1,76 @@ | |||
1 | /* | ||
2 | * arch/ppc/platforms/4xx/ibm440ep.h | ||
3 | * | ||
4 | * PPC440EP definitions | ||
5 | * | ||
6 | * Wade Farnsworth <wfarnsworth@mvista.com> | ||
7 | * | ||
8 | * Copyright 2002 Roland Dreier | ||
9 | * Copyright 2004 MontaVista Software, Inc. | ||
10 | * | ||
11 | * This program is free software; you can redistribute it and/or modify it | ||
12 | * under the terms of the GNU General Public License as published by the | ||
13 | * Free Software Foundation; either version 2 of the License, or (at your | ||
14 | * option) any later version. | ||
15 | * | ||
16 | */ | ||
17 | |||
18 | #ifdef __KERNEL__ | ||
19 | #ifndef __PPC_PLATFORMS_IBM440EP_H | ||
20 | #define __PPC_PLATFORMS_IBM440EP_H | ||
21 | |||
22 | #include <linux/config.h> | ||
23 | #include <asm/ibm44x.h> | ||
24 | |||
25 | /* UART */ | ||
26 | #define PPC440EP_UART0_ADDR 0x0EF600300 | ||
27 | #define PPC440EP_UART1_ADDR 0x0EF600400 | ||
28 | #define PPC440EP_UART2_ADDR 0x0EF600500 | ||
29 | #define PPC440EP_UART3_ADDR 0x0EF600600 | ||
30 | #define UART0_INT 0 | ||
31 | #define UART1_INT 1 | ||
32 | #define UART2_INT 3 | ||
33 | #define UART3_INT 4 | ||
34 | |||
35 | /* Clock and Power Management */ | ||
36 | #define IBM_CPM_IIC0 0x80000000 /* IIC interface */ | ||
37 | #define IBM_CPM_IIC1 0x40000000 /* IIC interface */ | ||
38 | #define IBM_CPM_PCI 0x20000000 /* PCI bridge */ | ||
39 | #define IBM_CPM_USB1H 0x08000000 /* USB 1.1 Host */ | ||
40 | #define IBM_CPM_FPU 0x04000000 /* floating point unit */ | ||
41 | #define IBM_CPM_CPU 0x02000000 /* processor core */ | ||
42 | #define IBM_CPM_DMA 0x01000000 /* DMA controller */ | ||
43 | #define IBM_CPM_BGO 0x00800000 /* PLB to OPB bus arbiter */ | ||
44 | #define IBM_CPM_BGI 0x00400000 /* OPB to PLB bridge */ | ||
45 | #define IBM_CPM_EBC 0x00200000 /* External Bus Controller */ | ||
46 | #define IBM_CPM_EBM 0x00100000 /* Ext Bus Master Interface */ | ||
47 | #define IBM_CPM_DMC 0x00080000 /* SDRAM peripheral controller */ | ||
48 | #define IBM_CPM_PLB4 0x00040000 /* PLB4 bus arbiter */ | ||
49 | #define IBM_CPM_PLB4x3 0x00020000 /* PLB4 to PLB3 bridge controller */ | ||
50 | #define IBM_CPM_PLB3x4 0x00010000 /* PLB3 to PLB4 bridge controller */ | ||
51 | #define IBM_CPM_PLB3 0x00008000 /* PLB3 bus arbiter */ | ||
52 | #define IBM_CPM_PPM 0x00002000 /* PLB Performance Monitor */ | ||
53 | #define IBM_CPM_UIC1 0x00001000 /* Universal Interrupt Controller */ | ||
54 | #define IBM_CPM_GPIO0 0x00000800 /* General Purpose IO (??) */ | ||
55 | #define IBM_CPM_GPT 0x00000400 /* General Purpose Timers */ | ||
56 | #define IBM_CPM_UART0 0x00000200 /* serial port 0 */ | ||
57 | #define IBM_CPM_UART1 0x00000100 /* serial port 1 */ | ||
58 | #define IBM_CPM_UIC0 0x00000080 /* Universal Interrupt Controller */ | ||
59 | #define IBM_CPM_TMRCLK 0x00000040 /* CPU timers */ | ||
60 | #define IBM_CPM_EMAC0 0x00000020 /* ethernet port 0 */ | ||
61 | #define IBM_CPM_EMAC1 0x00000010 /* ethernet port 1 */ | ||
62 | #define IBM_CPM_UART2 0x00000008 /* serial port 2 */ | ||
63 | #define IBM_CPM_UART3 0x00000004 /* serial port 3 */ | ||
64 | #define IBM_CPM_USB2D 0x00000002 /* USB 2.0 Device */ | ||
65 | #define IBM_CPM_USB2H 0x00000001 /* USB 2.0 Host */ | ||
66 | |||
67 | #define DFLT_IBM4xx_PM ~(IBM_CPM_UIC0 | IBM_CPM_UIC1 | IBM_CPM_CPU \ | ||
68 | | IBM_CPM_EBC | IBM_CPM_BGO | IBM_CPM_FPU \ | ||
69 | | IBM_CPM_EBM | IBM_CPM_PLB4 | IBM_CPM_3x4 \ | ||
70 | | IBM_CPM_PLB3 | IBM_CPM_PLB4x3 \ | ||
71 | | IBM_CPM_EMAC0 | IBM_CPM_TMRCLK \ | ||
72 | | IBM_CPM_DMA | IBM_CPM_PCI | IBM_CPM_EMAC1) | ||
73 | |||
74 | |||
75 | #endif /* __PPC_PLATFORMS_IBM440EP_H */ | ||
76 | #endif /* __KERNEL__ */ | ||
diff --git a/arch/ppc/platforms/4xx/ocotea.c b/arch/ppc/platforms/4xx/ocotea.c index 5f82a6bc7046..8fc34a344769 100644 --- a/arch/ppc/platforms/4xx/ocotea.c +++ b/arch/ppc/platforms/4xx/ocotea.c | |||
@@ -48,6 +48,7 @@ | |||
48 | #include <asm/bootinfo.h> | 48 | #include <asm/bootinfo.h> |
49 | #include <asm/ppc4xx_pic.h> | 49 | #include <asm/ppc4xx_pic.h> |
50 | #include <asm/ppcboot.h> | 50 | #include <asm/ppcboot.h> |
51 | #include <asm/tlbflush.h> | ||
51 | 52 | ||
52 | #include <syslib/gen550.h> | 53 | #include <syslib/gen550.h> |
53 | #include <syslib/ibm440gx_common.h> | 54 | #include <syslib/ibm440gx_common.h> |
@@ -266,6 +267,9 @@ ocotea_early_serial_map(void) | |||
266 | #if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB) | 267 | #if defined(CONFIG_SERIAL_TEXT_DEBUG) || defined(CONFIG_KGDB) |
267 | /* Configure debug serial access */ | 268 | /* Configure debug serial access */ |
268 | gen550_init(0, &port); | 269 | gen550_init(0, &port); |
270 | |||
271 | /* Purge TLB entry added in head_44x.S for early serial access */ | ||
272 | _tlbie(UART0_IO_BASE); | ||
269 | #endif | 273 | #endif |
270 | 274 | ||
271 | port.membase = ioremap64(PPC440GX_UART1_ADDR, 8); | 275 | port.membase = ioremap64(PPC440GX_UART1_ADDR, 8); |
diff --git a/arch/ppc/platforms/4xx/ocotea.h b/arch/ppc/platforms/4xx/ocotea.h index 202dc8251190..33251153ac5f 100644 --- a/arch/ppc/platforms/4xx/ocotea.h +++ b/arch/ppc/platforms/4xx/ocotea.h | |||
@@ -55,15 +55,24 @@ | |||
55 | */ | 55 | */ |
56 | #define RS_TABLE_SIZE 2 | 56 | #define RS_TABLE_SIZE 2 |
57 | 57 | ||
58 | /* OpenBIOS defined UART mappings, used before early_serial_setup */ | 58 | #if defined(__BOOTER__) |
59 | /* OpenBIOS defined UART mappings, used by bootloader shim */ | ||
59 | #define UART0_IO_BASE 0xE0000200 | 60 | #define UART0_IO_BASE 0xE0000200 |
60 | #define UART1_IO_BASE 0xE0000300 | 61 | #define UART1_IO_BASE 0xE0000300 |
62 | #else | ||
63 | /* head_44x.S created UART mapping, used before early_serial_setup. | ||
64 | * We cannot use default OpenBIOS UART mappings because they | ||
65 | * don't work for configurations with more than 512M RAM. --ebs | ||
66 | */ | ||
67 | #define UART0_IO_BASE 0xF0000200 | ||
68 | #define UART1_IO_BASE 0xF0000300 | ||
69 | #endif | ||
61 | 70 | ||
62 | #define BASE_BAUD 11059200/16 | 71 | #define BASE_BAUD 11059200/16 |
63 | #define STD_UART_OP(num) \ | 72 | #define STD_UART_OP(num) \ |
64 | { 0, BASE_BAUD, 0, UART##num##_INT, \ | 73 | { 0, BASE_BAUD, 0, UART##num##_INT, \ |
65 | (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST), \ | 74 | (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST), \ |
66 | iomem_base: UART##num##_IO_BASE, \ | 75 | iomem_base: (void*)UART##num##_IO_BASE, \ |
67 | io_type: SERIAL_IO_MEM}, | 76 | io_type: SERIAL_IO_MEM}, |
68 | 77 | ||
69 | #define SERIAL_PORT_DFNS \ | 78 | #define SERIAL_PORT_DFNS \ |
diff --git a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile index dec5bf4f6879..220a65ab0a51 100644 --- a/arch/ppc/syslib/Makefile +++ b/arch/ppc/syslib/Makefile | |||
@@ -11,6 +11,7 @@ obj-$(CONFIG_PPCBUG_NVRAM) += prep_nvram.o | |||
11 | obj-$(CONFIG_PPC_OCP) += ocp.o | 11 | obj-$(CONFIG_PPC_OCP) += ocp.o |
12 | obj-$(CONFIG_IBM_OCP) += ibm_ocp.o | 12 | obj-$(CONFIG_IBM_OCP) += ibm_ocp.o |
13 | obj-$(CONFIG_44x) += ibm44x_common.o | 13 | obj-$(CONFIG_44x) += ibm44x_common.o |
14 | obj-$(CONFIG_440EP) += ibm440gx_common.o | ||
14 | obj-$(CONFIG_440GP) += ibm440gp_common.o | 15 | obj-$(CONFIG_440GP) += ibm440gp_common.o |
15 | obj-$(CONFIG_440GX) += ibm440gx_common.o | 16 | obj-$(CONFIG_440GX) += ibm440gx_common.o |
16 | obj-$(CONFIG_440SP) += ibm440gx_common.o ibm440sp_common.o | 17 | obj-$(CONFIG_440SP) += ibm440gx_common.o ibm440sp_common.o |
@@ -44,6 +45,7 @@ obj-$(CONFIG_PPC_CHRP) += open_pic.o indirect_pci.o i8259.o | |||
44 | obj-$(CONFIG_PPC_PREP) += open_pic.o indirect_pci.o i8259.o todc_time.o | 45 | obj-$(CONFIG_PPC_PREP) += open_pic.o indirect_pci.o i8259.o todc_time.o |
45 | obj-$(CONFIG_ADIR) += i8259.o indirect_pci.o pci_auto.o \ | 46 | obj-$(CONFIG_ADIR) += i8259.o indirect_pci.o pci_auto.o \ |
46 | todc_time.o | 47 | todc_time.o |
48 | obj-$(CONFIG_BAMBOO) += indirect_pci.o pci_auto.o todc_time.o | ||
47 | obj-$(CONFIG_CPCI690) += todc_time.o pci_auto.o | 49 | obj-$(CONFIG_CPCI690) += todc_time.o pci_auto.o |
48 | obj-$(CONFIG_EBONY) += indirect_pci.o pci_auto.o todc_time.o | 50 | obj-$(CONFIG_EBONY) += indirect_pci.o pci_auto.o todc_time.o |
49 | obj-$(CONFIG_EV64260) += todc_time.o pci_auto.o | 51 | obj-$(CONFIG_EV64260) += todc_time.o pci_auto.o |
diff --git a/arch/ppc/syslib/ibm440gx_common.c b/arch/ppc/syslib/ibm440gx_common.c index 4ad85e0e0234..d4776af6a3ca 100644 --- a/arch/ppc/syslib/ibm440gx_common.c +++ b/arch/ppc/syslib/ibm440gx_common.c | |||
@@ -34,6 +34,10 @@ void __init ibm440gx_get_clocks(struct ibm44x_clocks* p, unsigned int sys_clk, | |||
34 | u32 plld = CPR_READ(DCRN_CPR_PLLD); | 34 | u32 plld = CPR_READ(DCRN_CPR_PLLD); |
35 | u32 uart0 = SDR_READ(DCRN_SDR_UART0); | 35 | u32 uart0 = SDR_READ(DCRN_SDR_UART0); |
36 | u32 uart1 = SDR_READ(DCRN_SDR_UART1); | 36 | u32 uart1 = SDR_READ(DCRN_SDR_UART1); |
37 | #ifdef CONFIG_440EP | ||
38 | u32 uart2 = SDR_READ(DCRN_SDR_UART2); | ||
39 | u32 uart3 = SDR_READ(DCRN_SDR_UART3); | ||
40 | #endif | ||
37 | 41 | ||
38 | /* Dividers */ | 42 | /* Dividers */ |
39 | u32 fbdv = __fix_zero((plld >> 24) & 0x1f, 32); | 43 | u32 fbdv = __fix_zero((plld >> 24) & 0x1f, 32); |
@@ -96,6 +100,17 @@ bypass: | |||
96 | p->uart1 = ser_clk; | 100 | p->uart1 = ser_clk; |
97 | else | 101 | else |
98 | p->uart1 = p->plb / __fix_zero(uart1 & 0xff, 256); | 102 | p->uart1 = p->plb / __fix_zero(uart1 & 0xff, 256); |
103 | #ifdef CONFIG_440EP | ||
104 | if (uart2 & 0x00800000) | ||
105 | p->uart2 = ser_clk; | ||
106 | else | ||
107 | p->uart2 = p->plb / __fix_zero(uart2 & 0xff, 256); | ||
108 | |||
109 | if (uart3 & 0x00800000) | ||
110 | p->uart3 = ser_clk; | ||
111 | else | ||
112 | p->uart3 = p->plb / __fix_zero(uart3 & 0xff, 256); | ||
113 | #endif | ||
99 | } | 114 | } |
100 | 115 | ||
101 | /* Issue L2C diagnostic command */ | 116 | /* Issue L2C diagnostic command */ |
diff --git a/arch/ppc/syslib/ibm44x_common.h b/arch/ppc/syslib/ibm44x_common.h index b14eb603ce01..c16b6a5ac6ab 100644 --- a/arch/ppc/syslib/ibm44x_common.h +++ b/arch/ppc/syslib/ibm44x_common.h | |||
@@ -29,6 +29,10 @@ struct ibm44x_clocks { | |||
29 | unsigned int ebc; /* PerClk */ | 29 | unsigned int ebc; /* PerClk */ |
30 | unsigned int uart0; | 30 | unsigned int uart0; |
31 | unsigned int uart1; | 31 | unsigned int uart1; |
32 | #ifdef CONFIG_440EP | ||
33 | unsigned int uart2; | ||
34 | unsigned int uart3; | ||
35 | #endif | ||
32 | }; | 36 | }; |
33 | 37 | ||
34 | /* common 44x platform init */ | 38 | /* common 44x platform init */ |
diff --git a/arch/ppc/syslib/m8xx_setup.c b/arch/ppc/syslib/m8xx_setup.c index c1db2ab1d154..55a381af4e37 100644 --- a/arch/ppc/syslib/m8xx_setup.c +++ b/arch/ppc/syslib/m8xx_setup.c | |||
@@ -57,7 +57,7 @@ unsigned char __res[sizeof(bd_t)]; | |||
57 | extern void m8xx_ide_init(void); | 57 | extern void m8xx_ide_init(void); |
58 | 58 | ||
59 | extern unsigned long find_available_memory(void); | 59 | extern unsigned long find_available_memory(void); |
60 | extern void m8xx_cpm_reset(uint cpm_page); | 60 | extern void m8xx_cpm_reset(); |
61 | extern void m8xx_wdt_handler_install(bd_t *bp); | 61 | extern void m8xx_wdt_handler_install(bd_t *bp); |
62 | extern void rpxfb_alloc_pages(void); | 62 | extern void rpxfb_alloc_pages(void); |
63 | extern void cpm_interrupt_init(void); | 63 | extern void cpm_interrupt_init(void); |
@@ -70,13 +70,9 @@ board_init(void) | |||
70 | void __init | 70 | void __init |
71 | m8xx_setup_arch(void) | 71 | m8xx_setup_arch(void) |
72 | { | 72 | { |
73 | int cpm_page; | ||
74 | |||
75 | cpm_page = (int) alloc_bootmem_pages(PAGE_SIZE); | ||
76 | |||
77 | /* Reset the Communication Processor Module. | 73 | /* Reset the Communication Processor Module. |
78 | */ | 74 | */ |
79 | m8xx_cpm_reset(cpm_page); | 75 | m8xx_cpm_reset(); |
80 | 76 | ||
81 | #ifdef CONFIG_FB_RPX | 77 | #ifdef CONFIG_FB_RPX |
82 | rpxfb_alloc_pages(); | 78 | rpxfb_alloc_pages(); |
diff --git a/arch/ppc/syslib/mpc83xx_devices.c b/arch/ppc/syslib/mpc83xx_devices.c index 75c8e9834ae7..5aaf0e58e1f9 100644 --- a/arch/ppc/syslib/mpc83xx_devices.c +++ b/arch/ppc/syslib/mpc83xx_devices.c | |||
@@ -191,8 +191,8 @@ struct platform_device ppc_sys_platform_devices[] = { | |||
191 | .num_resources = 2, | 191 | .num_resources = 2, |
192 | .resource = (struct resource[]) { | 192 | .resource = (struct resource[]) { |
193 | { | 193 | { |
194 | .start = 0x22000, | 194 | .start = 0x23000, |
195 | .end = 0x22fff, | 195 | .end = 0x23fff, |
196 | .flags = IORESOURCE_MEM, | 196 | .flags = IORESOURCE_MEM, |
197 | }, | 197 | }, |
198 | { | 198 | { |
@@ -208,8 +208,8 @@ struct platform_device ppc_sys_platform_devices[] = { | |||
208 | .num_resources = 2, | 208 | .num_resources = 2, |
209 | .resource = (struct resource[]) { | 209 | .resource = (struct resource[]) { |
210 | { | 210 | { |
211 | .start = 0x23000, | 211 | .start = 0x22000, |
212 | .end = 0x23fff, | 212 | .end = 0x22fff, |
213 | .flags = IORESOURCE_MEM, | 213 | .flags = IORESOURCE_MEM, |
214 | }, | 214 | }, |
215 | { | 215 | { |