Merge master.kernel.org:/home/rmk/linux-2.6-arm
This commit is contained in:
Linus Torvalds
commit
1dd465cac8
39 changed files with 82 additions and 113 deletions
|
|
@ -68,6 +68,7 @@ static void gic_unmask_irq(unsigned int irq)
|
|||
writel(mask, gic_dist_base + GIC_DIST_ENABLE_SET + (irq / 32) * 4);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SMP
|
||||
static void gic_set_cpu(struct irqdesc *desc, unsigned int irq, unsigned int cpu)
|
||||
{
|
||||
void __iomem *reg = gic_dist_base + GIC_DIST_TARGET + (irq & ~3);
|
||||
|
|
@ -78,6 +79,7 @@ static void gic_set_cpu(struct irqdesc *desc, unsigned int irq, unsigned int cpu
|
|||
val |= 1 << (cpu + shift);
|
||||
writel(val, reg);
|
||||
}
|
||||
#endif
|
||||
|
||||
static struct irqchip gic_chip = {
|
||||
.ack = gic_ack_irq,
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@
|
|||
#include <linux/spinlock.h>
|
||||
|
||||
#include <asm/hardware.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/irq.h>
|
||||
#include <asm/mach/irq.h>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
#include <asm/system.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/leds.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include "leds.h"
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ unsigned long iop3xx_pcibios_min_mem = 0;
|
|||
/*
|
||||
* Default power-off for EP80219
|
||||
*/
|
||||
#include <asm/mach-types.h>
|
||||
|
||||
static inline void ep80219_send_to_pic(__u8 c) {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
#include <asm/io.h>
|
||||
#include <asm/irq.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/mach/irq.h>
|
||||
#include <asm/mach/time.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
#include <asm/io.h>
|
||||
#include <asm/irq.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/mach/irq.h>
|
||||
#include <asm/mach/time.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
#include <asm/page.h>
|
||||
|
||||
#include <asm/mach/map.h>
|
||||
#include <asm/mach-types.h>
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
#include <asm/page.h>
|
||||
|
||||
#include <asm/mach/map.h>
|
||||
#include <asm/mach-types.h>
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
#include <asm/page.h>
|
||||
|
||||
#include <asm/mach/map.h>
|
||||
#include <asm/mach-types.h>
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
#include <asm/page.h>
|
||||
|
||||
#include <asm/mach/map.h>
|
||||
#include <asm/mach-types.h>
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#include <asm/setup.h>
|
||||
#include <asm/memory.h>
|
||||
#include <asm/hardware.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/irq.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/tlbflush.h>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@
|
|||
#include <asm/io.h>
|
||||
#include <asm/irq.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/hardware.h>
|
||||
|
||||
#include <asm/mach/pci.h>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@
|
|||
#include <asm/page.h>
|
||||
|
||||
#include <asm/mach/map.h>
|
||||
#include <asm/arch/hardware.h>
|
||||
|
||||
/*
|
||||
* IRQ base register
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
#include <linux/kernel.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/module.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/arch/akita.h>
|
||||
#include <asm/arch/corgi.h>
|
||||
#include <asm/arch/hardware.h>
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@
|
|||
#include <asm/arch/udc.h>
|
||||
#include <asm/arch/pxafb.h>
|
||||
#include <asm/arch/mmc.h>
|
||||
#include <asm/arch/i2c.h>
|
||||
|
||||
#include "generic.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@
|
|||
#include <asm/hardware.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/irq.h>
|
||||
#include <asm/mach-types.h>
|
||||
|
||||
#include "devs.h"
|
||||
#include "usb-simtec.h"
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#include <asm/io.h>
|
||||
#include <asm/irq.h>
|
||||
#include <asm/leds.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/hardware/amba.h>
|
||||
#include <asm/hardware/amba_clcd.h>
|
||||
#include <asm/hardware/arm_timer.h>
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
#include <asm/irq.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/mach/pci.h>
|
||||
#include <asm/mach-types.h>
|
||||
|
||||
/*
|
||||
* these spaces are mapped using the following base registers:
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
#define HARVARD_CACHE
|
||||
#define CACHE_LINE_SIZE 32
|
||||
#define D_CACHE_LINE_SIZE 32
|
||||
#define BTB_FLUSH_SIZE 8
|
||||
|
||||
/*
|
||||
* v6_flush_cache_all()
|
||||
|
|
@ -98,7 +99,13 @@ ENTRY(v6_coherent_user_range)
|
|||
mcr p15, 0, r0, c7, c5, 1 @ invalidate I line
|
||||
#endif
|
||||
mcr p15, 0, r0, c7, c5, 7 @ invalidate BTB entry
|
||||
add r0, r0, #CACHE_LINE_SIZE
|
||||
add r0, r0, #BTB_FLUSH_SIZE
|
||||
mcr p15, 0, r0, c7, c5, 7 @ invalidate BTB entry
|
||||
add r0, r0, #BTB_FLUSH_SIZE
|
||||
mcr p15, 0, r0, c7, c5, 7 @ invalidate BTB entry
|
||||
add r0, r0, #BTB_FLUSH_SIZE
|
||||
mcr p15, 0, r0, c7, c5, 7 @ invalidate BTB entry
|
||||
add r0, r0, #BTB_FLUSH_SIZE
|
||||
cmp r0, r1
|
||||
blo 1b
|
||||
#ifdef HARVARD_CACHE
|
||||
|
|
|
|||
|
|
@ -17,6 +17,24 @@
|
|||
|
||||
#ifdef CONFIG_CPU_CACHE_VIPT
|
||||
|
||||
#define ALIAS_FLUSH_START 0xffff4000
|
||||
|
||||
#define TOP_PTE(x) pte_offset_kernel(top_pmd, x)
|
||||
|
||||
static void flush_pfn_alias(unsigned long pfn, unsigned long vaddr)
|
||||
{
|
||||
unsigned long to = ALIAS_FLUSH_START + (CACHE_COLOUR(vaddr) << PAGE_SHIFT);
|
||||
|
||||
set_pte(TOP_PTE(to), pfn_pte(pfn, PAGE_KERNEL));
|
||||
flush_tlb_kernel_page(to);
|
||||
|
||||
asm( "mcrr p15, 0, %1, %0, c14\n"
|
||||
" mcrr p15, 0, %1, %0, c5\n"
|
||||
:
|
||||
: "r" (to), "r" (to + PAGE_SIZE - L1_CACHE_BYTES)
|
||||
: "cc");
|
||||
}
|
||||
|
||||
void flush_cache_mm(struct mm_struct *mm)
|
||||
{
|
||||
if (cache_is_vivt()) {
|
||||
|
|
@ -67,24 +85,6 @@ void flush_cache_page(struct vm_area_struct *vma, unsigned long user_addr, unsig
|
|||
if (cache_is_vipt_aliasing())
|
||||
flush_pfn_alias(pfn, user_addr);
|
||||
}
|
||||
|
||||
#define ALIAS_FLUSH_START 0xffff4000
|
||||
|
||||
#define TOP_PTE(x) pte_offset_kernel(top_pmd, x)
|
||||
|
||||
static void flush_pfn_alias(unsigned long pfn, unsigned long vaddr)
|
||||
{
|
||||
unsigned long to = ALIAS_FLUSH_START + (CACHE_COLOUR(vaddr) << PAGE_SHIFT);
|
||||
|
||||
set_pte(TOP_PTE(to), pfn_pte(pfn, PAGE_KERNEL));
|
||||
flush_tlb_kernel_page(to);
|
||||
|
||||
asm( "mcrr p15, 0, %1, %0, c14\n"
|
||||
" mcrr p15, 0, %1, %0, c5\n"
|
||||
:
|
||||
: "r" (to), "r" (to + PAGE_SIZE - L1_CACHE_BYTES)
|
||||
: "cc");
|
||||
}
|
||||
#else
|
||||
#define flush_pfn_alias(pfn,vaddr) do { } while (0)
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@
|
|||
#include <asm/mach/map.h>
|
||||
#include <asm/hardware/clock.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/setup.h>
|
||||
|
||||
#include <asm/arch/board.h>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
#include <linux/err.h>
|
||||
|
||||
#include <asm/hardware.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/system.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@
|
|||
#include <asm/irq.h>
|
||||
#include <asm/system.h>
|
||||
#include <asm/hardware.h>
|
||||
#include <asm/mach-types.h>
|
||||
|
||||
#include <asm/arch/mux.h>
|
||||
#include <asm/arch/usb.h>
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@
|
|||
#include <linux/mtd/partitions.h>
|
||||
|
||||
#include <asm/io.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/mach/flash.h>
|
||||
|
||||
#include <asm/arch/map.h>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
|
||||
#include <asm/io.h>
|
||||
#include <asm/hardware.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/mach/flash.h>
|
||||
|
||||
#include <linux/reboot.h>
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@
|
|||
#include <linux/ioport.h>
|
||||
#include <linux/device.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/mach/flash.h>
|
||||
|
||||
#include <linux/reboot.h>
|
||||
|
|
|
|||
|
|
@ -42,7 +42,6 @@
|
|||
|
||||
#include <asm/io.h>
|
||||
#include <asm/hardware.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/mach/flash.h>
|
||||
#include <asm/arch/tc.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
#include <linux/mtd/partitions.h>
|
||||
#include <linux/mtd/concat.h>
|
||||
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/sizes.h>
|
||||
#include <asm/mach/flash.h>
|
||||
|
|
|
|||
|
|
@ -58,7 +58,6 @@
|
|||
#include <linux/mtd/partitions.h>
|
||||
|
||||
#include <asm/io.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/hardware/clock.h>
|
||||
|
||||
#include <asm/arch/regs-nand.h>
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@
|
|||
|
||||
#include <asm/hardware.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/sizes.h>
|
||||
|
||||
#include <asm/arch/mux.h>
|
||||
|
|
|
|||
|
|
@ -82,8 +82,6 @@
|
|||
#include <asm/arch/regs-serial.h>
|
||||
#include <asm/arch/regs-gpio.h>
|
||||
|
||||
#include <asm/mach-types.h>
|
||||
|
||||
/* structures */
|
||||
|
||||
struct s3c24xx_uart_info {
|
||||
|
|
|
|||
|
|
@ -17,8 +17,6 @@
|
|||
*/
|
||||
|
||||
#include <asm/hardware.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/arch/hardware.h>
|
||||
|
||||
|
||||
extern int usb_disabled(void);
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@
|
|||
#include <asm/io.h>
|
||||
#include <asm/mach-types.h>
|
||||
|
||||
#include <asm/arch/hardware.h>
|
||||
#include <asm/arch/mux.h>
|
||||
#include <asm/arch/irqs.h>
|
||||
#include <asm/arch/gpio.h>
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
*/
|
||||
|
||||
#include <asm/hardware.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/hardware/clock.h>
|
||||
#include <asm/arch/usb-control.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
#include <linux/fb.h>
|
||||
#include <linux/backlight.h>
|
||||
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/arch/sharpsl.h>
|
||||
|
||||
#define CORGI_DEFAULT_INTENSITY 0x1f
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@
|
|||
|
||||
#include <asm/hardware.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/arch/imxfb.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -260,7 +260,7 @@ static int pxafb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
|
|||
}
|
||||
|
||||
#ifdef CONFIG_CPU_FREQ
|
||||
DPRINTK("dma period = %d ps, clock = %d kHz\n",
|
||||
pr_debug("pxafb: dma period = %d ps, clock = %d kHz\n",
|
||||
pxafb_display_dma_period(var),
|
||||
get_clk_frequency_khz(0));
|
||||
#endif
|
||||
|
|
@ -270,7 +270,7 @@ static int pxafb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
|
|||
|
||||
static inline void pxafb_set_truecolor(u_int is_true_color)
|
||||
{
|
||||
DPRINTK("true_color = %d\n", is_true_color);
|
||||
pr_debug("pxafb: true_color = %d\n", is_true_color);
|
||||
// do your machine-specific setup if needed
|
||||
}
|
||||
|
||||
|
|
@ -284,7 +284,7 @@ static int pxafb_set_par(struct fb_info *info)
|
|||
struct fb_var_screeninfo *var = &info->var;
|
||||
unsigned long palette_mem_size;
|
||||
|
||||
DPRINTK("set_par\n");
|
||||
pr_debug("pxafb: set_par\n");
|
||||
|
||||
if (var->bits_per_pixel == 16)
|
||||
fbi->fb.fix.visual = FB_VISUAL_TRUECOLOR;
|
||||
|
|
@ -308,7 +308,7 @@ static int pxafb_set_par(struct fb_info *info)
|
|||
|
||||
palette_mem_size = fbi->palette_size * sizeof(u16);
|
||||
|
||||
DPRINTK("palette_mem_size = 0x%08lx\n", (u_long) palette_mem_size);
|
||||
pr_debug("pxafb: palette_mem_size = 0x%08lx\n", palette_mem_size);
|
||||
|
||||
fbi->palette_cpu = (u16 *)(fbi->map_cpu + PAGE_SIZE - palette_mem_size);
|
||||
fbi->palette_dma = fbi->map_dma + PAGE_SIZE - palette_mem_size;
|
||||
|
|
@ -369,7 +369,7 @@ static int pxafb_blank(int blank, struct fb_info *info)
|
|||
struct pxafb_info *fbi = (struct pxafb_info *)info;
|
||||
int i;
|
||||
|
||||
DPRINTK("pxafb_blank: blank=%d\n", blank);
|
||||
pr_debug("pxafb: blank=%d\n", blank);
|
||||
|
||||
switch (blank) {
|
||||
case FB_BLANK_POWERDOWN:
|
||||
|
|
@ -508,15 +508,15 @@ static int pxafb_activate_var(struct fb_var_screeninfo *var, struct pxafb_info *
|
|||
u_long flags;
|
||||
u_int lines_per_panel, pcd = get_pcd(var->pixclock);
|
||||
|
||||
DPRINTK("Configuring PXA LCD\n");
|
||||
pr_debug("pxafb: Configuring PXA LCD\n");
|
||||
|
||||
DPRINTK("var: xres=%d hslen=%d lm=%d rm=%d\n",
|
||||
pr_debug("var: xres=%d hslen=%d lm=%d rm=%d\n",
|
||||
var->xres, var->hsync_len,
|
||||
var->left_margin, var->right_margin);
|
||||
DPRINTK("var: yres=%d vslen=%d um=%d bm=%d\n",
|
||||
pr_debug("var: yres=%d vslen=%d um=%d bm=%d\n",
|
||||
var->yres, var->vsync_len,
|
||||
var->upper_margin, var->lower_margin);
|
||||
DPRINTK("var: pixclock=%d pcd=%d\n", var->pixclock, pcd);
|
||||
pr_debug("var: pixclock=%d pcd=%d\n", var->pixclock, pcd);
|
||||
|
||||
#if DEBUG_VAR
|
||||
if (var->xres < 16 || var->xres > 1024)
|
||||
|
|
@ -589,10 +589,10 @@ static int pxafb_activate_var(struct fb_var_screeninfo *var, struct pxafb_info *
|
|||
if (pcd)
|
||||
new_regs.lccr3 |= LCCR3_PixClkDiv(pcd);
|
||||
|
||||
DPRINTK("nlccr0 = 0x%08x\n", new_regs.lccr0);
|
||||
DPRINTK("nlccr1 = 0x%08x\n", new_regs.lccr1);
|
||||
DPRINTK("nlccr2 = 0x%08x\n", new_regs.lccr2);
|
||||
DPRINTK("nlccr3 = 0x%08x\n", new_regs.lccr3);
|
||||
pr_debug("nlccr0 = 0x%08x\n", new_regs.lccr0);
|
||||
pr_debug("nlccr1 = 0x%08x\n", new_regs.lccr1);
|
||||
pr_debug("nlccr2 = 0x%08x\n", new_regs.lccr2);
|
||||
pr_debug("nlccr3 = 0x%08x\n", new_regs.lccr3);
|
||||
|
||||
/* Update shadow copy atomically */
|
||||
local_irq_save(flags);
|
||||
|
|
@ -637,24 +637,24 @@ static int pxafb_activate_var(struct fb_var_screeninfo *var, struct pxafb_info *
|
|||
}
|
||||
|
||||
#if 0
|
||||
DPRINTK("fbi->dmadesc_fblow_cpu = 0x%p\n", fbi->dmadesc_fblow_cpu);
|
||||
DPRINTK("fbi->dmadesc_fbhigh_cpu = 0x%p\n", fbi->dmadesc_fbhigh_cpu);
|
||||
DPRINTK("fbi->dmadesc_palette_cpu = 0x%p\n", fbi->dmadesc_palette_cpu);
|
||||
DPRINTK("fbi->dmadesc_fblow_dma = 0x%x\n", fbi->dmadesc_fblow_dma);
|
||||
DPRINTK("fbi->dmadesc_fbhigh_dma = 0x%x\n", fbi->dmadesc_fbhigh_dma);
|
||||
DPRINTK("fbi->dmadesc_palette_dma = 0x%x\n", fbi->dmadesc_palette_dma);
|
||||
pr_debug("fbi->dmadesc_fblow_cpu = 0x%p\n", fbi->dmadesc_fblow_cpu);
|
||||
pr_debug("fbi->dmadesc_fbhigh_cpu = 0x%p\n", fbi->dmadesc_fbhigh_cpu);
|
||||
pr_debug("fbi->dmadesc_palette_cpu = 0x%p\n", fbi->dmadesc_palette_cpu);
|
||||
pr_debug("fbi->dmadesc_fblow_dma = 0x%x\n", fbi->dmadesc_fblow_dma);
|
||||
pr_debug("fbi->dmadesc_fbhigh_dma = 0x%x\n", fbi->dmadesc_fbhigh_dma);
|
||||
pr_debug("fbi->dmadesc_palette_dma = 0x%x\n", fbi->dmadesc_palette_dma);
|
||||
|
||||
DPRINTK("fbi->dmadesc_fblow_cpu->fdadr = 0x%x\n", fbi->dmadesc_fblow_cpu->fdadr);
|
||||
DPRINTK("fbi->dmadesc_fbhigh_cpu->fdadr = 0x%x\n", fbi->dmadesc_fbhigh_cpu->fdadr);
|
||||
DPRINTK("fbi->dmadesc_palette_cpu->fdadr = 0x%x\n", fbi->dmadesc_palette_cpu->fdadr);
|
||||
pr_debug("fbi->dmadesc_fblow_cpu->fdadr = 0x%x\n", fbi->dmadesc_fblow_cpu->fdadr);
|
||||
pr_debug("fbi->dmadesc_fbhigh_cpu->fdadr = 0x%x\n", fbi->dmadesc_fbhigh_cpu->fdadr);
|
||||
pr_debug("fbi->dmadesc_palette_cpu->fdadr = 0x%x\n", fbi->dmadesc_palette_cpu->fdadr);
|
||||
|
||||
DPRINTK("fbi->dmadesc_fblow_cpu->fsadr = 0x%x\n", fbi->dmadesc_fblow_cpu->fsadr);
|
||||
DPRINTK("fbi->dmadesc_fbhigh_cpu->fsadr = 0x%x\n", fbi->dmadesc_fbhigh_cpu->fsadr);
|
||||
DPRINTK("fbi->dmadesc_palette_cpu->fsadr = 0x%x\n", fbi->dmadesc_palette_cpu->fsadr);
|
||||
pr_debug("fbi->dmadesc_fblow_cpu->fsadr = 0x%x\n", fbi->dmadesc_fblow_cpu->fsadr);
|
||||
pr_debug("fbi->dmadesc_fbhigh_cpu->fsadr = 0x%x\n", fbi->dmadesc_fbhigh_cpu->fsadr);
|
||||
pr_debug("fbi->dmadesc_palette_cpu->fsadr = 0x%x\n", fbi->dmadesc_palette_cpu->fsadr);
|
||||
|
||||
DPRINTK("fbi->dmadesc_fblow_cpu->ldcmd = 0x%x\n", fbi->dmadesc_fblow_cpu->ldcmd);
|
||||
DPRINTK("fbi->dmadesc_fbhigh_cpu->ldcmd = 0x%x\n", fbi->dmadesc_fbhigh_cpu->ldcmd);
|
||||
DPRINTK("fbi->dmadesc_palette_cpu->ldcmd = 0x%x\n", fbi->dmadesc_palette_cpu->ldcmd);
|
||||
pr_debug("fbi->dmadesc_fblow_cpu->ldcmd = 0x%x\n", fbi->dmadesc_fblow_cpu->ldcmd);
|
||||
pr_debug("fbi->dmadesc_fbhigh_cpu->ldcmd = 0x%x\n", fbi->dmadesc_fbhigh_cpu->ldcmd);
|
||||
pr_debug("fbi->dmadesc_palette_cpu->ldcmd = 0x%x\n", fbi->dmadesc_palette_cpu->ldcmd);
|
||||
#endif
|
||||
|
||||
fbi->reg_lccr0 = new_regs.lccr0;
|
||||
|
|
@ -684,7 +684,7 @@ static int pxafb_activate_var(struct fb_var_screeninfo *var, struct pxafb_info *
|
|||
*/
|
||||
static inline void __pxafb_backlight_power(struct pxafb_info *fbi, int on)
|
||||
{
|
||||
DPRINTK("backlight o%s\n", on ? "n" : "ff");
|
||||
pr_debug("pxafb: backlight o%s\n", on ? "n" : "ff");
|
||||
|
||||
if (pxafb_backlight_power)
|
||||
pxafb_backlight_power(on);
|
||||
|
|
@ -692,7 +692,7 @@ static inline void __pxafb_backlight_power(struct pxafb_info *fbi, int on)
|
|||
|
||||
static inline void __pxafb_lcd_power(struct pxafb_info *fbi, int on)
|
||||
{
|
||||
DPRINTK("LCD power o%s\n", on ? "n" : "ff");
|
||||
pr_debug("pxafb: LCD power o%s\n", on ? "n" : "ff");
|
||||
|
||||
if (pxafb_lcd_power)
|
||||
pxafb_lcd_power(on);
|
||||
|
|
@ -740,13 +740,13 @@ static void pxafb_setup_gpio(struct pxafb_info *fbi)
|
|||
|
||||
static void pxafb_enable_controller(struct pxafb_info *fbi)
|
||||
{
|
||||
DPRINTK("Enabling LCD controller\n");
|
||||
DPRINTK("fdadr0 0x%08x\n", (unsigned int) fbi->fdadr0);
|
||||
DPRINTK("fdadr1 0x%08x\n", (unsigned int) fbi->fdadr1);
|
||||
DPRINTK("reg_lccr0 0x%08x\n", (unsigned int) fbi->reg_lccr0);
|
||||
DPRINTK("reg_lccr1 0x%08x\n", (unsigned int) fbi->reg_lccr1);
|
||||
DPRINTK("reg_lccr2 0x%08x\n", (unsigned int) fbi->reg_lccr2);
|
||||
DPRINTK("reg_lccr3 0x%08x\n", (unsigned int) fbi->reg_lccr3);
|
||||
pr_debug("pxafb: Enabling LCD controller\n");
|
||||
pr_debug("fdadr0 0x%08x\n", (unsigned int) fbi->fdadr0);
|
||||
pr_debug("fdadr1 0x%08x\n", (unsigned int) fbi->fdadr1);
|
||||
pr_debug("reg_lccr0 0x%08x\n", (unsigned int) fbi->reg_lccr0);
|
||||
pr_debug("reg_lccr1 0x%08x\n", (unsigned int) fbi->reg_lccr1);
|
||||
pr_debug("reg_lccr2 0x%08x\n", (unsigned int) fbi->reg_lccr2);
|
||||
pr_debug("reg_lccr3 0x%08x\n", (unsigned int) fbi->reg_lccr3);
|
||||
|
||||
/* enable LCD controller clock */
|
||||
pxa_set_cken(CKEN16_LCD, 1);
|
||||
|
|
@ -761,19 +761,19 @@ static void pxafb_enable_controller(struct pxafb_info *fbi)
|
|||
FDADR1 = fbi->fdadr1;
|
||||
LCCR0 |= LCCR0_ENB;
|
||||
|
||||
DPRINTK("FDADR0 0x%08x\n", (unsigned int) FDADR0);
|
||||
DPRINTK("FDADR1 0x%08x\n", (unsigned int) FDADR1);
|
||||
DPRINTK("LCCR0 0x%08x\n", (unsigned int) LCCR0);
|
||||
DPRINTK("LCCR1 0x%08x\n", (unsigned int) LCCR1);
|
||||
DPRINTK("LCCR2 0x%08x\n", (unsigned int) LCCR2);
|
||||
DPRINTK("LCCR3 0x%08x\n", (unsigned int) LCCR3);
|
||||
pr_debug("FDADR0 0x%08x\n", (unsigned int) FDADR0);
|
||||
pr_debug("FDADR1 0x%08x\n", (unsigned int) FDADR1);
|
||||
pr_debug("LCCR0 0x%08x\n", (unsigned int) LCCR0);
|
||||
pr_debug("LCCR1 0x%08x\n", (unsigned int) LCCR1);
|
||||
pr_debug("LCCR2 0x%08x\n", (unsigned int) LCCR2);
|
||||
pr_debug("LCCR3 0x%08x\n", (unsigned int) LCCR3);
|
||||
}
|
||||
|
||||
static void pxafb_disable_controller(struct pxafb_info *fbi)
|
||||
{
|
||||
DECLARE_WAITQUEUE(wait, current);
|
||||
|
||||
DPRINTK("Disabling LCD controller\n");
|
||||
pr_debug("pxafb: disabling LCD controller\n");
|
||||
|
||||
set_current_state(TASK_UNINTERRUPTIBLE);
|
||||
add_wait_queue(&fbi->ctrlr_wait, &wait);
|
||||
|
|
@ -1039,7 +1039,7 @@ static int __init pxafb_map_video_memory(struct pxafb_info *fbi)
|
|||
fbi->palette_size = fbi->fb.var.bits_per_pixel == 8 ? 256 : 16;
|
||||
|
||||
palette_mem_size = fbi->palette_size * sizeof(u16);
|
||||
DPRINTK("palette_mem_size = 0x%08lx\n", (u_long) palette_mem_size);
|
||||
pr_debug("pxafb: palette_mem_size = 0x%08lx\n", palette_mem_size);
|
||||
|
||||
fbi->palette_cpu = (u16 *)(fbi->map_cpu + PAGE_SIZE - palette_mem_size);
|
||||
fbi->palette_dma = fbi->map_dma + PAGE_SIZE - palette_mem_size;
|
||||
|
|
|
|||
|
|
@ -113,15 +113,6 @@ struct pxafb_info {
|
|||
|
||||
#define PXA_NAME "PXA"
|
||||
|
||||
/*
|
||||
* Debug macros
|
||||
*/
|
||||
#if DEBUG
|
||||
# define DPRINTK(fmt, args...) printk("%s: " fmt, __FUNCTION__ , ## args)
|
||||
#else
|
||||
# define DPRINTK(fmt, args...)
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Minimum X and Y resolutions
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -124,6 +124,8 @@ do { \
|
|||
if (((ex).e_flags & EF_ARM_EABI_MASK) || \
|
||||
((ex).e_flags & EF_ARM_SOFT_FLOAT)) \
|
||||
set_thread_flag(TIF_USING_IWMMXT); \
|
||||
else \
|
||||
clear_thread_flag(TIF_USING_IWMMXT); \
|
||||
} while (0)
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue