Skip to content

Commit ae4336e

Browse files
committed
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
2 parents 0338cd9 + 56131e6 commit ae4336e

File tree

16 files changed

+123
-58
lines changed

16 files changed

+123
-58
lines changed

.get_maintainer.ignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ Alan Cox <root@hraefn.swansea.linux.org.uk>
33
Christoph Hellwig <hch@lst.de>
44
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
55
Marc Gonzalez <marc.w.gonzalez@free.fr>
6+
Ralf Baechle <ralf@linux-mips.org>

CREDITS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,11 @@ P: 1024/AF7B30C1 CF 97 C2 CC 6D AE A7 FE C8 BA 9C FC 88 DE 32 C3
185185
D: Linux/MIPS port
186186
D: Linux/68k hacker
187187
D: AX25 maintainer
188+
D: EDAC-CAVIUM OCTEON maintainer
189+
D: IOC3 ETHERNET DRIVER maintainer
190+
D: NETROM NETWORK LAYER maintainer
191+
D: ROSE NETWORK LAYER maintainer
192+
D: TURBOCHANNEL SUBSYSTEM maintainer
188193
S: Hauptstrasse 19
189194
S: 79837 St. Blasien
190195
S: Germany

MAINTAINERS

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6301,7 +6301,6 @@ DECSTATION PLATFORM SUPPORT
63016301
M: "Maciej W. Rozycki" <macro@orcam.me.uk>
63026302
L: linux-mips@vger.kernel.org
63036303
S: Maintained
6304-
W: http://www.linux-mips.org/wiki/DECstation
63056304
F: arch/mips/dec/
63066305
F: arch/mips/include/asm/dec/
63076306
F: arch/mips/include/asm/mach-dec/
@@ -8061,10 +8060,10 @@ S: Maintained
80618060
F: drivers/edac/highbank*
80628061

80638062
EDAC-CAVIUM OCTEON
8064-
M: Ralf Baechle <ralf@linux-mips.org>
8063+
M: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
80658064
L: linux-edac@vger.kernel.org
80668065
L: linux-mips@vger.kernel.org
8067-
S: Supported
8066+
S: Maintained
80688067
F: drivers/edac/octeon_edac*
80698068

80708069
EDAC-CAVIUM THUNDERX
@@ -11886,7 +11885,7 @@ F: Documentation/devicetree/bindings/iio/gyroscope/invensense,mpu3050.yaml
1188611885
F: drivers/iio/gyro/mpu3050*
1188711886

1188811887
IOC3 ETHERNET DRIVER
11889-
M: Ralf Baechle <ralf@linux-mips.org>
11888+
M: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
1189011889
L: linux-mips@vger.kernel.org
1189111890
S: Maintained
1189211891
F: drivers/net/ethernet/sgi/ioc3-eth.c
@@ -15481,7 +15480,6 @@ MIPS
1548115480
M: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
1548215481
L: linux-mips@vger.kernel.org
1548315482
S: Maintained
15484-
W: http://www.linux-mips.org/
1548515483
Q: https://patchwork.kernel.org/project/linux-mips/list/
1548615484
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git
1548715485
F: Documentation/devicetree/bindings/mips/
@@ -15994,9 +15992,8 @@ F: net/netfilter/
1599415992
F: tools/testing/selftests/net/netfilter/
1599515993

1599615994
NETROM NETWORK LAYER
15997-
M: Ralf Baechle <ralf@linux-mips.org>
1599815995
L: linux-hams@vger.kernel.org
15999-
S: Maintained
15996+
S: Orphan
1600015997
W: https://linux-ax25.in-berlin.de
1600115998
F: include/net/netrom.h
1600215999
F: include/uapi/linux/netrom.h
@@ -20066,9 +20063,8 @@ F: include/linux/mfd/rohm-generic.h
2006620063
F: include/linux/mfd/rohm-shared.h
2006720064

2006820065
ROSE NETWORK LAYER
20069-
M: Ralf Baechle <ralf@linux-mips.org>
2007020066
L: linux-hams@vger.kernel.org
20071-
S: Maintained
20067+
S: Orphan
2007220068
W: https://linux-ax25.in-berlin.de
2007320069
F: include/net/rose.h
2007420070
F: include/uapi/linux/rose.h
@@ -23611,10 +23607,9 @@ F: drivers/net/tun.c
2361123607

