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

Commit 3f00d3e8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 407cf84f a637a114

arch/mips/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -958,7 +958,7 @@ config SOC_PNX8550 
	bool

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select SYS_HAS_CPU_R4X00

	select SYS_HAS_CPU_MIPS32_R1

	select SYS_SUPPORTS_32BIT_KERNEL



config SWAP_IO_SPACE

arch/mips/boot/.gitignore

0 → 100644
+4 −0
Original line number Diff line number Diff line 
mkboot

elf2ecoff

zImage

zImage.tmp

arch/mips/configs/pnx8550-jbs_defconfig

+6 −5
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 
#

# CPU selection

#

# CONFIG_CPU_MIPS32_R1 is not set

CONFIG_CPU_MIPS32_R1=y

# CONFIG_CPU_MIPS32_R2 is not set

# CONFIG_CPU_MIPS64_R1 is not set

# CONFIG_CPU_MIPS64_R2 is not set
@@ -137,7 +137,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 
# CONFIG_CPU_TX39XX is not set

# CONFIG_CPU_VR41XX is not set

# CONFIG_CPU_R4300 is not set

CONFIG_CPU_R4X00=y

# CONFIG_CPU_R4X00 is not set

# CONFIG_CPU_TX49XX is not set

# CONFIG_CPU_R5000 is not set

# CONFIG_CPU_R5432 is not set
@@ -148,10 +148,11 @@ CONFIG_CPU_R4X00=y 
# CONFIG_CPU_RM7000 is not set

# CONFIG_CPU_RM9000 is not set

# CONFIG_CPU_SB1 is not set

CONFIG_SYS_HAS_CPU_R4X00=y

CONFIG_SYS_HAS_CPU_MIPS32_R1=y

CONFIG_CPU_MIPS32=y

CONFIG_CPU_MIPSR1=y

CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y

CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y

CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y



#

# Kernel type
@@ -162,11 +163,11 @@ CONFIG_PAGE_SIZE_4KB=y 
# CONFIG_PAGE_SIZE_8KB is not set

# CONFIG_PAGE_SIZE_16KB is not set

# CONFIG_PAGE_SIZE_64KB is not set

CONFIG_CPU_HAS_PREFETCH=y

# CONFIG_MIPS_MT is not set

# CONFIG_64BIT_PHYS_ADDR is not set

# CONFIG_CPU_ADVANCED is not set

CONFIG_CPU_HAS_LLSC=y

CONFIG_CPU_HAS_LLDSCD=y

CONFIG_CPU_HAS_SYNC=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_GENERIC_IRQ_PROBE=y

arch/mips/configs/pnx8550-v2pci_defconfig

+6 −4
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 
#

# CPU selection

#

# CONFIG_CPU_MIPS32_R1 is not set

CONFIG_CPU_MIPS32_R1=y

# CONFIG_CPU_MIPS32_R2 is not set

# CONFIG_CPU_MIPS64_R1 is not set

# CONFIG_CPU_MIPS64_R2 is not set
@@ -136,7 +136,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 
# CONFIG_CPU_TX39XX is not set

# CONFIG_CPU_VR41XX is not set

# CONFIG_CPU_R4300 is not set

CONFIG_CPU_R4X00=y

# CONFIG_CPU_R4X00 is not set

# CONFIG_CPU_TX49XX is not set

# CONFIG_CPU_R5000 is not set

# CONFIG_CPU_R5432 is not set
@@ -147,10 +147,11 @@ CONFIG_CPU_R4X00=y 
# CONFIG_CPU_RM7000 is not set

# CONFIG_CPU_RM9000 is not set

# CONFIG_CPU_SB1 is not set

CONFIG_SYS_HAS_CPU_R4X00=y

CONFIG_SYS_HAS_CPU_MIPS32_R1=y

CONFIG_CPU_MIPS32=y

CONFIG_CPU_MIPSR1=y

CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y

CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y

CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y



#

# Kernel type
@@ -161,6 +162,7 @@ CONFIG_PAGE_SIZE_4KB=y 
# CONFIG_PAGE_SIZE_8KB is not set

# CONFIG_PAGE_SIZE_16KB is not set

# CONFIG_PAGE_SIZE_64KB is not set

CONFIG_CPU_HAS_PREFETCH=y

# CONFIG_MIPS_MT is not set

# CONFIG_64BIT_PHYS_ADDR is not set

CONFIG_CPU_ADVANCED=y

arch/mips/ddb5xxx/common/rtc_ds1386.c

+6 −0
Original line number Diff line number Diff line
@@ -41,7 +41,9 @@ rtc_ds1386_get_time(void) 
	u8 byte;

	u8 temp;

	unsigned int year, month, day, hour, minute, second;

	unsigned long flags;



	spin_lock_irqsave(&rtc_lock, flags);

	/* let us freeze external registers */

	byte = READ_RTC(0xB);

	byte &= 0x3f;
@@ -60,6 +62,7 @@ rtc_ds1386_get_time(void) 
	/* enable time transfer */

	byte |= 0x80;

	WRITE_RTC(0xB, byte);

	spin_unlock_irqrestore(&rtc_lock, flags);



	/* calc hour */

	if (temp & 0x40) {
@@ -81,7 +84,9 @@ rtc_ds1386_set_time(unsigned long t) 
	u8 byte;

	u8 temp;

	u8 year, month, day, hour, minute, second;

	unsigned long flags;



	spin_lock_irqsave(&rtc_lock, flags);

	/* let us freeze external registers */

	byte = READ_RTC(0xB);

	byte &= 0x3f;
@@ -133,6 +138,7 @@ rtc_ds1386_set_time(unsigned long t) 
	if (second != READ_RTC(0x1)) {

		WRITE_RTC(0x1, second);

	}

	spin_unlock_irqrestore(&rtc_lock, flags);



	return 0;

}