Commit fb443f36 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips_6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS updates from Thomas Bogendoerfer:

 - mainly cleanups

 - fix enabling interrupts on second VPE for Lantiq platform

 - switch to use gpiod API

 - allow firmware passing RND seed

* tag 'mips_6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (29 commits)
  MIPS: pci: lantiq: switch to using gpiod API
  mips: allow firmware to pass RNG seed to kernel
  MIPS: Simplify __bswapdi2() and __bswapsi2()
  MIPS: Silence missing prototype warning
  mips: update config files
  MIPS: Lantiq: vmmc: fix compile break introduced by gpiod patch
  MIPS: IRQ: remove orphan allocate_irqno() declaration
  MIPS: remove orphan sb1250_time_init() declaration
  MIPS: Lantiq: switch vmmc to use gpiod API
  MIPS: lantiq: enable all hardware interrupts on second VPE
  MIPS: BCM47XX: Cast memcmp() of function to (void *)
  mips: ralink: convert to DEFINE_SHOW_ATTRIBUTE
  mips: kernel: convert to DEFINE_SHOW_ATTRIBUTE
  mips: cavium: convert to DEFINE_SHOW_ATTRIBUTE
  MIPS: AR7: remove orphan declarations from arch/mips/include/asm/mach-ar7/ar7.h
  MIPS: remove orphan sni_cpu_time_init() declaration
  MIPS: IRQ: remove orphan declarations from arch/mips/include/asm/irq.h
  MIPS: Octeon: remove orphan octeon_hal_setup_reserved32() declaration
  MIPS: Octeon: remove orphan cvmx_fpa_setup_pool() declaration
  MIPS: Octeon: remove orphan octeon_swiotlb declaration
  ...
parents 4fe89d07 90c2d2eb

arch/mips/bcm47xx/prom.c

+2 −2
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static __init void prom_init_mem(void) 
			pr_debug("Assume 128MB RAM\n");

			break;

		}

		if (!memcmp(prom_init, prom_init + mem, 32))

		if (!memcmp((void *)prom_init, (void *)prom_init + mem, 32))

			break;

	}

	lowmem = mem;
@@ -159,7 +159,7 @@ void __init bcm47xx_prom_highmem_init(void) 


	off = EXTVBASE + __pa(off);

	for (extmem = 128 << 20; extmem < 512 << 20; extmem <<= 1) {

		if (!memcmp(prom_init, (void *)(off + extmem), 16))

		if (!memcmp((void *)prom_init, (void *)(off + extmem), 16))

			break;

	}

	extmem -= lowmem;

arch/mips/boot/dts/brcm/bcm63268.dtsi

+12 −6
Original line number Diff line number Diff line
@@ -105,15 +105,21 @@ 
			interrupts = <2>, <3>;

		};



		wdt: watchdog@1000009c {

		timer-mfd@10000080 {

			compatible = "brcm,bcm7038-twd", "simple-mfd", "syscon";

			reg = <0x10000080 0x30>;

			ranges = <0x0 0x10000080 0x30>;



			wdt: watchdog@1c {

				compatible = "brcm,bcm7038-wdt";

			reg = <0x1000009c 0xc>;

				reg = <0x1c 0xc>;



				clocks = <&periph_osc>;

				clock-names = "refclk";



				timeout-sec = <30>;

			};

		};



		uart0: serial@10000180 {

			compatible = "brcm,bcm6345-uart";

arch/mips/boot/dts/lantiq/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

dtb-$(CONFIG_DT_EASY50712)	+= easy50712.dtb

dtb-$(CONFIG_DT_EASY50712)	+= danube_easy50712.dtb



obj-$(CONFIG_BUILTIN_DTB)	+= $(addsuffix .o, $(dtb-y))

arch/mips/cavium-octeon/oct_ilm.c

+3 −14
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ struct latency_info { 
static struct latency_info li;

static struct dentry *dir;



static int show_latency(struct seq_file *m, void *v)

static int oct_ilm_show(struct seq_file *m, void *v)

{

	u64 cpuclk, avg, max, min;

	struct latency_info curr_li = li;
@@ -43,18 +43,7 @@ static int show_latency(struct seq_file *m, void *v) 
		   curr_li.interrupt_cnt, avg, max, min);

	return 0;

}



static int oct_ilm_open(struct inode *inode, struct file *file)

{

	return single_open(file, show_latency, NULL);

}



static const struct file_operations oct_ilm_ops = {

	.open = oct_ilm_open,

	.read = seq_read,

	.llseek = seq_lseek,

	.release = single_release,

};

DEFINE_SHOW_ATTRIBUTE(oct_ilm);



static int reset_statistics(void *data, u64 value)

{
@@ -67,7 +56,7 @@ DEFINE_DEBUGFS_ATTRIBUTE(reset_statistics_ops, NULL, reset_statistics, "%llu\n") 
static void init_debugfs(void)

{

	dir = debugfs_create_dir("oct_ilm", 0);

	debugfs_create_file("statistics", 0222, dir, NULL, &oct_ilm_ops);

	debugfs_create_file("statistics", 0222, dir, NULL, &oct_ilm_fops);

	debugfs_create_file("reset", 0222, dir, NULL, &reset_statistics_ops);

}