Skip to content

Commit fb443f3

Browse files
torvaldstorvalds
committed
Merge tag 'mips_6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull MIPS updates from Thomas Bogendoerfer: - mainly cleanups - fix enabling interrupts on second VPE for Lantiq platform - switch to use gpiod API - allow firmware passing RND seed * tag 'mips_6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (29 commits) MIPS: pci: lantiq: switch to using gpiod API mips: allow firmware to pass RNG seed to kernel MIPS: Simplify __bswapdi2() and __bswapsi2() MIPS: Silence missing prototype warning mips: update config files MIPS: Lantiq: vmmc: fix compile break introduced by gpiod patch MIPS: IRQ: remove orphan allocate_irqno() declaration MIPS: remove orphan sb1250_time_init() declaration MIPS: Lantiq: switch vmmc to use gpiod API MIPS: lantiq: enable all hardware interrupts on second VPE MIPS: BCM47XX: Cast memcmp() of function to (void *) mips: ralink: convert to DEFINE_SHOW_ATTRIBUTE mips: kernel: convert to DEFINE_SHOW_ATTRIBUTE mips: cavium: convert to DEFINE_SHOW_ATTRIBUTE MIPS: AR7: remove orphan declarations from arch/mips/include/asm/mach-ar7/ar7.h MIPS: remove orphan sni_cpu_time_init() declaration MIPS: IRQ: remove orphan declarations from arch/mips/include/asm/irq.h MIPS: Octeon: remove orphan octeon_hal_setup_reserved32() declaration MIPS: Octeon: remove orphan cvmx_fpa_setup_pool() declaration MIPS: Octeon: remove orphan octeon_swiotlb declaration ...
2 parents 4fe89d0 + 90c2d2e commit fb443f3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+215
-414
lines changed

‎arch/mips/bcm47xx/prom.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ static __init void prom_init_mem(void)
8686
pr_debug("Assume 128MB RAM\n");
8787
break;
8888
}
89-
if (!memcmp(prom_init, prom_init + mem, 32))
89+
if (!memcmp((void *)prom_init, (void *)prom_init + mem, 32))
9090
break;
9191
}
9292
lowmem = mem;
@@ -159,7 +159,7 @@ void __init bcm47xx_prom_highmem_init(void)
159159

160160
off = EXTVBASE + __pa(off);
161161
for (extmem = 128 << 20; extmem < 512 << 20; extmem <<= 1) {
162-
if (!memcmp(prom_init, (void *)(off + extmem), 16))
162+
if (!memcmp((void *)prom_init, (void *)(off + extmem), 16))
163163
break;
164164
}
165165
extmem -= lowmem;

‎arch/mips/boot/dts/brcm/bcm63268.dtsi‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,20 @@
105105
interrupts = <2>, <3>;
106106
};
107107

108-
wdt: watchdog@1000009c {
109-
compatible = "brcm,bcm7038-wdt";
110-
reg = <0x1000009c 0xc>;
108+
timer-mfd@10000080 {
109+
compatible = "brcm,bcm7038-twd", "simple-mfd", "syscon";
110+
reg = <0x10000080 0x30>;
111+
ranges = <0x0 0x10000080 0x30>;
111112

112-
clocks = <&periph_osc>;
113-
clock-names = "refclk";
113+
wdt: watchdog@1c {
114+
compatible = "brcm,bcm7038-wdt";
115+
reg = <0x1c 0xc>;
114116

115-
timeout-sec = <30>;
117+
clocks = <&periph_osc>;
118+
clock-names = "refclk";
119+
120+
timeout-sec = <30>;
121+
};
116122
};
117123

118124
uart0: serial@10000180 {

‎arch/mips/boot/dts/lantiq/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# SPDX-License-Identifier: GPL-2.0
2-
dtb-$(CONFIG_DT_EASY50712) += easy50712.dtb
2+
dtb-$(CONFIG_DT_EASY50712) += danube_easy50712.dtb
33

44
obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))

arch/mips/boot/dts/lantiq/easy50712.dts renamed to arch/mips/boot/dts/lantiq/danube_easy50712.dts

File renamed without changes.

‎arch/mips/cavium-octeon/oct_ilm.c‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ struct latency_info {
2828
static struct latency_info li;
2929
static struct dentry *dir;
3030

31-
static int show_latency(struct seq_file *m, void *v)
31+
static int oct_ilm_show(struct seq_file *m, void *v)
3232
{
3333
u64 cpuclk, avg, max, min;
3434
struct latency_info curr_li = li;
@@ -43,18 +43,7 @@ static int show_latency(struct seq_file *m, void *v)
4343
curr_li.interrupt_cnt, avg, max, min);
4444
return 0;
4545
}
46-
47-
static int oct_ilm_open(struct inode *inode, struct file *file)
48-
{
49-
return single_open(file, show_latency, NULL);
50-
}
51-
52-
static const struct file_operations oct_ilm_ops = {
53-
.open = oct_ilm_open,
54-
.read = seq_read,
55-
.llseek = seq_lseek,
56-
.release = single_release,
57-
};
46+
DEFINE_SHOW_ATTRIBUTE(oct_ilm);
5847

