Commit c34c15b0 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] Malta: Enable tickless and highres timers.
  [MIPS] Bigsur: Enable tickless and and highres timers.
  qemu: do not enable IP7 blindly
  [MIPS] Alchemy: Fix Au1x SD controller IRQ
  [MIPS] Don't byteswap writes to display when running bigendian
parents 3790ee4b ba0f00b9

arch/mips/configs/bigsur_defconfig

+9 −0
Original line number Diff line number Diff line
@@ -76,9 +76,13 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y 
CONFIG_GENERIC_FIND_NEXT_BIT=y

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_GENERIC_CLOCKEVENTS=y

CONFIG_GENERIC_TIME=y

CONFIG_GENERIC_CMOS_UPDATE=y

CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set

CONFIG_CEVT_BCM1480=y

CONFIG_CSRC_BCM1480=y

CONFIG_DMA_COHERENT=y

CONFIG_CPU_BIG_ENDIAN=y

# CONFIG_CPU_LITTLE_ENDIAN is not set
@@ -91,6 +95,11 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 
#

# CPU selection

#

CONFIG_TICK_ONESHOT=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_GENERIC_CLOCKEVENTS_BUILD=y

# CONFIG_CPU_LOONGSON2 is not set

# CONFIG_CPU_MIPS32_R1 is not set

# CONFIG_CPU_MIPS32_R2 is not set

# CONFIG_CPU_MIPS64_R1 is not set

arch/mips/configs/malta_defconfig

+8 −0
Original line number Diff line number Diff line
@@ -49,10 +49,13 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y 
CONFIG_GENERIC_FIND_NEXT_BIT=y

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_GENERIC_CLOCKEVENTS=y

CONFIG_GENERIC_TIME=y

CONFIG_GENERIC_CMOS_UPDATE=y

CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set

CONFIG_ARCH_MAY_HAVE_PC_FDC=y

CONFIG_CEVT_R4K=y

CONFIG_DMA_NONCOHERENT=y

CONFIG_DMA_NEED_PCI_MAP_STATE=y

CONFIG_EARLY_PRINTK=y
@@ -76,6 +79,10 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 
#

# CPU selection

#

CONFIG_TICK_ONESHOT=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_GENERIC_CLOCKEVENTS_BUILD=y

# CONFIG_CPU_LOONGSON2 is not set

# CONFIG_CPU_MIPS32_R1 is not set

CONFIG_CPU_MIPS32_R2=y
@@ -253,6 +260,7 @@ CONFIG_HW_HAS_PCI=y 
CONFIG_PCI=y

# CONFIG_ARCH_SUPPORTS_MSI is not set

CONFIG_MMU=y

CONFIG_I8253=y



#

# PCCARD (PCMCIA/CardBus) support

arch/mips/mips-boards/generic/display.c

+2 −2
Original line number Diff line number Diff line
@@ -37,9 +37,9 @@ void mips_display_message(const char *str) 


	for (i = 0; i <= 14; i=i+2) {

	         if (*str)

		         writel(*str++, display + i);

		         __raw_writel(*str++, display + i);

		 else

		         writel(' ', display + i);

		         __raw_writel(' ', display + i);

	}

}

arch/mips/qemu/q-irq.c

+1 −1
Original line number Diff line number Diff line
@@ -33,5 +33,5 @@ void __init arch_init_irq(void) 


	mips_cpu_irq_init();

	init_i8259_irqs();

	set_c0_status(0x8400);

	set_c0_status(0x400);

}

include/asm-mips/mach-au1x00/au1100_mmc.h

+5 −2
Original line number Diff line number Diff line
@@ -41,8 +41,11 @@ 


#define NUM_AU1100_MMC_CONTROLLERS	2





#define AU1100_SD_IRQ	2

#if defined(CONFIG_SOC_AU1100)

#define AU1100_SD_IRQ	AU1100_SD_INT

#elif defined(CONFIG_SOC_AU1200)

#define AU1100_SD_IRQ	AU1200_SD_INT

#endif





#define SD0_BASE	0xB0600000

CRA Git | Maintained and supported by SUSTech CRA and CCSE