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

Unverified Commit 5c93316c authored by Alexander Sverdlin's avatar Alexander Sverdlin Committed by Paul Burton
Browse files

mips: unify prom_putchar() declarations 



prom_putchar() is used centrally in early printk infrastructure therefore
at least MIPS should agree on the function return type.

[paul.burton@mips.com:
  - Include linux/types.h in asm/setup.h to gain the bool typedef before
    we start include asm/setup.h elsewhere.
  - Include asm/setup.h in all files that use or define prom_putchar().
  - Also standardise on signed rather than unsigned char argument.]

Signed-off-by: default avatarAlexander Sverdlin <alexander.sverdlin@nokia.com>
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Patchwork: https://patchwork.linux-mips.org/patch/19842/
Cc: linux-mips@linux-mips.org
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: Jonas Gorski <jonas.gorski@gmail.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Kate Stewart <kstewart@linuxfoundation.org>
Cc: Philippe Ombredanne <pombredanne@nexb.com>
parent 4936084c

arch/mips/alchemy/board-gpr.c

+2 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <asm/bootinfo.h>

#include <asm/idle.h>

#include <asm/reboot.h>

#include <asm/setup.h>

#include <asm/mach-au1x00/au1000.h>

#include <asm/mach-au1x00/gpio-au1000.h>

#include <prom.h>
@@ -60,7 +61,7 @@ void __init prom_init(void) 
	add_memory_region(0, memsize, BOOT_MEM_RAM);

}



void prom_putchar(unsigned char c)

void prom_putchar(char c)

{

	alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);

}

arch/mips/alchemy/board-mtx1.c

+2 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <mtd/mtd-abi.h>

#include <asm/bootinfo.h>

#include <asm/reboot.h>

#include <asm/setup.h>

#include <asm/mach-au1x00/au1000.h>

#include <asm/mach-au1x00/gpio-au1000.h>

#include <asm/mach-au1x00/au1xxx_eth.h>
@@ -58,7 +59,7 @@ void __init prom_init(void) 
	add_memory_region(0, memsize, BOOT_MEM_RAM);

}



void prom_putchar(unsigned char c)

void prom_putchar(char c)

{

	alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);

}

arch/mips/alchemy/board-xxs1500.c

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/pm.h>

#include <asm/bootinfo.h>

#include <asm/reboot.h>

#include <asm/setup.h>

#include <asm/mach-au1x00/au1000.h>

#include <prom.h>
@@ -55,7 +56,7 @@ void __init prom_init(void) 
	add_memory_region(0, memsize, BOOT_MEM_RAM);

}



void prom_putchar(unsigned char c)

void prom_putchar(char c)

{

	alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);

}

arch/mips/alchemy/devboards/platform.c

+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <asm/bootinfo.h>

#include <asm/idle.h>

#include <asm/reboot.h>

#include <asm/setup.h>

#include <asm/mach-au1x00/au1000.h>

#include <asm/mach-db1x00/bcsr.h>
@@ -36,7 +37,7 @@ void __init prom_init(void) 
	add_memory_region(0, memsize, BOOT_MEM_RAM);

}



void prom_putchar(unsigned char c)

void prom_putchar(char c)

{

	if (alchemy_get_cputype() == ALCHEMY_CPU_AU1300)

		alchemy_uart_putchar(AU1300_UART2_PHYS_ADDR, c);

arch/mips/ar7/prom.c

+2 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/string.h>

#include <linux/io.h>

#include <asm/bootinfo.h>

#include <asm/setup.h>



#include <asm/mach-ar7/ar7.h>

#include <asm/mach-ar7/prom.h>
@@ -259,10 +260,9 @@ static inline void serial_out(int offset, int value) 
	writel(value, (void *)PORT(offset));

}



int prom_putchar(char c)

void prom_putchar(char c)

{

	while ((serial_in(UART_LSR) & UART_LSR_TEMT) == 0)

		;

	serial_out(UART_TX, c);

	return 1;

}