Skip to content

Commit 096f286

Browse files
committed
Merge tag 'mips_6.8' 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.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: MIPS: Alchemy: Fix an out-of-bound access in db1550_dev_setup() MIPS: Alchemy: Fix an out-of-bound access in db1200_dev_setup() MIPS: Fix typos MIPS: Remove unused shadow GPR support from vector irq setup MIPS: Allow vectored interrupt handler to reside everywhere for 64bit mips: Set dump-stack arch description mips: mm: add slab availability checking in ioremap_prot mips: Optimize max_mapnr init procedure mips: Fix max_mapnr being uninitialized on early stages mips: Fix incorrect max_low_pfn adjustment mips: dmi: Fix early remap on MIPS32 MIPS: compressed: Use correct instruction for 64 bit code MIPS: SGI-IP27: hubio: fix nasid kernel-doc warning MAINTAINERS: Add myself as maintainer of the Ralink architecture
2 parents 4331f07 + 3c1e5ab commit 096f286

Some content is hidden

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

75 files changed

+135
-163
lines changed

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18196,6 +18196,7 @@ F: drivers/media/cec/usb/rainshadow/
1819618196

1819718197
RALINK MIPS ARCHITECTURE
1819818198
M: John Crispin <john@phrozen.org>
18199+
M: Sergio Paracuellos <sergio.paracuellos@gmail.com>
1819918200
L: linux-mips@vger.kernel.org
1820018201
S: Maintained
1820118202
F: arch/mips/ralink

arch/mips/alchemy/devboards/db1200.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,7 @@ int __init db1200_dev_setup(void)
847847
i2c_register_board_info(0, db1200_i2c_devs,
848848
ARRAY_SIZE(db1200_i2c_devs));
849849
spi_register_board_info(db1200_spi_devs,
850-
ARRAY_SIZE(db1200_i2c_devs));
850+
ARRAY_SIZE(db1200_spi_devs));
851851

852852
/* SWITCHES: S6.8 I2C/SPI selector (OFF=I2C ON=SPI)
853853
* S6.7 AC97/I2S selector (OFF=AC97 ON=I2S)

arch/mips/alchemy/devboards/db1550.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ int __init db1550_dev_setup(void)
589589
i2c_register_board_info(0, db1550_i2c_devs,
590590
ARRAY_SIZE(db1550_i2c_devs));
591591
spi_register_board_info(db1550_spi_devs,
592-
ARRAY_SIZE(db1550_i2c_devs));
592+
ARRAY_SIZE(db1550_spi_devs));
593593

594594
c = clk_get(NULL, "psc0_intclk");
595595
if (!IS_ERR(c)) {

arch/mips/bcm47xx/buttons.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,21 +147,21 @@ static const struct gpio_keys_button
147147
bcm47xx_buttons_buffalo_whr_g125[] __initconst = {
148148
BCM47XX_GPIO_KEY(0, KEY_WPS_BUTTON),
149149
BCM47XX_GPIO_KEY(4, KEY_RESTART),
150-
BCM47XX_GPIO_KEY(5, BTN_0), /* Router / AP mode swtich */
150+
BCM47XX_GPIO_KEY(5, BTN_0), /* Router / AP mode switch */
151151
};
152152

153153
static const struct gpio_keys_button
154154
bcm47xx_buttons_buffalo_whr_g54s[] __initconst = {
155155
BCM47XX_GPIO_KEY(0, KEY_WPS_BUTTON),
156156
BCM47XX_GPIO_KEY_H(4, KEY_RESTART),
157-
BCM47XX_GPIO_KEY(5, BTN_0), /* Router / AP mode swtich */
157+
BCM47XX_GPIO_KEY(5, BTN_0), /* Router / AP mode switch */
158158
};
159159

