mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: use the new byteorder headers fbcon: Protect free_irq() by MACH_IS_ATARI check fbcon: remove broken mac vbl handler m68k: fix trigraph ignored warning in setox.S macfb annotations and compiler warning fix m68k: mac baboon interrupt enable/disable m68k: machw.h cleanup m68k: Mac via cleanup and commentry m68k: Reinstate mac rtc
This commit is contained in:
Linus Torvalds
commit
541ef5cbb8
18 changed files with 105 additions and 206 deletions
|
|
@ -81,9 +81,6 @@
|
|||
#ifdef CONFIG_ATARI
|
||||
#include <asm/atariints.h>
|
||||
#endif
|
||||
#ifdef CONFIG_MAC
|
||||
#include <asm/macints.h>
|
||||
#endif
|
||||
#if defined(__mc68000__)
|
||||
#include <asm/machdep.h>
|
||||
#include <asm/setup.h>
|
||||
|
|
@ -160,8 +157,6 @@ static int fbcon_set_origin(struct vc_data *);
|
|||
|
||||
/* # VBL ints between cursor state changes */
|
||||
#define ATARI_CURSOR_BLINK_RATE (42)
|
||||
#define MAC_CURSOR_BLINK_RATE (32)
|
||||
#define DEFAULT_CURSOR_BLINK_RATE (20)
|
||||
|
||||
static int vbl_cursor_cnt;
|
||||
static int fbcon_cursor_noblink;
|
||||
|
|
@ -210,19 +205,6 @@ static void fbcon_start(void);
|
|||
static void fbcon_exit(void);
|
||||
static struct device *fbcon_device;
|
||||
|
||||
#ifdef CONFIG_MAC
|
||||
/*
|
||||
* On the Macintoy, there may or may not be a working VBL int. We need to probe
|
||||
*/
|
||||
static int vbl_detected;
|
||||
|
||||
static irqreturn_t fb_vbl_detect(int irq, void *dummy)
|
||||
{
|
||||
vbl_detected++;
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_FRAMEBUFFER_CONSOLE_ROTATION
|
||||
static inline void fbcon_set_rotation(struct fb_info *info)
|
||||
{
|
||||
|
|
@ -421,7 +403,7 @@ static void fb_flashcursor(struct work_struct *work)
|
|||
release_console_sem();
|
||||
}
|
||||
|
||||
#if defined(CONFIG_ATARI) || defined(CONFIG_MAC)
|
||||
#ifdef CONFIG_ATARI
|
||||
static int cursor_blink_rate;
|
||||
static irqreturn_t fb_vbl_handler(int irq, void *dev_id)
|
||||
{
|
||||
|
|
@ -949,9 +931,7 @@ static const char *fbcon_startup(void)
|
|||
struct fb_info *info = NULL;
|
||||
struct fbcon_ops *ops;
|
||||
int rows, cols;
|
||||
int irqres;
|
||||
|
||||
irqres = 1;
|
||||
/*
|
||||
* If num_registered_fb is zero, this is a call for the dummy part.
|
||||
* The frame buffer devices weren't initialized yet.
|
||||
|
|
@ -1040,56 +1020,11 @@ static const char *fbcon_startup(void)
|
|||
#ifdef CONFIG_ATARI
|
||||
if (MACH_IS_ATARI) {
|
||||
cursor_blink_rate = ATARI_CURSOR_BLINK_RATE;
|
||||
irqres =
|
||||
request_irq(IRQ_AUTO_4, fb_vbl_handler,
|
||||
(void)request_irq(IRQ_AUTO_4, fb_vbl_handler,
|
||||
IRQ_TYPE_PRIO, "framebuffer vbl",
|
||||
info);
|
||||
}
|
||||
#endif /* CONFIG_ATARI */
|
||||
|
||||
#ifdef CONFIG_MAC
|
||||
/*
|
||||
* On a Macintoy, the VBL interrupt may or may not be active.
|
||||
* As interrupt based cursor is more reliable and race free, we
|
||||
* probe for VBL interrupts.
|
||||
*/
|
||||
if (MACH_IS_MAC) {
|
||||
int ct = 0;
|
||||
/*
|
||||
* Probe for VBL: set temp. handler ...
|
||||
*/
|
||||
irqres = request_irq(IRQ_MAC_VBL, fb_vbl_detect, 0,
|
||||
"framebuffer vbl", info);
|
||||
vbl_detected = 0;
|
||||
|
||||
/*
|
||||
* ... and spin for 20 ms ...
|
||||
*/
|
||||
while (!vbl_detected && ++ct < 1000)
|
||||
udelay(20);
|
||||
|
||||
if (ct == 1000)
|
||||
printk
|
||||
("fbcon_startup: No VBL detected, using timer based cursor.\n");
|
||||
|
||||
free_irq(IRQ_MAC_VBL, fb_vbl_detect);
|
||||
|
||||
if (vbl_detected) {
|
||||
/*
|
||||
* interrupt based cursor ok
|
||||
*/
|
||||
cursor_blink_rate = MAC_CURSOR_BLINK_RATE;
|
||||
irqres =
|
||||
request_irq(IRQ_MAC_VBL, fb_vbl_handler, 0,
|
||||
"framebuffer vbl", info);
|
||||
} else {
|
||||
/*
|
||||
* VBL not detected: fall through, use timer based cursor
|
||||
*/
|
||||
irqres = 1;
|
||||
}
|
||||
}
|
||||
#endif /* CONFIG_MAC */
|
||||
#endif /* CONFIG_ATARI */
|
||||
|
||||
fbcon_add_cursor_timer(info);
|
||||
fbcon_has_exited = 0;
|
||||
|
|
@ -3520,11 +3455,8 @@ static void fbcon_exit(void)
|
|||
return;
|
||||
|
||||
#ifdef CONFIG_ATARI
|
||||
free_irq(IRQ_AUTO_4, fb_vbl_handler);
|
||||
#endif
|
||||
#ifdef CONFIG_MAC
|
||||
if (MACH_IS_MAC && vbl_detected)
|
||||
free_irq(IRQ_MAC_VBL, fb_vbl_handler);
|
||||
if (MACH_IS_ATARI)
|
||||
free_irq(IRQ_AUTO_4, fb_vbl_handler);
|
||||
#endif
|
||||
|
||||
kfree((void *)softback_buf);
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@
|
|||
#include <asm/irq.h>
|
||||
#include <asm/macintosh.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/machw.h>
|
||||
|
||||
/* Common DAC base address for the LC, RBV, Valkyrie, and IIvx */
|
||||
#define DAC_BASE 0x50f24000
|
||||
|
|
@ -78,34 +77,34 @@ static int csc_setpalette (unsigned int regno, unsigned int red,
|
|||
unsigned int green, unsigned int blue,
|
||||
struct fb_info *fb_info);
|
||||
|
||||
static volatile struct {
|
||||
static struct {
|
||||
unsigned char addr;
|
||||
/* Note: word-aligned */
|
||||
char pad[3];
|
||||
unsigned char lut;
|
||||
} *valkyrie_cmap_regs;
|
||||
} __iomem *valkyrie_cmap_regs;
|
||||
|
||||
static volatile struct {
|
||||
static struct {
|
||||
unsigned char addr;
|
||||
unsigned char lut;
|
||||
} *v8_brazil_cmap_regs;
|
||||
} __iomem *v8_brazil_cmap_regs;
|
||||
|
||||
static volatile struct {
|
||||
static struct {
|
||||
unsigned char addr;
|
||||
char pad1[3]; /* word aligned */
|
||||
unsigned char lut;
|
||||
char pad2[3]; /* word aligned */
|
||||
unsigned char cntl; /* a guess as to purpose */
|
||||
} *rbv_cmap_regs;
|
||||
} __iomem *rbv_cmap_regs;
|
||||
|
||||
static volatile struct {
|
||||
static struct {
|
||||
unsigned long reset;
|
||||
unsigned long pad1[3];
|
||||
unsigned char pad2[3];
|
||||
unsigned char lut;
|
||||
} *dafb_cmap_regs;
|
||||
} __iomem *dafb_cmap_regs;
|
||||
|
||||
static volatile struct {
|
||||
static struct {
|
||||
unsigned char addr; /* OFFSET: 0x00 */
|
||||
unsigned char pad1[15];
|
||||
unsigned char lut; /* OFFSET: 0x10 */
|
||||
|
|
@ -114,16 +113,16 @@ static volatile struct {
|
|||
unsigned char pad3[7];
|
||||
unsigned long vbl_addr; /* OFFSET: 0x28 */
|
||||
unsigned int status2; /* OFFSET: 0x2C */
|
||||
} *civic_cmap_regs;
|
||||
} __iomem *civic_cmap_regs;
|
||||
|
||||
static volatile struct {
|
||||
static struct {
|
||||
char pad1[0x40];
|
||||
unsigned char clut_waddr; /* 0x40 */
|
||||
char pad2;
|
||||
unsigned char clut_data; /* 0x42 */
|
||||
char pad3[0x3];
|
||||
unsigned char clut_raddr; /* 0x46 */
|
||||
} *csc_cmap_regs;
|
||||
} __iomem *csc_cmap_regs;
|
||||
|
||||
/* We will leave these the way they are for the time being */
|
||||
struct mdc_cmap_regs {
|
||||
|
|
@ -507,10 +506,10 @@ static int csc_setpalette (unsigned int regno, unsigned int red,
|
|||
struct fb_info *info)
|
||||
{
|
||||
mdelay(1);
|
||||
csc_cmap_regs->clut_waddr = regno;
|
||||
csc_cmap_regs->clut_data = red;
|
||||
csc_cmap_regs->clut_data = green;
|
||||
csc_cmap_regs->clut_data = blue;
|
||||
nubus_writeb(regno, &csc_cmap_regs->clut_waddr);
|
||||
nubus_writeb(red, &csc_cmap_regs->clut_data);
|
||||
nubus_writeb(green, &csc_cmap_regs->clut_data);
|
||||
nubus_writeb(blue, &csc_cmap_regs->clut_data);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue