Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 897ee77b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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] Ocelot: remove remaining bits
  [MIPS] TLB: Fix instruction bitmasks
  [MIPS] R10000: Fix wrong test in dma-default.c
  [MIPS] Provide empty irq_enable_hazard definition for legacy and R1 cores.
  [MIPS] Sibyte: Remove broken dependency on EXPERIMENTAL from SIBYTE_SB1xxx_SOC.
  [MIPS] Kconfig: whitespace cleanup.
  [MIPS] PCI: Set need_domain_info if controller domain index is non-zero.
  [MIPS] BCM1480: Fix computation of interrupt mask address register.
  [MIPS] i8259: Add disable method.
  [MIPS] tty: add the new ioctls and definitions.
parents f3f94ce5 43863074

arch/mips/Kconfig

+4 −18
Original line number Diff line number Diff line
@@ -818,20 +818,6 @@ config EMMA2RH 
config SERIAL_RM9000

	bool



#

# Unfortunately not all GT64120 systems run the chip at the same clock.

# As the user for the clock rate and try to minimize the available options.

#

choice

	prompt "Galileo Chip Clock"

	depends on MOMENCO_OCELOT

	default SYSCLK_100 if MOMENCO_OCELOT



config SYSCLK_100

	bool "100" if MOMENCO_OCELOT



endchoice



config ARC32

	bool

arch/mips/kernel/i8259.c

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ void mask_and_ack_8259A(unsigned int); 
static struct irq_chip i8259A_chip = {

	.name		= "XT-PIC",

	.mask		= disable_8259A_irq,

	.disable	= disable_8259A_irq,

	.unmask		= enable_8259A_irq,

	.mask_ack	= mask_and_ack_8259A,

};

arch/mips/mm/dma-default.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static inline unsigned long dma_addr_to_virt(dma_addr_t dma_addr) 
static inline int cpu_is_noncoherent_r10000(struct device *dev)

{

	return !plat_device_is_coherent(dev) &&

	       (current_cpu_data.cputype == CPU_R10000 &&

	       (current_cpu_data.cputype == CPU_R10000 ||

	       current_cpu_data.cputype == CPU_R12000);

}

arch/mips/mm/tlbex.c

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ enum fields 
	SET = 0x200

};



#define OP_MASK		0x2f

#define OP_MASK		0x3f

#define OP_SH		26

#define RS_MASK		0x1f

#define RS_SH		21
@@ -92,7 +92,7 @@ enum fields 
#define IMM_SH		0

#define JIMM_MASK	0x3ffffff

#define JIMM_SH		0

#define FUNC_MASK	0x2f

#define FUNC_MASK	0x3f

#define FUNC_SH		0

#define SET_MASK	0x7

#define SET_SH		0

arch/mips/pci/pci.c

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ static int __init pcibios_init(void) 


		bus = pci_scan_bus(next_busno, hose->pci_ops, hose);

		hose->bus = bus;

		need_domain_info = need_domain_info || hose->index;

		hose->need_domain_info = need_domain_info;

		if (bus) {

			next_busno = bus->subordinate + 1;