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

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

Pull MIPS updates from Thomas Bogendoerfer:

 - add support for TP-Link HC220 G5 v1

 - add support for Wifi/Bluetooth on CI20

 - rework Ralink clock and reset handling

 - cleanups and fixes

* tag 'mips_6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (58 commits)
  MIPS: Loongson64: DTS: Add RTC support to Loongson-2K1000
  MIPS: Loongson64: DTS: Add RTC support to LS7A PCH
  MIPS: OCTEON: octeon-usb: cleanup divider calculation
  MIPS: OCTEON: octeon-usb: introduce dwc3_octeon_{read,write}q
  MIPS: OCTEON: octeon-usb: move gpio config to separate function
  MIPS: OCTEON: octeon-usb: use bitfields for shim register
  MIPS: OCTEON: octeon-usb: use bitfields for host config register
  MIPS: OCTEON: octeon-usb: use bitfields for control register
  MIPS: OCTEON: octeon-usb: add all register offsets
  mips: ralink: match all supported system controller compatible strings
  MIPS: dec: prom: Address -Warray-bounds warning
  MIPS: DTS: CI20: Raise VDDCORE voltage to 1.125 volts
  clk: ralink: mtmips: Fix uninitialized use of ret in mtmips_register_{fixed,factor}_clocks()
  mips: ralink: introduce commonly used remap node function
  mips: pci-mt7620: use dev_info() to log PCIe device detection result
  mips: pci-mt7620: do not print NFTS register value as error log
  MAINTAINERS: add Mediatek MTMIPS Clock maintainer
  mips: ralink: get cpu rate from new driver code
  mips: ralink: remove reset related code
  mips: ralink: mt7620: remove clock related code
  ...
parents 18f38fed e47084e1

Documentation/admin-guide/kernel-parameters.txt

+4 −4
Original line number Diff line number Diff line
@@ -3716,8 +3716,8 @@ 


	nohibernate	[HIBERNATION] Disable hibernation and resume.



	nohlt		[ARM,ARM64,MICROBLAZE,SH] Forces the kernel to busy wait

			in do_idle() and not use the arch_cpu_idle()

	nohlt		[ARM,ARM64,MICROBLAZE,MIPS,SH] Forces the kernel to

			busy wait in do_idle() and not use the arch_cpu_idle()

			implementation; requires CONFIG_GENERIC_IDLE_POLL_SETUP

			to be effective. This is useful on platforms where the

			sleep(SH) or wfi(ARM,ARM64) instructions do not work
@@ -3852,7 +3852,7 @@ 
	nosmp		[SMP] Tells an SMP kernel to act as a UP kernel,

			and disable the IO APIC.  legacy for "maxcpus=0".



	nosmt		[KNL,S390] Disable symmetric multithreading (SMT).

	nosmt		[KNL,MIPS,S390] Disable symmetric multithreading (SMT).

			Equivalent to smt=1.



			[KNL,X86] Disable symmetric multithreading (SMT).
