tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'mips_fixes_4.14_2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips

Pull MIPS fixes from James Hogan:
"A final few MIPS fixes for 4.14:

- fix BMIPS NULL pointer dereference (4.7)

- fix AR7 early GPIO init allocation failure (3.19)

- fix dead serial output on certain AR7 platforms (2.6.35)"

* tag 'mips_fixes_4.14_2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips:
MIPS: AR7: Ensure that serial ports are properly set up
MIPS: AR7: Defer registration of GPIO
MIPS: BMIPS: Fix missing cbr address

Linus Torvalds a579e949 085c17ff

+7 -4
+5
arch/mips/ar7/platform.c
··· 575 575 uart_port.type = PORT_AR7; 576 576 uart_port.uartclk = clk_get_rate(bus_clk) / 2; 577 577 uart_port.iotype = UPIO_MEM32; 578 + uart_port.flags = UPF_FIXED_TYPE; 578 579 uart_port.regshift = 2; 579 580 580 581 uart_port.line = 0; ··· 653 652 void __iomem *bootcr; 654 653 u32 val; 655 654 int res; 655 + 656 + res = ar7_gpio_init(); 657 + if (res) 658 + pr_warn("unable to register gpios: %d\n", res); 656 659 657 660 res = ar7_register_uarts(); 658 661 if (res)
-2
arch/mips/ar7/prom.c
··· 246 246 ar7_init_cmdline(fw_arg0, (char **)fw_arg1); 247 247 ar7_init_env((struct env_var *)fw_arg2); 248 248 console_config(); 249 - 250 - ar7_gpio_init(); 251 249 } 252 250 253 251 #define PORT(offset) (KSEG1ADDR(AR7_REGS_UART0 + (offset * 4)))
+2 -2
arch/mips/kernel/smp-bmips.c
··· 591 591 592 592 /* Flush and enable RAC */ 593 593 cfg = __raw_readl(cbr + BMIPS_RAC_CONFIG); 594 - __raw_writel(cfg | 0x100, BMIPS_RAC_CONFIG); 594 + __raw_writel(cfg | 0x100, cbr + BMIPS_RAC_CONFIG); 595 595 __raw_readl(cbr + BMIPS_RAC_CONFIG); 596 596 597 597 cfg = __raw_readl(cbr + BMIPS_RAC_CONFIG); 598 - __raw_writel(cfg | 0xf, BMIPS_RAC_CONFIG); 598 + __raw_writel(cfg | 0xf, cbr + BMIPS_RAC_CONFIG); 599 599 __raw_readl(cbr + BMIPS_RAC_CONFIG); 600 600 601 601 cfg = __raw_readl(cbr + BMIPS_RAC_ADDRESS_RANGE);