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

Commit 299601cf 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] Clocksource: Only install r4k counter as clocksource if present.
  [MIPS] Lasat: fix LASAT_CASCADE_IRQ
  [MIPS] Delete leftovers of old pcspeaker support.
  [MIPS] BCM1480: Init pci controller io_map_base
  [MIPS] Yosemite: Fix a few more section reference bugs.
  [MIPS] Fix yosemite build error
  [MIPS] Fix loads of section missmatches
  [MIPS] IP27: Tighten up CPU description to fix warnings.
  [MIPS] Fix plat_ioremap for JMR3927
  [MIPS] Export __ucmpdi2 to modules.
  [MIPS] Fix typo in comment
  [MIPS] Use KBUILD_DEFCONFIG
  [MIPS] Allow 48Hz to be selected if CONFIG_SYS_SUPPORTS_ARBIT_HZ is set.
  [MIPS] Added missing cases for rdhwr emulation
  [MIPS] Alchemy: Fix ids in Alchemy db dma device table
parents 0509ad5e 69e634f1

arch/mips/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1824,7 +1824,7 @@ choice 
	 Allows the configuration of the timer frequency.



	config HZ_48

		bool "48 HZ" if SYS_SUPPORTS_48HZ

		bool "48 HZ" if SYS_SUPPORTS_48HZ || SYS_SUPPORTS_ARBIT_HZ



	config HZ_100

		bool "100 HZ" if SYS_SUPPORTS_100HZ || SYS_SUPPORTS_ARBIT_HZ

arch/mips/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 
# for "archclean" cleaning up for this architecture.

#



KBUILD_DEFCONFIG := ip22_defconfig



cflags-y :=



#

arch/mips/au1000/common/dbdma.c

+17 −17
Original line number Diff line number Diff line
@@ -161,22 +161,22 @@ static dbdev_tab_t dbdev_tab[] = { 
	{ DSCR_CMD0_ALWAYS, DEV_FLAGS_ANYUSE, 0, 0, 0x00000000, 0, 0 },



	/* Provide 16 user definable device types */

	{ 0, 0, 0, 0, 0, 0, 0 },

	{ 0, 0, 0, 0, 0, 0, 0 },

	{ 0, 0, 0, 0, 0, 0, 0 },

	{ 0, 0, 0, 0, 0, 0, 0 },

	{ 0, 0, 0, 0, 0, 0, 0 },

	{ 0, 0, 0, 0, 0, 0, 0 },

	{ 0, 0, 0, 0, 0, 0, 0 },

	{ 0, 0, 0, 0, 0, 0, 0 },

	{ 0, 0, 0, 0, 0, 0, 0 },

	{ 0, 0, 0, 0, 0, 0, 0 },

	{ 0, 0, 0, 0, 0, 0, 0 },

	{ 0, 0, 0, 0, 0, 0, 0 },

	{ 0, 0, 0, 0, 0, 0, 0 },

	{ 0, 0, 0, 0, 0, 0, 0 },

	{ 0, 0, 0, 0, 0, 0, 0 },

	{ 0, 0, 0, 0, 0, 0, 0 },

	{ ~0, 0, 0, 0, 0, 0, 0 },

	{ ~0, 0, 0, 0, 0, 0, 0 },

	{ ~0, 0, 0, 0, 0, 0, 0 },

	{ ~0, 0, 0, 0, 0, 0, 0 },

	{ ~0, 0, 0, 0, 0, 0, 0 },

	{ ~0, 0, 0, 0, 0, 0, 0 },

	{ ~0, 0, 0, 0, 0, 0, 0 },

	{ ~0, 0, 0, 0, 0, 0, 0 },

	{ ~0, 0, 0, 0, 0, 0, 0 },

	{ ~0, 0, 0, 0, 0, 0, 0 },

	{ ~0, 0, 0, 0, 0, 0, 0 },

	{ ~0, 0, 0, 0, 0, 0, 0 },

	{ ~0, 0, 0, 0, 0, 0, 0 },

	{ ~0, 0, 0, 0, 0, 0, 0 },

	{ ~0, 0, 0, 0, 0, 0, 0 },

	{ ~0, 0, 0, 0, 0, 0, 0 },

};



#define DBDEV_TAB_SIZE	ARRAY_SIZE(dbdev_tab)
@@ -209,7 +209,7 @@ au1xxx_ddma_add_device(dbdev_tab_t *dev) 
	dbdev_tab_t *p=NULL;

	static u16 new_id=0x1000;



	p = find_dbdev_id(0);

	p = find_dbdev_id(~0);

	if ( NULL != p )

	{

		memcpy(p, dev, sizeof(dbdev_tab_t));

arch/mips/defconfig

deleted100644 → 0
+0 −1158

File deleted.

Preview size limit exceeded, changes collapsed.

arch/mips/kernel/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ obj-$(CONFIG_PROC_FS) += proc.o 
obj-$(CONFIG_64BIT)		+= cpu-bugs64.o



obj-$(CONFIG_I8253)		+= i8253.o

obj-$(CONFIG_PCSPEAKER)		+= pcspeaker.o



obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o

obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o