the different putc variants used an initialized local static variable
which is broken since
5de813b (ARM: Eliminate decompressor -Dstatic= PIC hack)
This needs to be initialized at runtime and so needs to be global.
While at it give it a better name.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
static void putc_ns9360(char c, void __iomem *base)
{
static void putc_ns9360(char c, void __iomem *base)
{
- static int t = 0x10000;
+ if (timeout)
+ --timeout;
if (__raw_readl(base + 8) & (1 << 3)) {
__raw_writeb(c, base + 16);
if (__raw_readl(base + 8) & (1 << 3)) {
__raw_writeb(c, base + 16);
}
static void putc_a9m9750dev(char c, void __iomem *base)
{
}
static void putc_a9m9750dev(char c, void __iomem *base)
{
- static int t = 0x10000;
+ if (timeout)
+ --timeout;
if (__raw_readb(base + 5) & (1 << 5)) {
__raw_writeb(c, base);
if (__raw_readb(base + 5) & (1 << 5)) {
__raw_writeb(c, base);
}
static void putc_ns921x(char c, void __iomem *base)
{
}
static void putc_ns921x(char c, void __iomem *base)
{
- static int t = 0x10000;
+ if (timeout)
+ --timeout;
if (!(__raw_readl(base) & (1 << 11))) {
__raw_writeb(c, base + 0x0028);
if (!(__raw_readl(base) & (1 << 11))) {
__raw_writeb(c, base + 0x0028);
}
#define MSCS __REG(0xA0900184)
}
#define MSCS __REG(0xA0900184)
static void autodetect(void (**putc)(char, void __iomem *), void __iomem **base)
{
static void autodetect(void (**putc)(char, void __iomem *), void __iomem **base)
{
if (((__raw_readl(MSCS) >> 16) & 0xfe) == 0x00) {
/* ns9360 or ns9750 */
if (NS9360_UART_ENABLED(NS9360_UARTA)) {
if (((__raw_readl(MSCS) >> 16) & 0xfe) == 0x00) {
/* ns9360 or ns9750 */
if (NS9360_UART_ENABLED(NS9360_UARTA)) {