Commit 73d15ba6 authored May 30, 2022 by Linus Torvalds

linux

Pull MIPS updates from Thomas Bogendoerfer:
 "Cleanups and fixes"

* tag 'mips_5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (38 commits)
  MIPS: RALINK: Define pci_remap_iospace under CONFIG_PCI_DRIVERS_GENERIC
  MIPS: Use memblock_add_node() in early_parse_mem() under CONFIG_NUMA
  MIPS: Return -EINVAL if mem parameter is empty in early_parse_mem()
  MIPS: Kconfig: Fix indentation and add endif comment
  MIPS: bmips: Fix compiler warning observed on W=1 build
  MIPS: Rewrite `csum_tcpudp_nofold' in plain C
  mips: setup: use strscpy to replace strlcpy
  MIPS: Octeon: add SNIC10E board
  MIPS: Ingenic: Refresh defconfig for CU1000-Neo and CU1830-Neo.
  MIPS: Ingenic: Refresh device tree for Ingenic SoCs and boards.
  MIPS: Ingenic: Add PWM nodes for X1830.
  MIPS: Octeon: fix typo in comment
  MIPS: loongson32: Kconfig: Remove extra space
  MIPS: Sibyte: remove unnecessary return variable
  MIPS: Use NOKPROBE_SYMBOL() instead of __kprobes annotation
  selftests/ftrace: Save kprobe_events to test log
  MIPS: tools: no need to initialise statics to 0
  MIPS: Loongson: Use hwmon_device_register_with_groups() to register hwmon
  MIPS: VR41xx: Drop redundant spinlock initialization
  MIPS: smp: optimization for flush_tlb_mm when exiting
  ...

parents 2d2da475 7e4fd16b

arch/mips/Kconfig

+6 −6

Original line number	Diff line number	Diff line
		@@ -3255,7 +3255,7 @@ menu "CPU Power Management"

		if CPU_SUPPORTS_CPUFREQ && MIPS_EXTERNAL_TIMER
		source "drivers/cpufreq/Kconfig"
		endif
		endif # CPU_SUPPORTS_CPUFREQ && MIPS_EXTERNAL_TIMER

		source "drivers/cpuidle/Kconfig"

arch/mips/alchemy/common/dbdma.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -574,7 +574,7 @@ u32 au1xxx_dbdma_ring_alloc(u32 chanid, int entries)
		dp++;
		}

		/* Make last descrptor point to the first. */
		/* Make last descriptor point to the first. */
		dp--;
		dp->dscr_nxtptr = DSCR_NXTPTR(virt_to_phys(ctp->chan_desc_base));
		ctp->get_ptr = ctp->put_ptr = ctp->cur_ptr = ctp->chan_desc_base;

arch/mips/bmips/dma.c

+1 −0

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0+

		#include <linux/types.h>
		#include <linux/dma-map-ops.h>
		#include <asm/bmips.h>
		#include <asm/io.h>

arch/mips/boot/dts/brcm/bcm97358svmb.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ &nand {
		&qspi {
		status = "okay";

		m25p80@0 {
		flash@0 {
		compatible = "m25p80";
		reg = <0>;
		spi-max-frequency = <40000000>;

arch/mips/boot/dts/brcm/bcm97360svmb.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ &sdhci0 {
		&qspi {
		status = "okay";

		m25p80@0 {
		flash@0 {
		compatible = "m25p80";
		reg = <0>;
		spi-max-frequency = <40000000>;