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

Commit 44607645 authored by Kelvin Cheung's avatar Kelvin Cheung Committed by John Crispin
Browse files

MIPS: Loongson1B: improve ls1x_serial_setup() 



Improve ls1x_serial_setup().

Signed-off-by: default avatarKelvin Cheung <keguang.zhang@gmail.com>
Patchwork: http://patchwork.linux-mips.org/patch/4432


Signed-off-by: default avatarJohn Crispin <blogic@openwrt.org>
parent 17ded0a8

arch/mips/include/asm/mach-loongson1/platform.h

+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,6 @@ extern struct platform_device ls1x_ehci_device; 
extern struct platform_device ls1x_rtc_device;



extern void __init ls1x_clk_init(void);

void ls1x_serial_setup(void);

extern void __init ls1x_serial_setup(struct platform_device *pdev);



#endif /* __ASM_MACH_LOONGSON1_PLATFORM_H */

arch/mips/loongson1/common/platform.c

+5 −4
Original line number Diff line number Diff line
@@ -42,16 +42,17 @@ struct platform_device ls1x_uart_device = { 
	},

};



void __init ls1x_serial_setup(void)

void __init ls1x_serial_setup(struct platform_device *pdev)

{

	struct clk *clk;

	struct plat_serial8250_port *p;



	clk = clk_get(NULL, "dc");

	clk = clk_get(NULL, pdev->name);

	if (IS_ERR(clk))

		panic("unable to get dc clock, err=%ld", PTR_ERR(clk));

		panic("unable to get %s clock, err=%ld",

			pdev->name, PTR_ERR(clk));



	for (p = ls1x_serial8250_port; p->flags != 0; ++p)

	for (p = pdev->dev.platform_data; p->flags != 0; ++p)

		p->uartclk = clk_get_rate(clk);

}

arch/mips/loongson1/ls1b/board.c

+1 −4
Original line number Diff line number Diff line
@@ -9,9 +9,6 @@ 


#include <platform.h>



#include <linux/serial_8250.h>

#include <loongson1.h>



static struct platform_device *ls1b_platform_devices[] __initdata = {

	&ls1x_uart_device,

	&ls1x_eth0_device,
@@ -23,7 +20,7 @@ static int __init ls1b_platform_init(void) 
{

	int err;



	ls1x_serial_setup();

	ls1x_serial_setup(&ls1x_uart_device);



	err = platform_add_devices(ls1b_platform_devices,

				   ARRAY_SIZE(ls1b_platform_devices));