Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1690a7f9 authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by Ralf Baechle
Browse files

MIPS: BCM47xx: Swap serial console if ttyS1 was specified. 



Some devices like the Netgear WGT634U are using ttyS1 for default console
output. We should switch to that console if it was given in the kernel_args
parameters.

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
To: linux-mips@linux-mips.org
Cc: Hauke Mehrtens <hauke@hauke-m.de>
Patchwork: https://patchwork.linux-mips.org/patch/1848/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 59833fcf

arch/mips/bcm47xx/setup.c

+16 −0
Original line number Diff line number Diff line
@@ -169,12 +169,28 @@ static int bcm47xx_get_invariants(struct ssb_bus *bus, 
void __init plat_mem_setup(void)

{

	int err;

	char buf[100];

	struct ssb_mipscore *mcore;



	err = ssb_bus_ssbbus_register(&ssb_bcm47xx, SSB_ENUM_BASE,

				      bcm47xx_get_invariants);

	if (err)

		panic("Failed to initialize SSB bus (err %d)\n", err);



	mcore = &ssb_bcm47xx.mipscore;

	if (nvram_getenv("kernel_args", buf, sizeof(buf)) >= 0) {

		if (strstr(buf, "console=ttyS1")) {

			struct ssb_serial_port port;



			printk(KERN_DEBUG "Swapping serial ports!\n");

			/* swap serial ports */

			memcpy(&port, &mcore->serial_ports[0], sizeof(port));

			memcpy(&mcore->serial_ports[0], &mcore->serial_ports[1],

			       sizeof(port));

			memcpy(&mcore->serial_ports[1], &port, sizeof(port));

		}

	}



	_machine_restart = bcm47xx_machine_restart;

	_machine_halt = bcm47xx_machine_halt;

	pm_power_off = bcm47xx_machine_halt;