From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 29 Jun 2023 22:01:51 +0000 (-0700)
Subject: Merge tag 'mips_6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b775d6c5859affe00527cbe74263de05cfe6b9f9;p=linux.git

Merge tag 'mips_6.5' of git://git./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
  ...
---

b775d6c5859affe00527cbe74263de05cfe6b9f9
diff --cc arch/mips/include/asm/mach-loongson32/loongson1.h
index d8f9dec0ecc3f,50358f1a6181e..7971272345d31
--- a/arch/mips/include/asm/mach-loongson32/loongson1.h
+++ b/arch/mips/include/asm/mach-loongson32/loongson1.h
@@@ -47,7 -47,7 +47,6 @@@
  
  #include <regs-clk.h>
  #include <regs-mux.h>
 -#include <regs-pwm.h>
  #include <regs-rtc.h>
- #include <regs-wdt.h>
  
  #endif /* __ASM_MACH_LOONGSON32_LOONGSON1_H */