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

Commit 5e189564 authored by Paul Burton's avatar Paul Burton Committed by Ralf Baechle
Browse files

MIPS: SEAD3: Use img-ascii-lcd driver 



Probe the img-ascii-lcd driver using device tree in order to display a
message on the SEAD3 board's LCD display, and remove the platform code
that was formerly performing this function. This removes more platform
code and moves SEAD3 further towards being entirely DT-based.

Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
Cc: Jacek Anaszewski <j.anaszewski@samsung.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: linux-mips@linux-mips.org
Cc: devicetree@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/14063/


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

arch/mips/boot/dts/mti/sead3.dts

+5 −0
Original line number Diff line number Diff line
@@ -210,6 +210,11 @@ 
			mask = <0x80>;

			label = "fled7";

		};



		lcd@200 {

			compatible = "mti,sead3-lcd";

			offset = <0x200>;

		};

	};



	/* UART connected to FTDI & miniUSB socket */

arch/mips/mti-sead3/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -8,8 +8,7 @@ 
# Copyright (C) 2012 MIPS Technoligies, Inc.  All rights reserved.

# Steven J. Hill <sjhill@mips.com>

#

obj-y := sead3-display.o

obj-y += sead3-dtshim.o

obj-y := sead3-dtshim.o

obj-y += sead3-init.o

obj-y += sead3-int.o

obj-y += sead3-setup.o

arch/mips/mti-sead3/sead3-display.c

deleted100644 → 0
+0 −77
Original line number Diff line number Diff line 
/*

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 * Copyright (C) 2012 MIPS Technologies, Inc.  All rights reserved.

 */

#include <linux/timer.h>

#include <linux/io.h>

#include <asm/mips-boards/generic.h>



static unsigned int display_count;

static unsigned int max_display_count;



#define LCD_DISPLAY_POS_BASE		0x1f000400

#define DISPLAY_LCDINSTRUCTION		(0*2)

#define DISPLAY_LCDDATA			(1*2)

#define DISPLAY_CPLDSTATUS		(2*2)

#define DISPLAY_CPLDDATA		(3*2)

#define LCD_SETDDRAM			0x80

#define LCD_IR_BF			0x80



const char display_string[] = "		      LINUX ON SEAD3		   ";



static void scroll_display_message(unsigned long data);

static DEFINE_TIMER(mips_scroll_timer, scroll_display_message, HZ, 0);



static void lcd_wait(unsigned int __iomem *display)

{

	/* Wait for CPLD state machine to become idle. */

	do { } while (__raw_readl(display + DISPLAY_CPLDSTATUS) & 1);



	do {

		__raw_readl(display + DISPLAY_LCDINSTRUCTION);



		/* Wait for CPLD state machine to become idle. */

		do { } while (__raw_readl(display + DISPLAY_CPLDSTATUS) & 1);

	} while (__raw_readl(display + DISPLAY_CPLDDATA) & LCD_IR_BF);

}



void mips_display_message(const char *str)

{

	static unsigned int __iomem *display;

	char ch;

	int i;



	if (unlikely(display == NULL))

		display = ioremap_nocache(LCD_DISPLAY_POS_BASE,

			(8 * sizeof(int)));



	for (i = 0; i < 16; i++) {

		if (*str)

			ch = *str++;

		else

			ch = ' ';

		lcd_wait(display);

		__raw_writel((LCD_SETDDRAM | i),

			(display + DISPLAY_LCDINSTRUCTION));

		lcd_wait(display);

		__raw_writel(ch, display + DISPLAY_LCDDATA);

	}

}



static void scroll_display_message(unsigned long data)

{

	mips_display_message(&display_string[display_count++]);

	if (display_count == max_display_count)

		display_count = 0;

	mod_timer(&mips_scroll_timer, jiffies + HZ);

}



void mips_scroll_message(void)

{

	del_timer_sync(&mips_scroll_timer);

	max_display_count = strlen(display_string) + 1 - 16;

	mod_timer(&mips_scroll_timer, jiffies + 1);

}

arch/mips/mti-sead3/sead3-time.c

+0 −2
Original line number Diff line number Diff line
@@ -94,6 +94,4 @@ void __init plat_time_init(void) 


	pr_debug("CPU frequency %d.%02d MHz\n", (est_freq / 1000000),

		(est_freq % 1000000) * 100 / 1000000);



	mips_scroll_message();

}