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

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

Pull MIPS updates from Thomas Bogendoerfer:
 "Just cleanups and fixes"

* tag 'mips_6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  mips: dts: realtek: Add I2C controllers
  mips: dts: realtek: Add syscon-reboot node
  MIPS: loongson3_defconfig: Enable blk_dev_nvme by default
  MIPS: loongson3_defconfig: Update configs dependencies
  MAINTAINERS: Remove linux-mips.org references
  MAINTAINERS: Retire Ralf Baechle
  TC: Fix the wrong format specifier
  MIPS: kernel: proc: Use str_yes_no() helper function
  MIPS: mobileye: eyeq6h-epm6: Use eyeq6h in the board device tree
  mips: bmips: bcm6358/6368: define required brcm,bmips-cbr-reg
  MIPS: Allow using more than 32-bit addresses for reset vectors when possible
  mips: asm: fix warning when disabling MIPS_FP_SUPPORT
  mips: sgi-ip22: Replace "s[n]?printf" with sysfs_emit in sysfs callbacks
parents 0338cd9c 56131e6d

.get_maintainer.ignore

+1 −0
Original line number Diff line number Diff line
@@ -3,3 +3,4 @@ Alan Cox <root@hraefn.swansea.linux.org.uk> 
Christoph Hellwig <hch@lst.de>

Jeff Kirsher <jeffrey.t.kirsher@intel.com>

Marc Gonzalez <marc.w.gonzalez@free.fr>

Ralf Baechle <ralf@linux-mips.org>

CREDITS

+5 −0
Original line number Diff line number Diff line
@@ -185,6 +185,11 @@ P: 1024/AF7B30C1 CF 97 C2 CC 6D AE A7 FE C8 BA 9C FC 88 DE 32 C3 
D: Linux/MIPS port

D: Linux/68k hacker

D: AX25 maintainer

D: EDAC-CAVIUM OCTEON maintainer

D: IOC3 ETHERNET DRIVER maintainer

D: NETROM NETWORK LAYER maintainer

D: ROSE NETWORK LAYER maintainer

D: TURBOCHANNEL SUBSYSTEM maintainer

S: Hauptstrasse 19

S: 79837 St. Blasien

S: Germany

MAINTAINERS

+6 −11
Original line number Diff line number Diff line
@@ -6301,7 +6301,6 @@ DECSTATION PLATFORM SUPPORT 
M:	"Maciej W. Rozycki" <macro@orcam.me.uk>

L:	linux-mips@vger.kernel.org

S:	Maintained

W:	http://www.linux-mips.org/wiki/DECstation

F:	arch/mips/dec/

F:	arch/mips/include/asm/dec/

F:	arch/mips/include/asm/mach-dec/
@@ -8061,10 +8060,10 @@ S: Maintained 
F:	drivers/edac/highbank*









EDAC-CAVIUM OCTEON









M:	Ralf Baechle <ralf@linux-mips.org>









M:	Thomas Bogendoerfer <tsbogend@alpha.franken.de>









L:	linux-edac@vger.kernel.org









L:	linux-mips@vger.kernel.org









S:	Supported









S:	Maintained









F:	drivers/edac/octeon_edac*

















EDAC-CAVIUM THUNDERX








@@ -11886,7 +11885,7 @@ F:	Documentation/devicetree/bindings/iio/gyroscope/invensense,mpu3050.yaml







F:	drivers/iio/gyro/mpu3050*

















IOC3 ETHERNET DRIVER









M:	Ralf Baechle <ralf@linux-mips.org>









M:	Thomas Bogendoerfer <tsbogend@alpha.franken.de>









L:	linux-mips@vger.kernel.org









S:	Maintained









F:	drivers/net/ethernet/sgi/ioc3-eth.c








@@ -15481,7 +15480,6 @@ MIPS







M:	Thomas Bogendoerfer <tsbogend@alpha.franken.de>









L:	linux-mips@vger.kernel.org









S:	Maintained









W:	http://www.linux-mips.org/









Q:	https://patchwork.kernel.org/project/linux-mips/list/









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git









F:	Documentation/devicetree/bindings/mips/








@@ -15994,9 +15992,8 @@ F:	net/netfilter/







F:	tools/testing/selftests/net/netfilter/

















NETROM NETWORK LAYER









M:	Ralf Baechle <ralf@linux-mips.org>









L:	linux-hams@vger.kernel.org









S:	Maintained









S:	Orphan









W:	https://linux-ax25.in-berlin.de









F:	include/net/netrom.h









F:	include/uapi/linux/netrom.h








@@ -20066,9 +20063,8 @@ F:	include/linux/mfd/rohm-generic.h







F:	include/linux/mfd/rohm-shared.h

















ROSE NETWORK LAYER









M:	Ralf Baechle <ralf@linux-mips.org>









L:	linux-hams@vger.kernel.org









S:	Maintained









S:	Orphan









W:	https://linux-ax25.in-berlin.de









F:	include/net/rose.h









F:	include/uapi/linux/rose.h








@@ -23611,10 +23607,9 @@ F:	drivers/net/tun.c















TURBOCHANNEL SUBSYSTEM









M:	"Maciej W. Rozycki" <macro@orcam.me.uk>









M:	Ralf Baechle <ralf@linux-mips.org>









L:	linux-mips@vger.kernel.org









S:	Maintained









Q:	http://patchwork.linux-mips.org/project/linux-mips/list/









Q:	https://patchwork.kernel.org/project/linux-mips/list/









F:	drivers/tc/









F:	include/linux/tc.h

































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



+1
−0






























Original line number
Diff line number
Diff line







@@ -13,6 +13,7 @@ cpus {







		#size-cells = <0>;



















		mips-hpt-frequency = <150000000>;









		brcm,bmips-cbr-reg = <0xff400000>;



















		cpu@0 {









			compatible = "brcm,bmips4350";
































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



+1
−0






























Original line number
Diff line number
Diff line







@@ -13,6 +13,7 @@ cpus {







		#size-cells = <0>;



















		mips-hpt-frequency = <200000000>;









		brcm,bmips-cbr-reg = <0xff400000>;



















		cpu@0 {









			compatible = "brcm,bmips4350";