2361223608
TURBOCHANNEL SUBSYSTEM
2361323609
M: "Maciej W. Rozycki" <macro@orcam.me.uk>
23614-
M: Ralf Baechle <ralf@linux-mips.org>
2361523610
L: linux-mips@vger.kernel.org
2361623611
S: Maintained
23617-
Q: http://patchwork.linux-mips.org/project/linux-mips/list/
23612+
Q: https://patchwork.kernel.org/project/linux-mips/list/
2361823613
F: drivers/tc/
2361923614
F: include/linux/tc.h
2362023615

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#size-cells = <0>;
1414

1515
mips-hpt-frequency = <150000000>;
16+
brcm,bmips-cbr-reg = <0xff400000>;
1617

1718
cpu@0 {
1819
compatible = "brcm,bmips4350";

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#size-cells = <0>;
1414

1515
mips-hpt-frequency = <200000000>;
16+
brcm,bmips-cbr-reg = <0xff400000>;
1617

1718
cpu@0 {
1819
compatible = "brcm,bmips4350";

arch/mips/boot/dts/mobileye/eyeq6h-epm6.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "eyeq6h.dtsi"
99

1010
/ {
11-
compatible = "mobileye,eyeq6-epm6", "mobileye,eyeq6";
11+
compatible = "mobileye,eyeq6h-epm6", "mobileye,eyeq6h";
1212
model = "Mobile EyeQ6H MP6 Evaluation board";
1313

1414
chosen {

arch/mips/boot/dts/realtek/cameo-rtl9302c-2x-rtl8224-2xge.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later
22
/dts-v1/;
33

4-
#include "rtl930x.dtsi"
4+
#include "rtl9302c.dtsi"
55

66
#include <dt-bindings/input/input.h>
77
#include <dt-bindings/gpio/gpio.h>
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// SPDX-License-Identifier: GPL-2.0-or-later OR BSD-2-Clause
2+
3+
#include "rtl930x.dtsi"
4+
5+
&switch0 {
6+
compatible = "realtek,rtl9302c-switch", "syscon", "simple-mfd";
7+
};
8+
9+
&i2c0 {
10+
compatible = "realtek,rtl9302c-i2c", "realtek,rtl9301-i2c";
11+
};
12+
13+
&i2c1 {
14+
compatible = "realtek,rtl9302c-i2c", "realtek,rtl9301-i2c";
15+
};

arch/mips/boot/dts/realtek/rtl930x.dtsi

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,35 @@
2929
#clock-cells = <0>;
3030
clock-frequency = <175000000>;
3131
};
32+
33+
switch0: switch@1b000000 {
34+
compatible = "realtek,rtl9301-switch", "syscon", "simple-mfd";
35+
reg = <0x1b000000 0x10000>;
36+
#address-cells = <1>;
37+
#size-cells = <1>;
38+
39+
reboot@c {
40+
compatible = "syscon-reboot";
41+
reg = <0x0c 0x4>;
42+
value = <0x01>;
43+
};
44+
45+
i2c0: i2c@36c {
46+
compatible = "realtek,rtl9301-i2c";
47+
reg = <0x36c 0x14>;
48+
#address-cells = <1>;
49+
#size-cells = <0>;
50+
status = "disabled";
51+
};
52+
53+
i2c1: i2c@388 {
54+
compatible = "realtek,rtl9301-i2c";
55+
reg = <0x388 0x14>;
56+
#address-cells = <1>;
57+
#size-cells = <0>;
58+
status = "disabled";
59+
};
60+
};
3261
};
3362

3463
&soc {

arch/mips/configs/loongson3_defconfig

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ CONFIG_POSIX_MQUEUE=y
55
CONFIG_AUDIT=y
66
CONFIG_NO_HZ=y
77
CONFIG_HIGH_RES_TIMERS=y
8+
CONFIG_BPF_SYSCALL=y
9+
CONFIG_BPF_JIT=y
810
CONFIG_PREEMPT=y
911
CONFIG_BSD_PROCESS_ACCT=y
1012
CONFIG_BSD_PROCESS_ACCT_V3=y
@@ -22,18 +24,16 @@ CONFIG_CGROUP_CPUACCT=y
2224
CONFIG_NAMESPACES=y
2325
CONFIG_USER_NS=y
2426
CONFIG_SCHED_AUTOGROUP=y
25-
CONFIG_SYSFS_DEPRECATED=y
2627
CONFIG_RELAY=y
2728
CONFIG_BLK_DEV_INITRD=y
28-
CONFIG_BPF_SYSCALL=y
2929
CONFIG_EXPERT=y
3030
CONFIG_PERF_EVENTS=y
31+
CONFIG_KEXEC=y
3132
CONFIG_MACH_LOONGSON64=y
3233
CONFIG_CPU_HAS_MSA=y
3334
CONFIG_NUMA=y
3435
CONFIG_NR_CPUS=16
3536
CONFIG_HZ_256=y
36-
CONFIG_KEXEC=y
3737
CONFIG_MIPS32_O32=y
3838
CONFIG_MIPS32_N32=y
3939
CONFIG_VIRTUALIZATION=y
@@ -47,15 +47,12 @@ CONFIG_MODVERSIONS=y
4747
CONFIG_PARTITION_ADVANCED=y
4848
CONFIG_MQ_IOSCHED_DEADLINE=m
4949
CONFIG_IOSCHED_BFQ=y
50-
CONFIG_BFQ_GROUP_IOSCHED=y
5150
CONFIG_BINFMT_MISC=m
5251
CONFIG_KSM=y
5352
CONFIG_NET=y
5453
CONFIG_PACKET=y
55-
CONFIG_UNIX=y
5654
CONFIG_XFRM_USER=y
5755
CONFIG_NET_KEY=y
58-
CONFIG_INET=y
5956
CONFIG_IP_MULTICAST=y
6057
CONFIG_IP_ADVANCED_ROUTER=y
6158
CONFIG_IP_MULTIPLE_TABLES=y
@@ -106,7 +103,6 @@ CONFIG_IP_NF_TARGET_ECN=m
106103
CONFIG_IP_NF_TARGET_TTL=m
107104
CONFIG_IP_NF_RAW=m
108105
CONFIG_IP_NF_SECURITY=m
109-
CONFIG_IP_NF_ARPTABLES=m
110106
CONFIG_IP_NF_ARPFILTER=m
111107
CONFIG_IP_NF_ARP_MANGLE=m
112108
CONFIG_NF_TABLES_IPV6=y
@@ -128,7 +124,6 @@ CONFIG_L2TP=m
128124
CONFIG_BRIDGE=m
129125
CONFIG_VSOCKETS=m
130126
CONFIG_VIRTIO_VSOCKETS=m
131-
CONFIG_BPF_JIT=y
132127
CONFIG_CFG80211=m
133128
CONFIG_CFG80211_WEXT=y
134129
CONFIG_MAC80211=m
@@ -146,6 +141,7 @@ CONFIG_BLK_DEV_LOOP=y
146141
CONFIG_BLK_DEV_RAM=y
147142
CONFIG_BLK_DEV_RAM_SIZE=8192
148143
CONFIG_VIRTIO_BLK=y
144+
CONFIG_BLK_DEV_NVME=m
149145
CONFIG_RAID_ATTRS=m
150146
CONFIG_BLK_DEV_SD=y
151147
CONFIG_BLK_DEV_SR=y
@@ -167,12 +163,10 @@ CONFIG_SATA_AHCI=y
167163
CONFIG_PATA_ATIIXP=y
168164
CONFIG_MD=y
169165
CONFIG_BLK_DEV_MD=m
170-
CONFIG_MD_LINEAR=m
171166
CONFIG_MD_RAID0=m
172167
CONFIG_MD_RAID1=m
173168
CONFIG_MD_RAID10=m
174169
CONFIG_MD_RAID456=m
175-
CONFIG_MD_MULTIPATH=m
176170
CONFIG_BLK_DEV_DM=m
177171
CONFIG_DM_CRYPT=m
178172
CONFIG_DM_SNAPSHOT=m
@@ -196,7 +190,6 @@ CONFIG_VIRTIO_NET=m
196190
# CONFIG_NET_VENDOR_ARC is not set
197191
# CONFIG_NET_VENDOR_ATHEROS is not set
198192
# CONFIG_NET_VENDOR_BROADCOM is not set
199-
# CONFIG_NET_VENDOR_BROCADE is not set
200193
# CONFIG_NET_VENDOR_CHELSIO is not set
201194
# CONFIG_NET_VENDOR_CIRRUS is not set
202195
# CONFIG_NET_VENDOR_CISCO is not set
@@ -216,6 +209,7 @@ CONFIG_IXGBE=y
216209
# CONFIG_NET_VENDOR_NVIDIA is not set
217210
# CONFIG_NET_VENDOR_OKI is not set
218211
# CONFIG_NET_VENDOR_QLOGIC is not set
212+
# CONFIG_NET_VENDOR_BROCADE is not set
219213
# CONFIG_NET_VENDOR_RDC is not set
220214
CONFIG_8139CP=m
221215
CONFIG_8139TOO=m
@@ -242,7 +236,6 @@ CONFIG_PPPOL2TP=m
242236
CONFIG_PPP_ASYNC=m
243237
CONFIG_PPP_SYNC_TTY=m
244238
CONFIG_ATH9K=m
245-
CONFIG_HOSTAP=m
246239
CONFIG_INPUT_SPARSEKMAP=y
247240
CONFIG_INPUT_MOUSEDEV=y
248241
CONFIG_INPUT_MOUSEDEV_PSAUX=y
@@ -276,23 +269,20 @@ CONFIG_MEDIA_SUPPORT=m
276269
CONFIG_MEDIA_USB_SUPPORT=y
277270
CONFIG_USB_VIDEO_CLASS=m
278271
CONFIG_DRM=y
272+
CONFIG_DRM_RADEON=m
279273
CONFIG_DRM_AMDGPU=m
280274
CONFIG_DRM_AMDGPU_SI=y
281275
CONFIG_DRM_AMDGPU_CIK=y
282276
CONFIG_DRM_AMDGPU_USERPTR=y
283277
CONFIG_DRM_AMD_ACP=y
284-
CONFIG_DRM_AMD_DC=y
285278
CONFIG_DRM_AMD_DC_SI=y
286279
CONFIG_DRM_AST=m
287-
CONFIG_DRM_RADEON=m
288280
CONFIG_DRM_QXL=y
289281
CONFIG_DRM_VIRTIO_GPU=y
290282
CONFIG_FB=y
291283
CONFIG_FB_RADEON=y
292284
CONFIG_LCD_CLASS_DEVICE=y
293285
CONFIG_LCD_PLATFORM=m
294-
# CONFIG_VGA_CONSOLE is not set
295-
CONFIG_FRAMEBUFFER_CONSOLE=y
296286
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
297287
CONFIG_LOGO=y
298288
CONFIG_SOUND=y
@@ -350,13 +340,11 @@ CONFIG_EXT3_FS_SECURITY=y
350340
CONFIG_XFS_FS=y
351341
CONFIG_XFS_POSIX_ACL=y
352342
CONFIG_QUOTA=y
353-
# CONFIG_PRINT_QUOTA_WARNING is not set
354343
CONFIG_QFMT_V1=m
355344
CONFIG_QFMT_V2=m
356345
CONFIG_AUTOFS_FS=y
357346
CONFIG_FUSE_FS=m
358347
CONFIG_VIRTIO_FS=m
359-
CONFIG_NETFS_SUPPORT=m
360348
CONFIG_FSCACHE=y
361349
CONFIG_ISO9660_FS=m
362350
CONFIG_JOLIET=y
@@ -391,23 +379,21 @@ CONFIG_SECURITY_NETWORK=y
391379
CONFIG_SECURITY_PATH=y
392380
CONFIG_SECURITY_SELINUX=y
393381
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
394-
CONFIG_SECURITY_SELINUX_DISABLE=y
395382
CONFIG_DEFAULT_SECURITY_DAC=y
396-
CONFIG_CRYPTO_HMAC=y
397-
CONFIG_CRYPTO_MD5=y
398-
CONFIG_CRYPTO_WP512=m
399383
CONFIG_CRYPTO_BLOWFISH=m
400384
CONFIG_CRYPTO_CAST5=m
401385
CONFIG_CRYPTO_CAST6=m
402386
CONFIG_CRYPTO_SERPENT=m
403387
CONFIG_CRYPTO_TWOFISH=m
388+
CONFIG_CRYPTO_HMAC=y
389+
CONFIG_CRYPTO_MD5=y
390+
CONFIG_CRYPTO_WP512=m
404391
CONFIG_CRYPTO_DEFLATE=m
405392
CONFIG_PRINTK_TIME=y
406393
CONFIG_STRIP_ASM_SYMS=y
407394
CONFIG_MAGIC_SYSRQ=y
408395
CONFIG_DEBUG_FS=y
409396
# CONFIG_SCHED_DEBUG is not set
410-
# CONFIG_DEBUG_PREEMPT is not set
411397
CONFIG_FUNCTION_TRACER=y
412398
CONFIG_FTRACE_SYSCALLS=y
413399
CONFIG_CMDLINE_BOOL=y

0 commit comments

Comments
 (0)