Update of /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms
In directory usw-pr-cvs1:/tmp/cvs-serv31846/linux/arch/ppc/platforms
Modified Files:
chrp_setup.c pmac_setup.c prep_setup.c
Removed Files:
gemini_setup.c iSeries_setup.c oak_setup.c sandpoint_setup.c
spruce_setup.c
Log Message:
Synced to 2.5.26
Index: chrp_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/chrp_setup.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- chrp_setup.c 10 Jul 2002 18:08:02 -0000 1.6
+++ chrp_setup.c 23 Jul 2002 19:18:48 -0000 1.7
@@ -36,6 +36,7 @@
#include <linux/delay.h>
#include <linux/ide.h>
#include <linux/irq.h>
+#include <linux/console.h>
#include <linux/seq_file.h>
#include <linux/root_dev.h>
@@ -67,6 +68,7 @@
void btext_progress(char *, unsigned short);
extern unsigned long pmac_find_end_of_memory(void);
+extern void select_adb_keyboard(void);
extern int of_show_percpuinfo(struct seq_file *, int);
extern kdev_t boot_dev;
@@ -371,6 +373,9 @@
int i;
unsigned long chrp_int_ack;
unsigned char init_senses[NR_IRQS - NUM_8259_INTERRUPTS];
+#if defined(CONFIG_VT) && defined(CONFIG_INPUT_ADBHID) && defined(XMON)
+ struct device_node *kbd;
+#endif
for (np = find_devices("pci"); np != NULL; np = np->next) {
unsigned int *addrp = (unsigned int *)
@@ -395,6 +400,17 @@
for (i = 0; i < NUM_8259_INTERRUPTS; i++)
irq_desc[i].handler = &i8259_pic;
i8259_init(chrp_int_ack);
+
+#if defined(CONFIG_VT) && defined(CONFIG_INPUT_ADBHID) && defined(XMON)
+ /* see if there is a keyboard in the device tree
+ with a parent of type "adb" */
+ for (kbd = find_devices("keyboard"); kbd; kbd = kbd->next)
+ if (kbd->parent && kbd->parent->type
+ && strcmp(kbd->parent->type, "adb") == 0)
+ break;
+ if (kbd)
+ request_irq(HYDRA_INT_ADB_NMI, xmon_irq, 0, "XMON break", 0);
+#endif
}
void __init
@@ -414,6 +430,22 @@
if (ppc_md.progress)
ppc_md.progress(" Have fun! ", 0x7777);
+
+#if defined(CONFIG_VT) && defined(CONFIG_INPUT)
+ /* see if there is a keyboard in the device tree
+ with a parent of type "adb" */
+ {
+ struct device_node *kbd;
+
+ for (kbd = find_devices("keyboard"); kbd; kbd = kbd->next) {
+ if (kbd->parent && kbd->parent->type
+ && strcmp(kbd->parent->type, "adb") == 0) {
+ select_adb_keyboard();
+ break;
+ }
+ }
+ }
+#endif /* CONFIG_VT && CONFIG_INPUT */
}
void __init
Index: pmac_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/pmac_setup.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pmac_setup.c 18 Jun 2002 18:51:54 -0000 1.4
+++ pmac_setup.c 23 Jul 2002 19:18:48 -0000 1.5
@@ -44,6 +44,8 @@
#include <linux/ioport.h>
#include <linux/major.h>
#include <linux/blk.h>
+#include <linux/vt_kern.h>
+#include <linux/console.h>
#include <linux/ide.h>
#include <linux/pci.h>
#include <linux/adb.h>
@@ -64,6 +66,7 @@
#include <asm/ohare.h>
#include <asm/mediabay.h>
#include <asm/machdep.h>
+#include <asm/keyboard.h>
#include <asm/dma.h>
#include <asm/bootx.h>
#include <asm/cputable.h>
@@ -84,6 +87,7 @@
extern void pmac_find_bridges(void);
extern int pmac_ide_check_base(ide_ioreg_t base);
extern ide_ioreg_t pmac_ide_get_base(int index);
+
extern void pmac_nvram_update(void);
extern unsigned char pmac_nvram_read_byte(int addr);
extern void pmac_nvram_write_byte(int addr, unsigned char val);
@@ -305,6 +309,9 @@
#endif
#ifdef CONFIG_NVRAM
pmac_nvram_init();
+#endif
+#ifdef CONFIG_DUMMY_CONSOLE
+ conswitchp = &dummy_con;
#endif
#ifdef CONFIG_BLK_DEV_INITRD
if (initrd_start)
Index: prep_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/prep_setup.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- prep_setup.c 10 Jul 2002 18:08:02 -0000 1.6
+++ prep_setup.c 23 Jul 2002 19:18:48 -0000 1.7
@@ -386,9 +386,6 @@
#ifdef CONFIG_VGA_CONSOLE
/* vgacon.c needs to know where we mapped IO memory in io_block_mapping() */
vgacon_remap_base = 0xf0000000;
- conswitchp = &vga_con;
-#elif defined(CONFIG_DUMMY_CONSOLE)
- conswitchp = &dummy_con;
#endif
}
--- gemini_setup.c DELETED ---
--- iSeries_setup.c DELETED ---
--- oak_setup.c DELETED ---
--- sandpoint_setup.c DELETED ---
--- spruce_setup.c DELETED ---
|
