diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-03-02 10:34:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-03-02 10:34:14 -0800 |
| commit | 04a357b1f6f0b6f7c8689361fa8802e8e35d02ad (patch) | |
| tree | 00acf8b0227d582929c812a114a5edcc650eac10 /arch/mips/ralink | |
| parent | 857f1268a591147f7be7509f249dbb3aba6fc65c (diff) | |
| parent | 1a2c73f4834dd79e4f2c590ac75358fb44137650 (diff) | |
Merge tag 'mips_6.3_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull more MIPS updates from Thomas Bogendoerfer:
"A few more cleanups and fixes"
* tag 'mips_6.3_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
MIPS: Workaround clang inline compat branch issue
mips: dts: ralink: mt7621: add phandle to system controller node for watchdog
mips: dts: ralink: mt7621: rename watchdog node from 'wdt' into 'watchdog'
mips: ralink: make SOC_MT7621 select PINCTRL
mips: remove SYS_HAS_CPU_MIPS32_R1 from RALINK
MIPS: cevt-r4k: Offset the value used to clear compare interrupt
MIPS: smp-cps: Don't rely on CP0_CMGCRBASE
MIPS: Remove DMA_PERDEV_COHERENT
Diffstat (limited to 'arch/mips/ralink')
| -rw-r--r-- | arch/mips/ralink/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig index 06031796c87b..83e61e147b90 100644 --- a/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig @@ -54,7 +54,7 @@ choice select HAVE_PCI select PCI_DRIVERS_GENERIC select SOC_BUS - select PINCTRL_MT7621 + select PINCTRL help The MT7621 system-on-a-chip includes an 880 MHz MIPS1004Kc |