5948
static int reset_statistics(void *data, u64 value)
6049
{
@@ -67,7 +56,7 @@ DEFINE_DEBUGFS_ATTRIBUTE(reset_statistics_ops, NULL, reset_statistics, "%llu\n")
6756
static void init_debugfs(void)
6857
{
6958
dir = debugfs_create_dir("oct_ilm", 0);
70-
debugfs_create_file("statistics", 0222, dir, NULL, &oct_ilm_ops);
59+
debugfs_create_file("statistics", 0222, dir, NULL, &oct_ilm_fops);
7160
debugfs_create_file("reset", 0222, dir, NULL, &reset_statistics_ops);
7261
}
7362

‎arch/mips/cavium-octeon/setup.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ void octeon_user_io_init(void)
530530
/* Get the current settings for CP0_CVMMEMCTL_REG */
531531
cvmmemctl.u64 = read_c0_cvmmemctl();
532532
/* R/W If set, marked write-buffer entries time out the same
533-
* as as other entries; if clear, marked write-buffer entries
533+
* as other entries; if clear, marked write-buffer entries
534534
* use the maximum timeout. */
535535
cvmmemctl.s.dismarkwblongto = 1;
536536
/* R/W If set, a merged store does not clear the write-buffer

‎arch/mips/configs/ar7_defconfig‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ CONFIG_IP_ROUTE_MULTIPATH=y
3232
CONFIG_IP_ROUTE_VERBOSE=y
3333
CONFIG_IP_MROUTE=y
3434
CONFIG_SYN_COOKIES=y
35-
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
36-
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
37-
# CONFIG_INET_XFRM_MODE_BEET is not set
3835
# CONFIG_INET_DIAG is not set
3936
CONFIG_TCP_CONG_ADVANCED=y
4037
# CONFIG_TCP_CONG_BIC is not set
@@ -117,7 +114,6 @@ CONFIG_JFFS2_SUMMARY=y
117114
CONFIG_JFFS2_COMPRESSION_OPTIONS=y
118115
CONFIG_SQUASHFS=y
119116
# CONFIG_CRYPTO_HW is not set
120-
# CONFIG_ENABLE_MUST_CHECK is not set
121117
CONFIG_STRIP_ASM_SYMS=y
122118
CONFIG_DEBUG_FS=y
123119
CONFIG_CMDLINE_BOOL=y

‎arch/mips/configs/ath25_defconfig‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ CONFIG_UNIX=y
2929
CONFIG_INET=y
3030
CONFIG_IP_MULTICAST=y
3131
CONFIG_IP_ADVANCED_ROUTER=y
32-
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
33-
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
34-
# CONFIG_INET_XFRM_MODE_BEET is not set
3532
# CONFIG_IPV6 is not set
3633
CONFIG_CFG80211=m
3734
CONFIG_MAC80211=m
@@ -108,7 +105,6 @@ CONFIG_SQUASHFS_XZ=y
108105
# CONFIG_XZ_DEC_ARMTHUMB is not set
109106
# CONFIG_XZ_DEC_SPARC is not set
110107
CONFIG_PRINTK_TIME=y
111-
# CONFIG_ENABLE_MUST_CHECK is not set
112108
CONFIG_STRIP_ASM_SYMS=y
113109
CONFIG_DEBUG_FS=y
114110
# CONFIG_SCHED_DEBUG is not set

‎arch/mips/configs/ath79_defconfig‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@ CONFIG_EMBEDDED=y
1010
# CONFIG_SLUB_DEBUG is not set
1111
# CONFIG_COMPAT_BRK is not set
1212
CONFIG_ATH79=y
13-
CONFIG_ATH79_MACH_AP121=y
14-
CONFIG_ATH79_MACH_AP136=y
15-
CONFIG_ATH79_MACH_AP81=y
16-
CONFIG_ATH79_MACH_DB120=y
17-
CONFIG_ATH79_MACH_PB44=y
18-
CONFIG_ATH79_MACH_UBNT_XM=y
1913
CONFIG_HZ_100=y
2014
# CONFIG_SECCOMP is not set
2115
CONFIG_PCI=y
@@ -29,9 +23,6 @@ CONFIG_UNIX=y
2923
CONFIG_INET=y
3024
CONFIG_IP_MULTICAST=y
3125
CONFIG_IP_ADVANCED_ROUTER=y
32-
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
33-
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
34-
# CONFIG_INET_XFRM_MODE_BEET is not set
3526
# CONFIG_IPV6 is not set
3627
CONFIG_CFG80211=m
3728
CONFIG_MAC80211=m
@@ -92,7 +83,6 @@ CONFIG_LEDS_GPIO=y
9283
# CONFIG_DNOTIFY is not set
9384
# CONFIG_PROC_PAGE_MONITOR is not set
9485
CONFIG_CRC_ITU_T=m
95-
# CONFIG_ENABLE_MUST_CHECK is not set
9686
CONFIG_STRIP_ASM_SYMS=y
9787
CONFIG_DEBUG_FS=y
9888
# CONFIG_SCHED_DEBUG is not set

‎arch/mips/configs/bcm63xx_defconfig‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ CONFIG_PCMCIA_BCM63XX=y
2424
CONFIG_NET=y
2525
CONFIG_UNIX=y
2626
CONFIG_INET=y
27-
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
28-
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
29-
# CONFIG_INET_XFRM_MODE_BEET is not set
3027
# CONFIG_INET_DIAG is not set
3128
# CONFIG_IPV6 is not set
3229
CONFIG_CFG80211=y

0 commit comments

Comments
 (0)