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

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
parents 085c17ff b084116f

arch/mips/ar7/platform.c

+5 −0
Original line number Diff line number Diff line
@@ -575,6 +575,7 @@ static int __init ar7_register_uarts(void) 
	uart_port.type		= PORT_AR7;

	uart_port.uartclk	= clk_get_rate(bus_clk) / 2;

	uart_port.iotype	= UPIO_MEM32;

	uart_port.flags		= UPF_FIXED_TYPE;

	uart_port.regshift	= 2;



	uart_port.line		= 0;
@@ -653,6 +654,10 @@ static int __init ar7_register_devices(void) 
	u32 val;

	int res;



	res = ar7_gpio_init();

	if (res)

		pr_warn("unable to register gpios: %d\n", res);



	res = ar7_register_uarts();

	if (res)

		pr_err("unable to setup uart(s): %d\n", res);

arch/mips/ar7/prom.c

+0 −2
Original line number Diff line number Diff line
@@ -246,8 +246,6 @@ void __init prom_init(void) 
	ar7_init_cmdline(fw_arg0, (char **)fw_arg1);

	ar7_init_env((struct env_var *)fw_arg2);

	console_config();



	ar7_gpio_init();

}



#define PORT(offset) (KSEG1ADDR(AR7_REGS_UART0 + (offset * 4)))

arch/mips/kernel/smp-bmips.c

+2 −2
Original line number Diff line number Diff line
@@ -591,11 +591,11 @@ void __init bmips_cpu_setup(void) 


		/* Flush and enable RAC */

		cfg = __raw_readl(cbr + BMIPS_RAC_CONFIG);

		__raw_writel(cfg | 0x100, BMIPS_RAC_CONFIG);

		__raw_writel(cfg | 0x100, cbr + BMIPS_RAC_CONFIG);

		__raw_readl(cbr + BMIPS_RAC_CONFIG);



		cfg = __raw_readl(cbr + BMIPS_RAC_CONFIG);

		__raw_writel(cfg | 0xf, BMIPS_RAC_CONFIG);

		__raw_writel(cfg | 0xf, cbr + BMIPS_RAC_CONFIG);

		__raw_readl(cbr + BMIPS_RAC_CONFIG);



		cfg = __raw_readl(cbr + BMIPS_RAC_ADDRESS_RANGE);

CRA Git | Maintained and supported by SUSTech CRA and CCSE