Support for Toshiba TX4927 based board in 2.6.10

PATCH New Manish Lachwani 1 participant 1 message Nov 11, 2004

Subsystems (2)

MIPS Char and misc drivers

lore

Share & tools

lore

Manish Lachwani

author

2004-11-11 22:12 UTC #0 lore raw

PATCH 1/1 Support for Toshiba TX4927 based board in 2.6.10

Hi Ralf

Attached patch implements support for Toshiba TX4927 based board in 2.6.10. Please review ...

Thanks
Manish Lachwani

Source: MontaVista Software, Inc. | http://www.mvista.com | Manish lachwani <[email protected]>
Type: Defect Fix
Disposition: Submitted to Linux-MIPS
Description:

	Support TX4927 board in 2.6.10

arch/mips/Makefile +4 -0

Index: linux/arch/mips/Makefile
===================================================================
@@ -159,6 +159,10 @@
 			$(call set_gccflags,r4600,mips3,r4600,mips3,mips2) \
 			-Wa,--trap
 
+cflags-$(CONFIG_CPU_TX49XX)	+= \
+			$(call set_gccflags,r4600,mips3,r4600,mips3,mips2)  \
+			-Wa,--trap
+
 cflags-$(CONFIG_CPU_MIPS32)	+= \
 			$(call set_gccflags,mips32,mips32,r4600,mips3,mips2) \
 			-Wa,--trap

arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c +2 -9

Index: linux/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
===================================================================
@@ -134,10 +134,10 @@
 #include <linux/bootmem.h>
 #include <linux/blkdev.h>
 #ifdef CONFIG_RTC_DS1742
-#include <asm/rtc_ds1742.h>
+#include <linux/ds1742rtc.h>
 #endif
 #ifdef CONFIG_TOSHIBA_FPCIB0
-#include <asm/smsc_fdc37m81x.h>
+#include <asm/tx4927/smsc_fdc37m81x.h>
 #endif
 #include <asm/tx4927/toshiba_rbtx4927.h>

@@ -681,13 +681,6 @@
 	}
 #endif
 
-#ifdef CONFIG_PCI
-	{
-		extern void toshiba_rbtx4927_pci_irq_init(void);
-		toshiba_rbtx4927_pci_irq_init();
-	}
-#endif
-
 	wbflush();
 
 	return;

drivers/char/serial_txx9.c +20 ~~-47~~

213 lines not on this page · raw message

arch/mips/Kconfig +10 -1

Index: linux/arch/mips/Kconfig
===================================================================
@@ -848,9 +848,18 @@
 	bool "Support for Toshiba TBTX49[23]7 board"
 	depends on MIPS32
 	select DMA_NONCOHERENT
-	select HW_HAS_PCI
 	select ISA
 	select SWAP_IO_SPACE
+	select HW_HAS_PCI
+	select PCI
+	select I8259
+	help
+	  This Toshiba board is based on the TX4927 processor. Say Y here to
+	  support this machine type
+
+config TOSHIBA_FPCIB0
+	bool "FPCIB0 Backplane Support"
+	depends on TOSHIBA_RBTX4927
 
 config RWSEM_GENERIC_SPINLOCK
 	bool

include/asm-mips/tx4927/smsc_fdc37m81x.h new file +72 -0

72 lines not on this page · raw message

arch/mips/pci/fixup-rbtx4927.c +16 ~~-44~~

81 lines not on this page · raw message

arch/mips/tx4927/common/Makefile +1 -0

Index: linux/arch/mips/tx4927/common/Makefile
===================================================================
@@ -8,4 +8,5 @@
 
 obj-y	+= tx4927_prom.o tx4927_setup.o tx4927_irq.o tx4927_irq_handler.o
 
+obj-$(CONFIG_TOSHIBA_FPCIB0)	   += smsc_fdc37m81x.o
 obj-$(CONFIG_KGDB)                 += tx4927_dbgio.o

arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c +9 -0

Index: linux/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c
===================================================================
@@ -6,6 +6,9 @@
  *
  * Copyright 2001-2002 MontaVista Software Inc.
  *
+ * Copyright (C) 2004 MontaVista Software Inc.
+ * Author: Manish Lachwani, [email protected]
+ *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
  *  Free Software Foundation; either version 2 of the License, or (at your

@@ -86,3 +89,9 @@
 {
 	return "Toshiba RBTX4927/RBTX4937";
 }
+
+char * __init prom_getcmdline(void)
+{
+        return &(arcs_cmdline[0]);
+}
+

arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c +59 ~~-175~~

390 lines not on this page · raw message

arch/mips/pci/ops-tx4927.c +81 ~~-178~~

319 lines not on this page · raw message