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

Commit a27fa581 authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD Committed by Nicolas Ferre
Browse files

ARM: at91: drop at91_set_serial_console 



at91_set_serial_console is used to define the default console of linux.
This is already manage by the cmdline. And if the boot loader can not be
modified you can still set it by enabling the CONFIG_CMDLINE_EXTEND option.
And then the command-line arguments provided by the boot loader will be
appended to the default kernel command string.

Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 5f29d0a0

arch/arm/mach-at91/at91rm9200.c

+0 −12
Original line number Diff line number Diff line
@@ -258,18 +258,6 @@ static void __init at91rm9200_register_clocks(void) 
	clk_register(&pck3);

}



static struct clk_lookup console_clock_lookup;



void __init at91rm9200_set_console_clock(int id)

{

	if (id >= ARRAY_SIZE(usart_clocks_lookups))

		return;



	console_clock_lookup.con_id = "usart";

	console_clock_lookup.clk = usart_clocks_lookups[id].clk;

	clkdev_add(&console_clock_lookup);

}



/* --------------------------------------------------------------------

 *  GPIO

 * -------------------------------------------------------------------- */

arch/arm/mach-at91/at91rm9200_devices.c

+0 −12
Original line number Diff line number Diff line
@@ -1152,14 +1152,6 @@ void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) 
		at91_uarts[portnr] = pdev;

}



void __init at91_set_serial_console(unsigned portnr)

{

	if (portnr < ATMEL_MAX_UART) {

		atmel_default_console_device = at91_uarts[portnr];

		at91rm9200_set_console_clock(at91_uarts[portnr]->id);

	}

}



void __init at91_add_device_serial(void)

{

	int i;
@@ -1168,14 +1160,10 @@ void __init at91_add_device_serial(void) 
		if (at91_uarts[i])

			platform_device_register(at91_uarts[i]);

	}



	if (!atmel_default_console_device)

		printk(KERN_INFO "AT91: No default serial console defined.\n");

}

#else

void __init __deprecated at91_init_serial(struct at91_uart_config *config) {}

void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) {}

void __init at91_set_serial_console(unsigned portnr) {}

void __init at91_add_device_serial(void) {}

#endif

arch/arm/mach-at91/at91sam9260.c

+0 −12
Original line number Diff line number Diff line
@@ -268,18 +268,6 @@ static void __init at91sam9260_register_clocks(void) 
	clk_register(&pck1);

}



static struct clk_lookup console_clock_lookup;



void __init at91sam9260_set_console_clock(int id)

{

	if (id >= ARRAY_SIZE(usart_clocks_lookups))

		return;



	console_clock_lookup.con_id = "usart";

	console_clock_lookup.clk = usart_clocks_lookups[id].clk;

	clkdev_add(&console_clock_lookup);

}



/* --------------------------------------------------------------------

 *  GPIO

 * -------------------------------------------------------------------- */

arch/arm/mach-at91/at91sam9260_devices.c

+0 −12
Original line number Diff line number Diff line
@@ -1229,14 +1229,6 @@ void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) 
		at91_uarts[portnr] = pdev;

}



void __init at91_set_serial_console(unsigned portnr)

{

	if (portnr < ATMEL_MAX_UART) {

		atmel_default_console_device = at91_uarts[portnr];

		at91sam9260_set_console_clock(at91_uarts[portnr]->id);

	}

}



void __init at91_add_device_serial(void)

{

	int i;
@@ -1245,13 +1237,9 @@ void __init at91_add_device_serial(void) 
		if (at91_uarts[i])

			platform_device_register(at91_uarts[i]);

	}



	if (!atmel_default_console_device)

		printk(KERN_INFO "AT91: No default serial console defined.\n");

}

#else

void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pins) {}

void __init at91_set_serial_console(unsigned portnr) {}

void __init at91_add_device_serial(void) {}

#endif

arch/arm/mach-at91/at91sam9261.c

+0 −12
Original line number Diff line number Diff line
@@ -239,18 +239,6 @@ static void __init at91sam9261_register_clocks(void) 
	clk_register(&hck1);

}



static struct clk_lookup console_clock_lookup;



void __init at91sam9261_set_console_clock(int id)

{

	if (id >= ARRAY_SIZE(usart_clocks_lookups))

		return;



	console_clock_lookup.con_id = "usart";

	console_clock_lookup.clk = usart_clocks_lookups[id].clk;

	clkdev_add(&console_clock_lookup);

}



/* --------------------------------------------------------------------

 *  GPIO

 * -------------------------------------------------------------------- */