debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

N2100 fixes 

svn path=/dists/trunk/linux-2.6/; revision=7654
This commit is contained in:
Martin Michlmayr 2006-10-27 09:51:31 +00:00
parent 260e521d6e
commit b04318ae47
4 changed files with 84 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -16,6 +16,10 @@ linux-2.6 (2.6.18-4) UNRELEASED; urgency=low
sys_msgrcv() and compat_sys_msgrcv(), triggered every 5 seconds whenever
fakeroot is running.
[ Martin Michlmayr ]
* arm/iop32x: Fix the interrupt of the 2nd Ethernet slot on N2100.
* arm/iop32x: Allow USB and serial to co-exist on N2100.
-- Norbert Tretkowski <nobse@debian.org> Sat, 21 Oct 2006 18:52:12 +0200
linux-2.6 (2.6.18-3) unstable; urgency=low

13
debian/patches/bugfix/arm/n2100-eth1-irq.patch vendored Normal file
View File

@ -0,0 +1,13 @@
Fix the interrupt of the 2nd Ethernet slot.
--- a/arch/arm/mach-iop3xx/n2100.c~ 2006-10-26 22:23:24.053694788 +0000
+++ b/arch/arm/mach-iop3xx/n2100.c 2006-10-26 22:23:41.955186517 +0000
@@ -85,7 +85,7 @@
irq = IRQ_IOP321_XINT0;
} else if (PCI_SLOT(dev->devfn) == 2) {
/* RTL8110SB #2 */
- irq = IRQ_IOP321_XINT1;
+ irq = IRQ_IOP321_XINT3;
} else if (PCI_SLOT(dev->devfn) == 3) {
/* Sil3512 */
irq = IRQ_IOP321_XINT2;

65
debian/patches/bugfix/arm/n2100-serial-irq.patch vendored Normal file
View File

@ -0,0 +1,65 @@
Allow USB and serial to co-exist on N2100 by using a platform device for
serial and IRQ 0 for serial.
--- a/arch/arm/mach-iop3xx/iop321-setup.c~ 2006-10-26 22:06:04.000000000 +0000
+++ b/arch/arm/mach-iop3xx/iop321-setup.c 2006-10-27 07:33:24.663719957 +0000
@@ -131,7 +131,7 @@
void __init iop321_map_io(void)
{
iotable_init(iop321_std_desc, ARRAY_SIZE(iop321_std_desc));
- if (!machine_is_glantank())
+ if (!machine_is_glantank() && !machine_is_n2100())
early_serial_setup(&iop321_serial_ports[0]);
}
--- a/arch/arm/mach-iop3xx/n2100.c~ 2006-10-26 22:23:24.000000000 +0000
+++ b/arch/arm/mach-iop3xx/n2100.c 2006-10-27 07:32:15.130694184 +0000
@@ -170,6 +170,40 @@
/*
+ * N2100 machine initialisation.
+ */
+
+static struct plat_serial8250_port n2100_serial_port[] = {
+ {
+ .mapbase = N2100_UART,
+ .membase = (char *)N2100_UART,
+ .irq = 0,
+ .flags = UPF_SKIP_TEST,
+ .iotype = UPIO_MEM,
+ .regshift = 0,
+ .uartclk = 1843200,
+ },
+ { },
+};
+
+static struct resource n2100_uart_resource = {
+ .start = N2100_UART,
+ .end = N2100_UART + 7,
+ .flags = IORESOURCE_MEM,
+};
+
+static struct platform_device n2100_serial_device = {
+ .name = "serial8250",
+ .id = PLAT8250_DEV_PLATFORM,
+ .dev = {
+ .platform_data = n2100_serial_port,
+ },
+ .num_resources = 1,
+ .resource = &n2100_uart_resource,
+};
+
+
+/*
* Pull PCA9532 GPIO #8 low to power off the machine.
*/
static void n2100_power_off(void)
@@ -212,6 +246,7 @@
static void __init n2100_init_machine(void)
{
platform_device_register(&iop32x_i2c_0_controller);
+ platform_device_register(&n2100_serial_device);
pm_power_off = n2100_power_off;

2
debian/patches/series/4 vendored
View File

@ -1,3 +1,5 @@
- sparc64-atyfb-xl-gr.patch
+ bugfix/sparc/sunblade-clock-hang.patch
+ bugfix/sparc/compat-alloc-user-space-alignment.patch
+ bugfix/arm/n2100-serial-irq.patch
+ bugfix/arm/n2100-eth1-irq.patch