@@ -5770,7 +5770,7 @@ 
				1: Fast pin select (default)

				2: ATC IRMode



	smt=		[KNL,S390] Set the maximum number of threads (logical

	smt=		[KNL,MIPS,S390] Set the maximum number of threads (logical

			CPUs) to use per physical CPU on systems capable of

			symmetric multithreading (SMT). Will be capped to the

			actual hardware limit.

Documentation/devicetree/bindings/clock/mediatek,mtmips-sysc.yaml

0 → 100644
+64 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/clock/mediatek,mtmips-sysc.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: MTMIPS SoCs System Controller



maintainers:

  - Sergio Paracuellos <sergio.paracuellos@gmail.com>



description: |

  MediaTek MIPS and Ralink SoCs provides a system controller to allow

  to access to system control registers. These registers include clock

  and reset related ones so this node is both clock and reset provider

  for the rest of the world.



  These SoCs have an XTAL from where the cpu clock is

  provided as well as derived clocks for the bus and the peripherals.



properties:

  compatible:

    items:

      - enum:

          - ralink,mt7620-sysc

          - ralink,mt7628-sysc

          - ralink,mt7688-sysc

          - ralink,rt2880-sysc

          - ralink,rt3050-sysc

          - ralink,rt3052-sysc

          - ralink,rt3352-sysc

          - ralink,rt3883-sysc

          - ralink,rt5350-sysc

      - const: syscon



  reg:

    maxItems: 1



  '#clock-cells':

    description:

      The first cell indicates the clock number.

    const: 1



  '#reset-cells':

    description:

      The first cell indicates the reset bit within the register.

    const: 1



required:

  - compatible

  - reg

  - '#clock-cells'

  - '#reset-cells'



additionalProperties: false



examples:

  - |

    syscon@0 {

      compatible = "ralink,rt5350-sysc", "syscon";

      reg = <0x0 0x100>;

      #clock-cells = <1>;

      #reset-cells = <1>;

    };

Documentation/devicetree/bindings/mips/ralink.yaml

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ properties: 
          - enum:

              - gnubee,gb-pc1

              - gnubee,gb-pc2

              - tplink,hc220-g5-v1

          - const: mediatek,mt7621-soc



additionalProperties: true

MAINTAINERS

+6 −1
Original line number Diff line number Diff line
@@ -11442,7 +11442,6 @@ F: tools/testing/selftests/kvm/aarch64/ 








KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)









M:	Huacai Chen <chenhuacai@kernel.org>









M:	Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>









L:	linux-mips@vger.kernel.org









L:	kvm@vger.kernel.org









S:	Maintained








@@ -13331,6 +13330,12 @@ S:	Maintained







F:	Documentation/devicetree/bindings/i2c/mediatek,mt7621-i2c.yaml









F:	drivers/i2c/busses/i2c-mt7621.c

















MEDIATEK MTMIPS CLOCK DRIVER









M:	Sergio Paracuellos <sergio.paracuellos@gmail.com>









S:	Maintained









F:	Documentation/devicetree/bindings/clock/mediatek,mtmips-sysc.yaml









F:	drivers/clk/ralink/clk-mtmips.c

















MEDIATEK NAND CONTROLLER DRIVER









L:	linux-mtd@lists.infradead.org









S:	Orphan
































arch/mips/Kconfig



+3
−1






























Original line number
Diff line number
Diff line







@@ -45,6 +45,7 @@ config MIPS







	select GENERIC_LIB_UCMPDI2









	select GENERIC_SCHED_CLOCK if !CAVIUM_OCTEON_SOC









	select GENERIC_SMP_IDLE_THREAD









	select GENERIC_IDLE_POLL_SETUP









	select GENERIC_TIME_VSYSCALL









	select GUP_GET_PXX_LOW_HIGH if CPU_MIPS32 && PHYS_ADDR_T_64BIT









	select HAS_IOPORT if !NO_IOPORT_MAP || ISA








@@ -80,7 +81,6 @@ config MIPS







	select HAVE_LD_DEAD_CODE_DATA_ELIMINATION









	select HAVE_MOD_ARCH_SPECIFIC









	select HAVE_NMI









	select HAVE_PATA_PLATFORM









	select HAVE_PERF_EVENTS









	select HAVE_PERF_REGS









	select HAVE_PERF_USER_STACK_DUMP








@@ -155,9 +155,11 @@ config MIPS_GENERIC_KERNEL







	select SWAP_IO_SPACE









	select SYS_HAS_CPU_MIPS32_R1









	select SYS_HAS_CPU_MIPS32_R2









	select SYS_HAS_CPU_MIPS32_R5









	select SYS_HAS_CPU_MIPS32_R6









	select SYS_HAS_CPU_MIPS64_R1









	select SYS_HAS_CPU_MIPS64_R2









	select SYS_HAS_CPU_MIPS64_R5









	select SYS_HAS_CPU_MIPS64_R6









	select SYS_SUPPORTS_32BIT_KERNEL









	select SYS_SUPPORTS_64BIT_KERNEL