add ar7 2.6.22 patches by matteo (work in progress, not booting yet)

SVN-Revision: 7914
2007-07-11 10:47:25 +00:00 · 2007-07-11 10:47:25 +00:00 · 5123be41cd
parent a508408c0b
commit 5123be41cd
8 changed files with 414 additions and 0 deletions
--- a/target/linux/ar7-2.6/patches-2.6.22/100-board_support.patch
+++ b/target/linux/ar7-2.6/patches-2.6.22/100-board_support.patch
@ -0,0 +1,106 @@
+diff -urN linux-2.6.22/arch/mips/Kconfig linux-2.6.22.new/arch/mips/Kconfig
+--- linux-2.6.22/arch/mips/Kconfig	2007-07-09 01:32:17.000000000 +0200
+++ linux-2.6.22.new/arch/mips/Kconfig	2007-07-11 02:34:51.000000000 +0200
+@@ -15,6 +15,21 @@
+ 	prompt "System type"
+ 	default SGI_IP22
+ 
+config AR7
+	bool "Texas Instruments AR7"
+	select BOOT_ELF32
+	select DMA_NONCOHERENT
+	select HW_HAS_PCI
+	select IRQ_CPU
+	select SWAP_IO_SPACE
+	select SYS_HAS_CPU_MIPS32_R1
+	select SYS_HAS_EARLY_PRINTK
+	select SYS_SUPPORTS_32BIT_KERNEL
+	select SYS_SUPPORTS_LITTLE_ENDIAN
+	select NEED_MULTIPLE_NODES
+	select GENERIC_GPIO
+	select ZONE_DMA
+
+ config MACH_ALCHEMY
+ 	bool "Alchemy processor based machines"
+ 
+diff -urN linux-2.6.22/arch/mips/kernel/setup.c linux-2.6.22.new/arch/mips/kernel/setup.c
+--- linux-2.6.22/arch/mips/kernel/setup.c	2007-07-09 01:32:17.000000000 +0200
+++ linux-2.6.22.new/arch/mips/kernel/setup.c	2007-07-11 02:32:39.000000000 +0200
+@@ -258,7 +258,7 @@
+  * Initialize the bootmem allocator. It also setup initrd related data
+  * if needed.
+  */
+-#ifdef CONFIG_SGI_IP27
+#ifdef CONFIG_NEED_MULTIPLE_NODES
+ 
+ static void __init bootmem_init(void)
+ {
+@@ -266,7 +266,7 @@
+ 	finalize_initrd();
+ }
+ 
+-#else  /* !CONFIG_SGI_IP27 */
+#else  /* !CONFIG_NEED_MULTIPLE_NODES */
+ 
+ static void __init bootmem_init(void)
+ {
+@@ -392,7 +392,7 @@
+ 	finalize_initrd();
+ }
+ 
+-#endif	/* CONFIG_SGI_IP27 */
+#endif	/* CONFIG_NEED_MULTIPLE_NODES */
+ 
+ /*
+  * arch_mem_init - initialize memory managment subsystem
+diff -urN linux-2.6.22/arch/mips/kernel/traps.c linux-2.6.22.new/arch/mips/kernel/traps.c
+--- linux-2.6.22/arch/mips/kernel/traps.c	2007-07-09 01:32:17.000000000 +0200
+++ linux-2.6.22.new/arch/mips/kernel/traps.c	2007-07-11 02:32:39.000000000 +0200
+@@ -1051,11 +1051,6 @@
+ unsigned long exception_handlers[32];
+ unsigned long vi_handlers[64];
+ 
+-/*
+- * As a side effect of the way this is implemented we're limited
+- * to interrupt handlers in the address range from
+- * KSEG0 <= x < KSEG0 + 256mb on the Nevada.  Oh well ...
+- */
+ void *set_except_vector(int n, void *addr)
+ {
+ 	unsigned long handler = (unsigned long) addr;
+@@ -1063,9 +1058,15 @@
+ 
+ 	exception_handlers[n] = handler;
+ 	if (n == 0 && cpu_has_divec) {
+-		*(volatile u32 *)(ebase + 0x200) = 0x08000000 |
+-		                                 (0x03ffffff & (handler >> 2));
+-		flush_icache_range(ebase + 0x200, ebase + 0x204);
+		/* lui k0, 0x0000 */
+		*(volatile u32 *)(CAC_BASE+0x200) = 0x3c1a0000 | (handler >> 16);
+		/* ori k0, 0x0000 */
+		*(volatile u32 *)(CAC_BASE+0x204) = 0x375a0000 | (handler & 0xffff);
+		/* jr k0 */
+		*(volatile u32 *)(CAC_BASE+0x208) = 0x03400008;
+		/* nop */
+		*(volatile u32 *)(CAC_BASE+0x20C) = 0x00000000;
+		flush_icache_range(CAC_BASE+0x200, CAC_BASE+0x210);
+ 	}
+ 	return (void *)old_handler;
+ }
+diff -urN linux-2.6.22/arch/mips/Makefile linux-2.6.22.new/arch/mips/Makefile
+--- linux-2.6.22/arch/mips/Makefile	2007-07-09 01:32:17.000000000 +0200
+++ linux-2.6.22.new/arch/mips/Makefile	2007-07-11 02:32:39.000000000 +0200
+@@ -158,6 +158,13 @@
+ #
+ 
+ #
+# Texas Instruments AR7
+#
+core-$(CONFIG_AR7)		+= arch/mips/ar7/
+cflags-$(CONFIG_AR7)		+= -Iinclude/asm-mips/ar7
+load-$(CONFIG_AR7)		+= 0xffffffff94100000
+
+#
+ # Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
+ #
+ core-$(CONFIG_MACH_JAZZ)	+= arch/mips/jazz/
--- a/target/linux/ar7-2.6/patches-2.6.22/110-flash.patch
+++ b/target/linux/ar7-2.6/patches-2.6.22/110-flash.patch
@ -0,0 +1,39 @@
+diff -Nru linux-2.6.19.2/drivers/mtd/Kconfig linux-ar7/drivers/mtd/Kconfig
+--- linux-2.6.19.2/drivers/mtd/Kconfig	2006-12-12 02:32:53.000000000 +0700
+++ linux-ar7/drivers/mtd/Kconfig	2007-02-03 22:47:10.000000000 +0700
+@@ -152,6 +152,12 @@
+ 	  for your particular device. It won't happen automatically. The
+ 	  'armflash' map driver (CONFIG_MTD_ARMFLASH) does this, for example.
+ 
+config MTD_AR7_PARTS
+	tristate "TI AR7 partitioning support"
+	depends on MTD_PARTITIONS
+	---help---
+	  TI AR7 partitioning support
+
+ comment "User Modules And Translation Layers"
+ 	depends on MTD
+ 
+diff -Nru linux-2.6.19.2/drivers/mtd/Makefile linux-ar7/drivers/mtd/Makefile
+--- linux-2.6.19.2/drivers/mtd/Makefile	2006-12-12 02:32:53.000000000 +0700
+++ linux-ar7/drivers/mtd/Makefile	2007-02-03 22:02:27.000000000 +0700
+@@ -12,6 +12,7 @@
+ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
+ obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
+ obj-$(CONFIG_MTD_AFS_PARTS)	+= afs.o
+obj-$(CONFIG_MTD_AR7_PARTS)	+= ar7part.o
+ 
+ # 'Users' - code which presents functionality to userspace.
+ obj-$(CONFIG_MTD_CHAR)		+= mtdchar.o
+diff -Nru linux-2.6.19.2/drivers/mtd/maps/physmap.c linux-ar7/drivers/mtd/maps/physmap.c
+--- linux-2.6.19.2/drivers/mtd/maps/physmap.c	2006-12-12 02:32:53.000000000 +0700
+++ linux-ar7/drivers/mtd/maps/physmap.c	2007-02-03 21:57:11.000000000 +0700
+@@ -74,7 +74,7 @@
+ 
+ static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL };
+ #ifdef CONFIG_MTD_PARTITIONS
+-static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };
+static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", "ar7part", NULL };
+ #endif
+ 
+ static int physmap_flash_probe(struct platform_device *dev)
--- a/target/linux/ar7-2.6/patches-2.6.22/120-gpio_chrdev.patch
+++ b/target/linux/ar7-2.6/patches-2.6.22/120-gpio_chrdev.patch
@ -0,0 +1,30 @@
+diff -ruN linux-2.6.19.2-orig/drivers/char/Kconfig linux-2.6.19.2-ar7/drivers/char/Kconfig
+--- linux-2.6.19.2-orig/drivers/char/Kconfig	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2-ar7/drivers/char/Kconfig	2007-02-19 01:22:23.000000000 +0100
+@@ -920,6 +920,15 @@
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called mwave.
+ 
+config AR7_GPIO
+	tristate "TI AR7 GPIO Support"
+	depends on AR7
+	help
+	  Give userspace access to the GPIO pins on the Texas Instruments AR7 
+	  processors.
+
+	  If compiled as a module, it will be called ar7_gpio.
+
+ config SCx200_GPIO
+ 	tristate "NatSemi SCx200 GPIO Support"
+ 	depends on SCx200
+diff -ruN linux-2.6.19.2-orig/drivers/char/Makefile linux-2.6.19.2-ar7/drivers/char/Makefile
+--- linux-2.6.19.2-orig/drivers/char/Makefile	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2-ar7/drivers/char/Makefile	2007-02-19 01:22:23.000000000 +0100
+@@ -83,6 +83,7 @@
+ obj-$(CONFIG_PPDEV)		+= ppdev.o
+ obj-$(CONFIG_NWBUTTON)		+= nwbutton.o
+ obj-$(CONFIG_NWFLASH)		+= nwflash.o
+obj-$(CONFIG_AR7_GPIO)		+= ar7_gpio.o
+ obj-$(CONFIG_SCx200_GPIO)	+= scx200_gpio.o
+ obj-$(CONFIG_PC8736x_GPIO)	+= pc8736x_gpio.o
+ obj-$(CONFIG_NSC_GPIO)		+= nsc_gpio.o
--- a/target/linux/ar7-2.6/patches-2.6.22/130-leds.patch
+++ b/target/linux/ar7-2.6/patches-2.6.22/130-leds.patch
@ -0,0 +1,27 @@
+diff -ruN linux-2.6.19.2-orig/drivers/leds/Kconfig linux-2.6.19.2-ar7/drivers/leds/Kconfig
+--- linux-2.6.19.2-orig/drivers/leds/Kconfig	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2-ar7/drivers/leds/Kconfig	2007-02-24 02:30:48.000000000 +0100
+@@ -19,6 +19,12 @@
+ 
+ comment "LED drivers"
+ 
+config LEDS_AR7
+	tristate "LED Support for the TI AR7"
+	depends LEDS_CLASS && AR7
+	help
+	  This option enables support for the LEDs on TI AR7.
+
+ config LEDS_CORGI
+ 	tristate "LED Support for the Sharp SL-C7x0 series"
+ 	depends LEDS_CLASS && PXA_SHARP_C7xx
+diff -ruN linux-2.6.19.2-orig/drivers/leds/Makefile linux-2.6.19.2-ar7/drivers/leds/Makefile
+--- linux-2.6.19.2-orig/drivers/leds/Makefile	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2-ar7/drivers/leds/Makefile	2007-02-24 02:29:44.000000000 +0100
+@@ -5,6 +5,7 @@
+ obj-$(CONFIG_LEDS_TRIGGERS)		+= led-triggers.o
+ 
+ # LED Platform Drivers
+obj-$(CONFIG_LEDS_AR7)			+= leds-ar7.o
+ obj-$(CONFIG_LEDS_CORGI)		+= leds-corgi.o
+ obj-$(CONFIG_LEDS_LOCOMO)		+= leds-locomo.o
+ obj-$(CONFIG_LEDS_SPITZ)		+= leds-spitz.o
--- a/target/linux/ar7-2.6/patches-2.6.22/140-watchdog.patch
+++ b/target/linux/ar7-2.6/patches-2.6.22/140-watchdog.patch
@ -0,0 +1,27 @@
+diff -ruN linux-2.6.19.2-orig/drivers/char/watchdog/Kconfig linux-2.6.19.2-ar7/drivers/char/watchdog/Kconfig
+--- linux-2.6.19.2-orig/drivers/char/watchdog/Kconfig	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2-ar7/drivers/char/watchdog/Kconfig	2007-02-26 12:49:29.000000000 +0100
+@@ -544,6 +544,12 @@
+ 
+ # MIPS Architecture
+ 
+config AR7_WDT
+	tristate "TI AR7 Watchdog Timer"
+	depends on WATCHDOG && AR7
+	help
+	  Hardware driver for the TI AR7 Watchdog Timer.
+
+ config INDYDOG
+ 	tristate "Indy/I2 Hardware Watchdog"
+ 	depends on WATCHDOG && SGI_IP22
+diff -ruN linux-2.6.19.2-orig/drivers/char/watchdog/Makefile linux-2.6.19.2-ar7/drivers/char/watchdog/Makefile
+--- linux-2.6.19.2-orig/drivers/char/watchdog/Makefile	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2-ar7/drivers/char/watchdog/Makefile	2007-02-26 12:46:36.000000000 +0100
+@@ -71,6 +71,7 @@
+ obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
+ 
+ # MIPS Architecture
+obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
+ obj-$(CONFIG_INDYDOG) += indydog.o
+ 
+ # S390 Architecture
--- a/target/linux/ar7-2.6/patches-2.6.22/200-ethernet_driver.patch
+++ b/target/linux/ar7-2.6/patches-2.6.22/200-ethernet_driver.patch
@ -0,0 +1,30 @@
+diff -Nru linux-2.6.19.2/drivers/net/Kconfig linux-ar7/drivers/net/Kconfig
+--- linux-2.6.19.2/drivers/net/Kconfig	2006-12-12 02:32:53.000000000 +0700
+++ linux-ar7/drivers/net/Kconfig	2007-01-29 21:52:22.000000000 +0700
+@@ -1777,6 +1777,15 @@
+ 	  workstations.
+ 	  See <http://www.semiconductors.philips.com/pip/SAA9730_flyer_1>.
+ 
+config CPMAC
+	tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
+	depends on NET_ETHERNET && EXPERIMENTAL && AR7
+	select PHYLIB
+	select FIXED_PHY
+	select FIXED_MII_100_FDX
+	help
+	  TI AR7 CPMAC Ethernet support
+
+ config NET_POCKET
+ 	bool "Pocket and portable adapters"
+ 	depends on NET_ETHERNET && PARPORT
+diff -Nru linux-2.6.19.2/drivers/net/Makefile linux-ar7/drivers/net/Makefile
+--- linux-2.6.19.2/drivers/net/Makefile	2006-12-12 02:32:53.000000000 +0700
+++ linux-ar7/drivers/net/Makefile	2007-01-29 21:52:22.000000000 +0700
+@@ -148,6 +148,7 @@
+ obj-$(CONFIG_8139TOO) += 8139too.o
+ obj-$(CONFIG_ZNET) += znet.o
+ obj-$(CONFIG_LAN_SAA9730) += saa9730.o
+obj-$(CONFIG_CPMAC) += cpmac.o
+ obj-$(CONFIG_DEPCA) += depca.o
+ obj-$(CONFIG_EWRK3) += ewrk3.o
+ obj-$(CONFIG_ATP) += atp.o
--- a/target/linux/ar7-2.6/patches-2.6.22/210-phy_fixed.patch
+++ b/target/linux/ar7-2.6/patches-2.6.22/210-phy_fixed.patch
@ -0,0 +1,93 @@
+Index: linux-2.6.21.4/drivers/net/phy/fixed.c
+===================================================================
+--- linux-2.6.21.4.orig/drivers/net/phy/fixed.c	2007-06-11 16:30:06.418483448 +0200
+++ linux-2.6.21.4/drivers/net/phy/fixed.c	2007-06-11 16:30:11.156763120 +0200
+@@ -187,6 +187,19 @@
+ 	.driver 	= { .owner = THIS_MODULE,},
+ };
+ 
+static void fixed_mdio_release (struct device * dev)
+{
+	struct phy_device *phydev = container_of(dev, struct phy_device, dev);
+	struct mii_bus *bus = phydev->bus;
+	struct fixed_info *fixed = bus->priv;
+
+	kfree(phydev);
+	kfree(bus->dev);
+	kfree(bus);
+	kfree(fixed->regs);
+	kfree(fixed);
+}
+
+ /*-----------------------------------------------------------------------------
+  *  This func is used to create all the necessary stuff, bind
+  * the fixed phy driver and register all it on the mdio_bus_type.
+@@ -221,6 +234,12 @@
+ 	}
+ 
+ 	fixed->regs = kzalloc(MII_REGS_NUM*sizeof(int), GFP_KERNEL);
+	if (NULL == fixed->regs) {
+		kfree(dev);
+		kfree(new_bus);
+		kfree(fixed);
+		return -ENOMEM;
+	}
+ 	fixed->regs_num = MII_REGS_NUM;
+ 	fixed->phy_status.speed = speed;
+ 	fixed->phy_status.duplex = duplex;
+@@ -249,8 +268,11 @@
+ 	fixed->phydev = phydev;
+ 
+ 	if(NULL == phydev) {
+-		err = -ENOMEM;
+-		goto device_create_fail;
+		kfree(dev);
+		kfree(new_bus);
+		kfree(fixed->regs);
+		kfree(fixed);
+		return -ENOMEM;
+ 	}
+ 
+ 	phydev->irq = PHY_IGNORE_INTERRUPT;
+@@ -262,8 +283,33 @@
+ 	else
+ 		snprintf(phydev->dev.bus_id, BUS_ID_SIZE,
+ 				"fixed@%d:%d", speed, duplex);
+
+ 	phydev->bus = new_bus;
+ 
+#if 1
+	phydev->dev.driver = &fixed_mdio_driver.driver;
+	phydev->dev.release = fixed_mdio_release;
+
+	err = phydev->dev.driver->probe(&phydev->dev);
+	if(err < 0) {
+		printk(KERN_ERR "Phy %s: problems with fixed driver\n",
+			phydev->dev.bus_id);
+		kfree(phydev);
+		kfree(dev);
+		kfree(new_bus);
+		kfree(fixed->regs);
+		kfree(fixed);
+		return err;
+	}
+
+	err = device_register(&phydev->dev);
+	if(err) {
+		printk(KERN_ERR "Phy %s failed to register\n",
+				phydev->dev.bus_id);
+	}
+
+	return 0;
+#else
+ 	err = device_register(&phydev->dev);
+ 	if(err) {
+ 		printk(KERN_ERR "Phy %s failed to register\n",
+@@ -306,6 +354,7 @@
+ 	kfree(fixed);
+ 
+ 	return err;
+#endif
+ }
+ 
+ 
--- a/target/linux/ar7-2.6/patches-2.6.22/500-serial_kludge.patch
+++ b/target/linux/ar7-2.6/patches-2.6.22/500-serial_kludge.patch
@ -0,0 +1,62 @@
+diff -urN linux-2.6.22.orig/drivers/serial/8250.c linux-2.6.22/drivers/serial/8250.c
+--- linux-2.6.22.orig/drivers/serial/8250.c	2007-07-09 01:32:17.000000000 +0200
+++ linux-2.6.22/drivers/serial/8250.c	2007-07-11 03:08:57.000000000 +0200
+@@ -258,6 +258,13 @@
+ 		.fcr		= UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
+ 		.flags		= UART_CAP_FIFO,
+ 	},
+	[PORT_AR7] = {
+		.name		= "TI-AR7",
+		.fifo_size	= 16,
+		.tx_loadsz	= 16,
+		.fcr		= UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_00,
+		.flags		= UART_CAP_FIFO | UART_CAP_AFE,
+	},
+ };
+ 
+ #if defined (CONFIG_SERIAL_8250_AU1X00)
+@@ -2436,7 +2443,7 @@
+ {
+ 	struct uart_8250_port *up = (struct uart_8250_port *)port;
+ 
+-	wait_for_xmitr(up, UART_LSR_THRE);
+	wait_for_xmitr(up, BOTH_EMPTY);
+ 	serial_out(up, UART_TX, ch);
+ }
+ 
+diff -urN linux-2.6.22.orig/include/linux/serial_core.h linux-2.6.22/include/linux/serial_core.h
+--- linux-2.6.22.orig/include/linux/serial_core.h	2007-07-09 01:32:17.000000000 +0200
+++ linux-2.6.22/include/linux/serial_core.h	2007-07-11 03:09:49.000000000 +0200
+@@ -40,6 +40,7 @@
+ #define PORT_NS16550A	14
+ #define PORT_XSCALE	15
+ #define PORT_RM9000	16	/* PMC-Sierra RM9xxx internal UART */
+#define PORT_AR7	16
+ #define PORT_MAX_8250	16	/* max port ID */
+ 
+ /*
+diff -urN linux-2.6.22.orig/include/linux/serialP.h linux-2.6.22/include/linux/serialP.h
+--- linux-2.6.22.orig/include/linux/serialP.h	2007-07-09 01:32:17.000000000 +0200
+++ linux-2.6.22/include/linux/serialP.h	2007-07-11 03:08:57.000000000 +0200
+@@ -135,6 +135,9 @@
+  * the interrupt line _up_ instead of down, so if we register the IRQ
+  * while the UART is in that state, we die in an IRQ storm. */
+ #define ALPHA_KLUDGE_MCR (UART_MCR_OUT2)
+#elif defined(CONFIG_AR7)
+/* This is how it is set up by bootloader... */
+#define ALPHA_KLUDGE_MCR  (UART_MCR_OUT2 | UART_MCR_OUT1 | UART_MCR_RTS | UART_MCR_DTR)
+ #else
+ #define ALPHA_KLUDGE_MCR 0
+ #endif
+diff -urN linux-2.6.22.orig/scripts/setlocalversion linux-2.6.22/scripts/setlocalversion
+--- linux-2.6.22.orig/scripts/setlocalversion	2007-07-09 01:32:17.000000000 +0200
+++ linux-2.6.22/scripts/setlocalversion	2007-07-11 03:08:57.000000000 +0200
+@@ -1,6 +1,8 @@
+ #!/bin/sh
+ # Print additional version information for non-release trees.
+ 
+exit 0
+
+ usage() {
+ 	echo "Usage: $0 [srctree]" >&2
+ 	exit 1