160160
static const struct gpio_keys_button
161161
bcm47xx_buttons_buffalo_whr_hp_g54[] __initconst = {
162162
BCM47XX_GPIO_KEY(0, KEY_WPS_BUTTON),
163163
BCM47XX_GPIO_KEY(4, KEY_RESTART),
164-
BCM47XX_GPIO_KEY(5, BTN_0), /* Router / AP mode swtich */
164+
BCM47XX_GPIO_KEY(5, BTN_0), /* Router / AP mode switch */
165165
};
166166

167167
static const struct gpio_keys_button

arch/mips/bcm63xx/clk.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ static void enetsw_set(struct clk *clk, int enable)
174174
}
175175

176176
if (enable) {
177-
/* reset switch core afer clock change */
177+
/* reset switch core after clock change */
178178
bcm63xx_core_set_reset(BCM63XX_RESET_ENETSW, 1);
179179
msleep(10);
180180
bcm63xx_core_set_reset(BCM63XX_RESET_ENETSW, 0);
@@ -304,7 +304,7 @@ static void xtm_set(struct clk *clk, int enable)
304304
bcm_hwclock_set(CKCTL_6368_SAR_EN, enable);
305305

306306
if (enable) {
307-
/* reset sar core afer clock change */
307+
/* reset sar core after clock change */
308308
bcm63xx_core_set_reset(BCM63XX_RESET_SAR, 1);
309309
mdelay(1);
310310
bcm63xx_core_set_reset(BCM63XX_RESET_SAR, 0);

arch/mips/boot/compressed/dbg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* MIPS-specific debug support for pre-boot environment
44
*
55
* NOTE: putc() is board specific, if your board have a 16550 compatible uart,
6-
* please select SYS_SUPPORTS_ZBOOT_UART16550 for your machine. othewise, you
6+
* please select SYS_SUPPORTS_ZBOOT_UART16550 for your machine. otherwise, you
77
* need to implement your own putc().
88
*/
99
#include <linux/compiler.h>

arch/mips/boot/compressed/head.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
/* Clear BSS */
2626
PTR_LA a0, _edata
2727
PTR_LA a2, _end
28-
1: sw zero, 0(a0)
29-
addiu a0, a0, 4
28+
1: PTR_S zero, 0(a0)
29+
PTR_ADDIU a0, a0, PTRSIZE
3030
bne a2, a0, 1b
3131

3232
PTR_LA a0, (.heap) /* heap address */

arch/mips/boot/elf2ecoff.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ int main(int argc, char *argv[])
443443
efh.f_symptr = 0;
444444
efh.f_nsyms = 0;
445445
efh.f_opthdr = sizeof eah;
446-
efh.f_flags = 0x100f; /* Stripped, not sharable. */
446+
efh.f_flags = 0x100f; /* Stripped, not shareable. */
447447

448448
memset(esecs, 0, sizeof esecs);
449449
strcpy(esecs[0].s_name, ".text");

arch/mips/cavium-octeon/csrc-octeon.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ static struct clocksource clocksource_mips = {
113113

114114
unsigned long long notrace sched_clock(void)
115115
{
116-
/* 64-bit arithmatic can overflow, so use 128-bit. */
116+
/* 64-bit arithmetic can overflow, so use 128-bit. */
117117
u64 t1, t2, t3;
118118
unsigned long long rv;
119119
u64 mult = clocksource_mips.mult;

arch/mips/cavium-octeon/executive/cvmx-boot-vector.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ static void cvmx_boot_vector_init(void *mem)
143143
uint64_t v = _cvmx_bootvector_data[i];
144144

145145
if (OCTEON_IS_OCTEON1PLUS() && (i == 0 || i == 7))
146-
v &= 0xffffffff00000000ull; /* KScratch not availble. */
146+
v &= 0xffffffff00000000ull; /* KScratch not available */
147147
cvmx_write_csr(CVMX_MIO_BOOT_LOC_ADR, i * 8);
148148
cvmx_write_csr(CVMX_MIO_BOOT_LOC_DAT, v);
149149
}

0 commit comments

Comments
 (0)