tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Cacheops.h: Fix typo.
[MIPS] Cobalt: Qube1 has no serial port so don't use it
[MIPS] Cobalt: Fix ethernet interrupts for RaQ1
[MIPS] Kconfig fixes for BCM47XX platform

Linus Torvalds c60ecec6 c23f72ca

+9 -2
+2
arch/mips/Kconfig
··· 59 59 select SYS_SUPPORTS_LITTLE_ENDIAN 60 60 select SSB 61 61 select SSB_DRIVER_MIPS 62 + select SSB_DRIVER_EXTIF 63 + select SSB_PCICORE_HOSTMODE if PCI 62 64 select GENERIC_GPIO 63 65 select SYS_HAS_EARLY_PRINTK 64 66 select CFE
+5
arch/mips/cobalt/console.c
··· 4 4 #include <linux/io.h> 5 5 #include <linux/serial_reg.h> 6 6 7 + #include <cobalt.h> 8 + 7 9 #define UART_BASE ((void __iomem *)CKSEG1ADDR(0x1c800000)) 8 10 9 11 void prom_putchar(char c) 10 12 { 13 + if (cobalt_board_id <= COBALT_BRD_ID_QUBE1) 14 + return; 15 + 11 16 while (!(readb(UART_BASE + UART_LSR) & UART_LSR_THRE)) 12 17 ; 13 18
+1 -1
arch/mips/pci/fixup-cobalt.c
··· 177 177 178 178 int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) 179 179 { 180 - if (cobalt_board_id < COBALT_BRD_ID_QUBE2) 180 + if (cobalt_board_id <= COBALT_BRD_ID_QUBE1) 181 181 return irq_tab_qube1[slot]; 182 182 183 183 if (cobalt_board_id == COBALT_BRD_ID_RAQ2)
+1 -1
include/asm-mips/cacheops.h
··· 64 64 #define Page_Invalidate_T 0x16 65 65 66 66 /* 67 - * R1000-specific cacheops 67 + * R10000-specific cacheops 68 68 * 69 69 * Cacheops 0x02, 0x06, 0x0a, 0x0c-0x0e, 0x16, 0x1a and 0x1e are unused. 70 70 * Most of the _S cacheops are identical to the R4000SC _SD cacheops.