Merge master.kernel.org:/home/rmk/linux-2.6-arm

+82 -113
+2
arch/arm/common/gic.c
··· 68 writel(mask, gic_dist_base + GIC_DIST_ENABLE_SET + (irq / 32) * 4); 69 } 70 71 static void gic_set_cpu(struct irqdesc *desc, unsigned int irq, unsigned int cpu) 72 { 73 void __iomem *reg = gic_dist_base + GIC_DIST_TARGET + (irq & ~3); ··· 79 val |= 1 << (cpu + shift); 80 writel(val, reg); 81 } 82 83 static struct irqchip gic_chip = { 84 .ack = gic_ack_irq,
··· 68 writel(mask, gic_dist_base + GIC_DIST_ENABLE_SET + (irq / 32) * 4); 69 } 70 71 + #ifdef CONFIG_SMP 72 static void gic_set_cpu(struct irqdesc *desc, unsigned int irq, unsigned int cpu) 73 { 74 void __iomem *reg = gic_dist_base + GIC_DIST_TARGET + (irq & ~3); ··· 78 val |= 1 << (cpu + shift); 79 writel(val, reg); 80 } 81 + #endif 82 83 static struct irqchip gic_chip = { 84 .ack = gic_ack_irq,
-1
arch/arm/common/locomo.c
··· 27 #include <linux/spinlock.h> 28 29 #include <asm/hardware.h> 30 - #include <asm/mach-types.h> 31 #include <asm/io.h> 32 #include <asm/irq.h> 33 #include <asm/mach/irq.h>
··· 27 #include <linux/spinlock.h> 28 29 #include <asm/hardware.h> 30 #include <asm/io.h> 31 #include <asm/irq.h> 32 #include <asm/mach/irq.h>
-1
arch/arm/mach-imx/leds-mx1ads.c
··· 17 #include <asm/system.h> 18 #include <asm/io.h> 19 #include <asm/leds.h> 20 - #include <asm/mach-types.h> 21 #include "leds.h" 22 23 /*
··· 17 #include <asm/system.h> 18 #include <asm/io.h> 19 #include <asm/leds.h> 20 #include "leds.h" 21 22 /*
-1
arch/arm/mach-iop3xx/common.c
··· 27 /* 28 * Default power-off for EP80219 29 */ 30 - #include <asm/mach-types.h> 31 32 static inline void ep80219_send_to_pic(__u8 c) { 33 }
··· 27 /* 28 * Default power-off for EP80219 29 */ 30 31 static inline void ep80219_send_to_pic(__u8 c) { 32 }
-1
arch/arm/mach-iop3xx/iop321-time.c
··· 23 #include <asm/io.h> 24 #include <asm/irq.h> 25 #include <asm/uaccess.h> 26 - #include <asm/mach-types.h> 27 #include <asm/mach/irq.h> 28 #include <asm/mach/time.h> 29
··· 23 #include <asm/io.h> 24 #include <asm/irq.h> 25 #include <asm/uaccess.h> 26 #include <asm/mach/irq.h> 27 #include <asm/mach/time.h> 28
-1
arch/arm/mach-iop3xx/iop331-time.c
··· 23 #include <asm/io.h> 24 #include <asm/irq.h> 25 #include <asm/uaccess.h> 26 - #include <asm/mach-types.h> 27 #include <asm/mach/irq.h> 28 #include <asm/mach/time.h> 29
··· 23 #include <asm/io.h> 24 #include <asm/irq.h> 25 #include <asm/uaccess.h> 26 #include <asm/mach/irq.h> 27 #include <asm/mach/time.h> 28
-1
arch/arm/mach-iop3xx/iq31244-mm.c
··· 21 #include <asm/page.h> 22 23 #include <asm/mach/map.h> 24 - #include <asm/mach-types.h> 25 26 27 /*
··· 21 #include <asm/page.h> 22 23 #include <asm/mach/map.h> 24 25 26 /*
-1
arch/arm/mach-iop3xx/iq80321-mm.c
··· 21 #include <asm/page.h> 22 23 #include <asm/mach/map.h> 24 - #include <asm/mach-types.h> 25 26 27 /*
··· 21 #include <asm/page.h> 22 23 #include <asm/mach/map.h> 24 25 26 /*
-1
arch/arm/mach-iop3xx/iq80331-mm.c
··· 21 #include <asm/page.h> 22 23 #include <asm/mach/map.h> 24 - #include <asm/mach-types.h> 25 26 27 /*
··· 21 #include <asm/page.h> 22 23 #include <asm/mach/map.h> 24 25 26 /*
-1
arch/arm/mach-iop3xx/iq80332-mm.c
··· 21 #include <asm/page.h> 22 23 #include <asm/mach/map.h> 24 - #include <asm/mach-types.h> 25 26 27 /*
··· 21 #include <asm/page.h> 22 23 #include <asm/mach/map.h> 24 25 26 /*
-1
arch/arm/mach-ixp2000/core.c
··· 30 #include <asm/setup.h> 31 #include <asm/memory.h> 32 #include <asm/hardware.h> 33 - #include <asm/mach-types.h> 34 #include <asm/irq.h> 35 #include <asm/system.h> 36 #include <asm/tlbflush.h>
··· 30 #include <asm/setup.h> 31 #include <asm/memory.h> 32 #include <asm/hardware.h> 33 #include <asm/irq.h> 34 #include <asm/system.h> 35 #include <asm/tlbflush.h>
-1
arch/arm/mach-ixp2000/pci.c
··· 28 #include <asm/io.h> 29 #include <asm/irq.h> 30 #include <asm/system.h> 31 - #include <asm/mach-types.h> 32 #include <asm/hardware.h> 33 34 #include <asm/mach/pci.h>
··· 28 #include <asm/io.h> 29 #include <asm/irq.h> 30 #include <asm/system.h> 31 #include <asm/hardware.h> 32 33 #include <asm/mach/pci.h>
-1
arch/arm/mach-l7200/core.c
··· 12 #include <asm/page.h> 13 14 #include <asm/mach/map.h> 15 - #include <asm/arch/hardware.h> 16 17 /* 18 * IRQ base register
··· 12 #include <asm/page.h> 13 14 #include <asm/mach/map.h> 15 16 /* 17 * IRQ base register
-1
arch/arm/mach-pxa/corgi_lcd.c
··· 19 #include <linux/kernel.h> 20 #include <linux/device.h> 21 #include <linux/module.h> 22 - #include <asm/mach-types.h> 23 #include <asm/arch/akita.h> 24 #include <asm/arch/corgi.h> 25 #include <asm/arch/hardware.h>
··· 19 #include <linux/kernel.h> 20 #include <linux/device.h> 21 #include <linux/module.h> 22 #include <asm/arch/akita.h> 23 #include <asm/arch/corgi.h> 24 #include <asm/arch/hardware.h>
+1
arch/arm/mach-pxa/generic.c
··· 34 #include <asm/arch/udc.h> 35 #include <asm/arch/pxafb.h> 36 #include <asm/arch/mmc.h> 37 38 #include "generic.h" 39
··· 34 #include <asm/arch/udc.h> 35 #include <asm/arch/pxafb.h> 36 #include <asm/arch/mmc.h> 37 + #include <asm/arch/i2c.h> 38 39 #include "generic.h" 40
-1
arch/arm/mach-s3c2410/usb-simtec.c
··· 40 #include <asm/hardware.h> 41 #include <asm/io.h> 42 #include <asm/irq.h> 43 - #include <asm/mach-types.h> 44 45 #include "devs.h" 46 #include "usb-simtec.h"
··· 40 #include <asm/hardware.h> 41 #include <asm/io.h> 42 #include <asm/irq.h> 43 44 #include "devs.h" 45 #include "usb-simtec.h"
-1
arch/arm/mach-versatile/core.c
··· 30 #include <asm/io.h> 31 #include <asm/irq.h> 32 #include <asm/leds.h> 33 - #include <asm/mach-types.h> 34 #include <asm/hardware/amba.h> 35 #include <asm/hardware/amba_clcd.h> 36 #include <asm/hardware/arm_timer.h>
··· 30 #include <asm/io.h> 31 #include <asm/irq.h> 32 #include <asm/leds.h> 33 #include <asm/hardware/amba.h> 34 #include <asm/hardware/amba_clcd.h> 35 #include <asm/hardware/arm_timer.h>
-1
arch/arm/mach-versatile/pci.c
··· 29 #include <asm/irq.h> 30 #include <asm/system.h> 31 #include <asm/mach/pci.h> 32 - #include <asm/mach-types.h> 33 34 /* 35 * these spaces are mapped using the following base registers:
··· 29 #include <asm/irq.h> 30 #include <asm/system.h> 31 #include <asm/mach/pci.h> 32 33 /* 34 * these spaces are mapped using the following base registers:
+8 -1
arch/arm/mm/cache-v6.S
··· 18 #define HARVARD_CACHE 19 #define CACHE_LINE_SIZE 32 20 #define D_CACHE_LINE_SIZE 32 21 22 /* 23 * v6_flush_cache_all() ··· 99 mcr p15, 0, r0, c7, c5, 1 @ invalidate I line 100 #endif 101 mcr p15, 0, r0, c7, c5, 7 @ invalidate BTB entry 102 - add r0, r0, #CACHE_LINE_SIZE 103 cmp r0, r1 104 blo 1b 105 #ifdef HARVARD_CACHE
··· 18 #define HARVARD_CACHE 19 #define CACHE_LINE_SIZE 32 20 #define D_CACHE_LINE_SIZE 32 21 + #define BTB_FLUSH_SIZE 8 22 23 /* 24 * v6_flush_cache_all() ··· 98 mcr p15, 0, r0, c7, c5, 1 @ invalidate I line 99 #endif 100 mcr p15, 0, r0, c7, c5, 7 @ invalidate BTB entry 101 + add r0, r0, #BTB_FLUSH_SIZE 102 + mcr p15, 0, r0, c7, c5, 7 @ invalidate BTB entry 103 + add r0, r0, #BTB_FLUSH_SIZE 104 + mcr p15, 0, r0, c7, c5, 7 @ invalidate BTB entry 105 + add r0, r0, #BTB_FLUSH_SIZE 106 + mcr p15, 0, r0, c7, c5, 7 @ invalidate BTB entry 107 + add r0, r0, #BTB_FLUSH_SIZE 108 cmp r0, r1 109 blo 1b 110 #ifdef HARVARD_CACHE
+18 -18
arch/arm/mm/flush.c
··· 17 18 #ifdef CONFIG_CPU_CACHE_VIPT 19 20 void flush_cache_mm(struct mm_struct *mm) 21 { 22 if (cache_is_vivt()) { ··· 84 85 if (cache_is_vipt_aliasing()) 86 flush_pfn_alias(pfn, user_addr); 87 - } 88 - 89 - #define ALIAS_FLUSH_START 0xffff4000 90 - 91 - #define TOP_PTE(x) pte_offset_kernel(top_pmd, x) 92 - 93 - static void flush_pfn_alias(unsigned long pfn, unsigned long vaddr) 94 - { 95 - unsigned long to = ALIAS_FLUSH_START + (CACHE_COLOUR(vaddr) << PAGE_SHIFT); 96 - 97 - set_pte(TOP_PTE(to), pfn_pte(pfn, PAGE_KERNEL)); 98 - flush_tlb_kernel_page(to); 99 - 100 - asm( "mcrr p15, 0, %1, %0, c14\n" 101 - " mcrr p15, 0, %1, %0, c5\n" 102 - : 103 - : "r" (to), "r" (to + PAGE_SIZE - L1_CACHE_BYTES) 104 - : "cc"); 105 } 106 #else 107 #define flush_pfn_alias(pfn,vaddr) do { } while (0)
··· 17 18 #ifdef CONFIG_CPU_CACHE_VIPT 19 20 + #define ALIAS_FLUSH_START 0xffff4000 21 + 22 + #define TOP_PTE(x) pte_offset_kernel(top_pmd, x) 23 + 24 + static void flush_pfn_alias(unsigned long pfn, unsigned long vaddr) 25 + { 26 + unsigned long to = ALIAS_FLUSH_START + (CACHE_COLOUR(vaddr) << PAGE_SHIFT); 27 + 28 + set_pte(TOP_PTE(to), pfn_pte(pfn, PAGE_KERNEL)); 29 + flush_tlb_kernel_page(to); 30 + 31 + asm( "mcrr p15, 0, %1, %0, c14\n" 32 + " mcrr p15, 0, %1, %0, c5\n" 33 + : 34 + : "r" (to), "r" (to + PAGE_SIZE - L1_CACHE_BYTES) 35 + : "cc"); 36 + } 37 + 38 void flush_cache_mm(struct mm_struct *mm) 39 { 40 if (cache_is_vivt()) { ··· 66 67 if (cache_is_vipt_aliasing()) 68 flush_pfn_alias(pfn, user_addr); 69 } 70 #else 71 #define flush_pfn_alias(pfn,vaddr) do { } while (0)
-1
arch/arm/plat-omap/common.c
··· 25 #include <asm/mach/map.h> 26 #include <asm/hardware/clock.h> 27 #include <asm/io.h> 28 - #include <asm/mach-types.h> 29 #include <asm/setup.h> 30 31 #include <asm/arch/board.h>
··· 25 #include <asm/mach/map.h> 26 #include <asm/hardware/clock.h> 27 #include <asm/io.h> 28 #include <asm/setup.h> 29 30 #include <asm/arch/board.h>
-1
arch/arm/plat-omap/cpu-omap.c
··· 21 #include <linux/err.h> 22 23 #include <asm/hardware.h> 24 - #include <asm/mach-types.h> 25 #include <asm/io.h> 26 #include <asm/system.h> 27
··· 21 #include <linux/err.h> 22 23 #include <asm/hardware.h> 24 #include <asm/io.h> 25 #include <asm/system.h> 26
-1
arch/arm/plat-omap/usb.c
··· 33 #include <asm/irq.h> 34 #include <asm/system.h> 35 #include <asm/hardware.h> 36 - #include <asm/mach-types.h> 37 38 #include <asm/arch/mux.h> 39 #include <asm/arch/usb.h>
··· 33 #include <asm/irq.h> 34 #include <asm/system.h> 35 #include <asm/hardware.h> 36 37 #include <asm/arch/mux.h> 38 #include <asm/arch/usb.h>
-1
drivers/mtd/maps/bast-flash.c
··· 39 #include <linux/mtd/partitions.h> 40 41 #include <asm/io.h> 42 - #include <asm/mach-types.h> 43 #include <asm/mach/flash.h> 44 45 #include <asm/arch/map.h>
··· 39 #include <linux/mtd/partitions.h> 40 41 #include <asm/io.h> 42 #include <asm/mach/flash.h> 43 44 #include <asm/arch/map.h>
-1
drivers/mtd/maps/ixp2000.c
··· 30 31 #include <asm/io.h> 32 #include <asm/hardware.h> 33 - #include <asm/mach-types.h> 34 #include <asm/mach/flash.h> 35 36 #include <linux/reboot.h>
··· 30 31 #include <asm/io.h> 32 #include <asm/hardware.h> 33 #include <asm/mach/flash.h> 34 35 #include <linux/reboot.h>
-1
drivers/mtd/maps/ixp4xx.c
··· 26 #include <linux/ioport.h> 27 #include <linux/device.h> 28 #include <asm/io.h> 29 - #include <asm/mach-types.h> 30 #include <asm/mach/flash.h> 31 32 #include <linux/reboot.h>
··· 26 #include <linux/ioport.h> 27 #include <linux/device.h> 28 #include <asm/io.h> 29 #include <asm/mach/flash.h> 30 31 #include <linux/reboot.h>
-1
drivers/mtd/maps/omap_nor.c
··· 42 43 #include <asm/io.h> 44 #include <asm/hardware.h> 45 - #include <asm/mach-types.h> 46 #include <asm/mach/flash.h> 47 #include <asm/arch/tc.h> 48
··· 42 43 #include <asm/io.h> 44 #include <asm/hardware.h> 45 #include <asm/mach/flash.h> 46 #include <asm/arch/tc.h> 47
-1
drivers/mtd/maps/sa1100-flash.c
··· 21 #include <linux/mtd/partitions.h> 22 #include <linux/mtd/concat.h> 23 24 - #include <asm/mach-types.h> 25 #include <asm/io.h> 26 #include <asm/sizes.h> 27 #include <asm/mach/flash.h>
··· 21 #include <linux/mtd/partitions.h> 22 #include <linux/mtd/concat.h> 23 24 #include <asm/io.h> 25 #include <asm/sizes.h> 26 #include <asm/mach/flash.h>
-1
drivers/mtd/nand/s3c2410.c
··· 58 #include <linux/mtd/partitions.h> 59 60 #include <asm/io.h> 61 - #include <asm/mach-types.h> 62 #include <asm/hardware/clock.h> 63 64 #include <asm/arch/regs-nand.h>
··· 58 #include <linux/mtd/partitions.h> 59 60 #include <asm/io.h> 61 #include <asm/hardware/clock.h> 62 63 #include <asm/arch/regs-nand.h>
-1
drivers/pcmcia/omap_cf.c
··· 22 23 #include <asm/hardware.h> 24 #include <asm/io.h> 25 - #include <asm/mach-types.h> 26 #include <asm/sizes.h> 27 28 #include <asm/arch/mux.h>
··· 22 23 #include <asm/hardware.h> 24 #include <asm/io.h> 25 #include <asm/sizes.h> 26 27 #include <asm/arch/mux.h>
-2
drivers/serial/s3c2410.c
··· 82 #include <asm/arch/regs-serial.h> 83 #include <asm/arch/regs-gpio.h> 84 85 - #include <asm/mach-types.h> 86 - 87 /* structures */ 88 89 struct s3c24xx_uart_info {
··· 82 #include <asm/arch/regs-serial.h> 83 #include <asm/arch/regs-gpio.h> 84 85 /* structures */ 86 87 struct s3c24xx_uart_info {
-2
drivers/usb/host/ohci-lh7a404.c
··· 17 */ 18 19 #include <asm/hardware.h> 20 - #include <asm/mach-types.h> 21 - #include <asm/arch/hardware.h> 22 23 24 extern int usb_disabled(void);
··· 17 */ 18 19 #include <asm/hardware.h> 20 21 22 extern int usb_disabled(void);
-1
drivers/usb/host/ohci-omap.c
··· 18 #include <asm/io.h> 19 #include <asm/mach-types.h> 20 21 - #include <asm/arch/hardware.h> 22 #include <asm/arch/mux.h> 23 #include <asm/arch/irqs.h> 24 #include <asm/arch/gpio.h>
··· 18 #include <asm/io.h> 19 #include <asm/mach-types.h> 20 21 #include <asm/arch/mux.h> 22 #include <asm/arch/irqs.h> 23 #include <asm/arch/gpio.h>
-1
drivers/usb/host/ohci-s3c2410.c
··· 20 */ 21 22 #include <asm/hardware.h> 23 - #include <asm/mach-types.h> 24 #include <asm/hardware/clock.h> 25 #include <asm/arch/usb-control.h> 26
··· 20 */ 21 22 #include <asm/hardware.h> 23 #include <asm/hardware/clock.h> 24 #include <asm/arch/usb-control.h> 25
-1
drivers/video/backlight/corgi_bl.c
··· 19 #include <linux/fb.h> 20 #include <linux/backlight.h> 21 22 - #include <asm/mach-types.h> 23 #include <asm/arch/sharpsl.h> 24 25 #define CORGI_DEFAULT_INTENSITY 0x1f
··· 19 #include <linux/fb.h> 20 #include <linux/backlight.h> 21 22 #include <asm/arch/sharpsl.h> 23 24 #define CORGI_DEFAULT_INTENSITY 0x1f
-1
drivers/video/imxfb.c
··· 36 37 #include <asm/hardware.h> 38 #include <asm/io.h> 39 - #include <asm/mach-types.h> 40 #include <asm/uaccess.h> 41 #include <asm/arch/imxfb.h> 42
··· 36 37 #include <asm/hardware.h> 38 #include <asm/io.h> 39 #include <asm/uaccess.h> 40 #include <asm/arch/imxfb.h> 41
+51 -51
drivers/video/pxafb.c
··· 260 } 261 262 #ifdef CONFIG_CPU_FREQ 263 - DPRINTK("dma period = %d ps, clock = %d kHz\n", 264 - pxafb_display_dma_period(var), 265 - get_clk_frequency_khz(0)); 266 #endif 267 268 return 0; ··· 270 271 static inline void pxafb_set_truecolor(u_int is_true_color) 272 { 273 - DPRINTK("true_color = %d\n", is_true_color); 274 // do your machine-specific setup if needed 275 } 276 ··· 284 struct fb_var_screeninfo *var = &info->var; 285 unsigned long palette_mem_size; 286 287 - DPRINTK("set_par\n"); 288 289 if (var->bits_per_pixel == 16) 290 fbi->fb.fix.visual = FB_VISUAL_TRUECOLOR; ··· 308 309 palette_mem_size = fbi->palette_size * sizeof(u16); 310 311 - DPRINTK("palette_mem_size = 0x%08lx\n", (u_long) palette_mem_size); 312 313 fbi->palette_cpu = (u16 *)(fbi->map_cpu + PAGE_SIZE - palette_mem_size); 314 fbi->palette_dma = fbi->map_dma + PAGE_SIZE - palette_mem_size; ··· 369 struct pxafb_info *fbi = (struct pxafb_info *)info; 370 int i; 371 372 - DPRINTK("pxafb_blank: blank=%d\n", blank); 373 374 switch (blank) { 375 case FB_BLANK_POWERDOWN: ··· 508 u_long flags; 509 u_int lines_per_panel, pcd = get_pcd(var->pixclock); 510 511 - DPRINTK("Configuring PXA LCD\n"); 512 513 - DPRINTK("var: xres=%d hslen=%d lm=%d rm=%d\n", 514 - var->xres, var->hsync_len, 515 - var->left_margin, var->right_margin); 516 - DPRINTK("var: yres=%d vslen=%d um=%d bm=%d\n", 517 - var->yres, var->vsync_len, 518 - var->upper_margin, var->lower_margin); 519 - DPRINTK("var: pixclock=%d pcd=%d\n", var->pixclock, pcd); 520 521 #if DEBUG_VAR 522 if (var->xres < 16 || var->xres > 1024) ··· 589 if (pcd) 590 new_regs.lccr3 |= LCCR3_PixClkDiv(pcd); 591 592 - DPRINTK("nlccr0 = 0x%08x\n", new_regs.lccr0); 593 - DPRINTK("nlccr1 = 0x%08x\n", new_regs.lccr1); 594 - DPRINTK("nlccr2 = 0x%08x\n", new_regs.lccr2); 595 - DPRINTK("nlccr3 = 0x%08x\n", new_regs.lccr3); 596 597 /* Update shadow copy atomically */ 598 local_irq_save(flags); ··· 637 } 638 639 #if 0 640 - DPRINTK("fbi->dmadesc_fblow_cpu = 0x%p\n", fbi->dmadesc_fblow_cpu); 641 - DPRINTK("fbi->dmadesc_fbhigh_cpu = 0x%p\n", fbi->dmadesc_fbhigh_cpu); 642 - DPRINTK("fbi->dmadesc_palette_cpu = 0x%p\n", fbi->dmadesc_palette_cpu); 643 - DPRINTK("fbi->dmadesc_fblow_dma = 0x%x\n", fbi->dmadesc_fblow_dma); 644 - DPRINTK("fbi->dmadesc_fbhigh_dma = 0x%x\n", fbi->dmadesc_fbhigh_dma); 645 - DPRINTK("fbi->dmadesc_palette_dma = 0x%x\n", fbi->dmadesc_palette_dma); 646 647 - DPRINTK("fbi->dmadesc_fblow_cpu->fdadr = 0x%x\n", fbi->dmadesc_fblow_cpu->fdadr); 648 - DPRINTK("fbi->dmadesc_fbhigh_cpu->fdadr = 0x%x\n", fbi->dmadesc_fbhigh_cpu->fdadr); 649 - DPRINTK("fbi->dmadesc_palette_cpu->fdadr = 0x%x\n", fbi->dmadesc_palette_cpu->fdadr); 650 651 - DPRINTK("fbi->dmadesc_fblow_cpu->fsadr = 0x%x\n", fbi->dmadesc_fblow_cpu->fsadr); 652 - DPRINTK("fbi->dmadesc_fbhigh_cpu->fsadr = 0x%x\n", fbi->dmadesc_fbhigh_cpu->fsadr); 653 - DPRINTK("fbi->dmadesc_palette_cpu->fsadr = 0x%x\n", fbi->dmadesc_palette_cpu->fsadr); 654 655 - DPRINTK("fbi->dmadesc_fblow_cpu->ldcmd = 0x%x\n", fbi->dmadesc_fblow_cpu->ldcmd); 656 - DPRINTK("fbi->dmadesc_fbhigh_cpu->ldcmd = 0x%x\n", fbi->dmadesc_fbhigh_cpu->ldcmd); 657 - DPRINTK("fbi->dmadesc_palette_cpu->ldcmd = 0x%x\n", fbi->dmadesc_palette_cpu->ldcmd); 658 #endif 659 660 fbi->reg_lccr0 = new_regs.lccr0; ··· 684 */ 685 static inline void __pxafb_backlight_power(struct pxafb_info *fbi, int on) 686 { 687 - DPRINTK("backlight o%s\n", on ? "n" : "ff"); 688 689 if (pxafb_backlight_power) 690 pxafb_backlight_power(on); ··· 692 693 static inline void __pxafb_lcd_power(struct pxafb_info *fbi, int on) 694 { 695 - DPRINTK("LCD power o%s\n", on ? "n" : "ff"); 696 697 if (pxafb_lcd_power) 698 pxafb_lcd_power(on); ··· 740 741 static void pxafb_enable_controller(struct pxafb_info *fbi) 742 { 743 - DPRINTK("Enabling LCD controller\n"); 744 - DPRINTK("fdadr0 0x%08x\n", (unsigned int) fbi->fdadr0); 745 - DPRINTK("fdadr1 0x%08x\n", (unsigned int) fbi->fdadr1); 746 - DPRINTK("reg_lccr0 0x%08x\n", (unsigned int) fbi->reg_lccr0); 747 - DPRINTK("reg_lccr1 0x%08x\n", (unsigned int) fbi->reg_lccr1); 748 - DPRINTK("reg_lccr2 0x%08x\n", (unsigned int) fbi->reg_lccr2); 749 - DPRINTK("reg_lccr3 0x%08x\n", (unsigned int) fbi->reg_lccr3); 750 751 /* enable LCD controller clock */ 752 pxa_set_cken(CKEN16_LCD, 1); ··· 761 FDADR1 = fbi->fdadr1; 762 LCCR0 |= LCCR0_ENB; 763 764 - DPRINTK("FDADR0 0x%08x\n", (unsigned int) FDADR0); 765 - DPRINTK("FDADR1 0x%08x\n", (unsigned int) FDADR1); 766 - DPRINTK("LCCR0 0x%08x\n", (unsigned int) LCCR0); 767 - DPRINTK("LCCR1 0x%08x\n", (unsigned int) LCCR1); 768 - DPRINTK("LCCR2 0x%08x\n", (unsigned int) LCCR2); 769 - DPRINTK("LCCR3 0x%08x\n", (unsigned int) LCCR3); 770 } 771 772 static void pxafb_disable_controller(struct pxafb_info *fbi) 773 { 774 DECLARE_WAITQUEUE(wait, current); 775 776 - DPRINTK("Disabling LCD controller\n"); 777 778 set_current_state(TASK_UNINTERRUPTIBLE); 779 add_wait_queue(&fbi->ctrlr_wait, &wait); ··· 1039 fbi->palette_size = fbi->fb.var.bits_per_pixel == 8 ? 256 : 16; 1040 1041 palette_mem_size = fbi->palette_size * sizeof(u16); 1042 - DPRINTK("palette_mem_size = 0x%08lx\n", (u_long) palette_mem_size); 1043 1044 fbi->palette_cpu = (u16 *)(fbi->map_cpu + PAGE_SIZE - palette_mem_size); 1045 fbi->palette_dma = fbi->map_dma + PAGE_SIZE - palette_mem_size;
··· 260 } 261 262 #ifdef CONFIG_CPU_FREQ 263 + pr_debug("pxafb: dma period = %d ps, clock = %d kHz\n", 264 + pxafb_display_dma_period(var), 265 + get_clk_frequency_khz(0)); 266 #endif 267 268 return 0; ··· 270 271 static inline void pxafb_set_truecolor(u_int is_true_color) 272 { 273 + pr_debug("pxafb: true_color = %d\n", is_true_color); 274 // do your machine-specific setup if needed 275 } 276 ··· 284 struct fb_var_screeninfo *var = &info->var; 285 unsigned long palette_mem_size; 286 287 + pr_debug("pxafb: set_par\n"); 288 289 if (var->bits_per_pixel == 16) 290 fbi->fb.fix.visual = FB_VISUAL_TRUECOLOR; ··· 308 309 palette_mem_size = fbi->palette_size * sizeof(u16); 310 311 + pr_debug("pxafb: palette_mem_size = 0x%08lx\n", palette_mem_size); 312 313 fbi->palette_cpu = (u16 *)(fbi->map_cpu + PAGE_SIZE - palette_mem_size); 314 fbi->palette_dma = fbi->map_dma + PAGE_SIZE - palette_mem_size; ··· 369 struct pxafb_info *fbi = (struct pxafb_info *)info; 370 int i; 371 372 + pr_debug("pxafb: blank=%d\n", blank); 373 374 switch (blank) { 375 case FB_BLANK_POWERDOWN: ··· 508 u_long flags; 509 u_int lines_per_panel, pcd = get_pcd(var->pixclock); 510 511 + pr_debug("pxafb: Configuring PXA LCD\n"); 512 513 + pr_debug("var: xres=%d hslen=%d lm=%d rm=%d\n", 514 + var->xres, var->hsync_len, 515 + var->left_margin, var->right_margin); 516 + pr_debug("var: yres=%d vslen=%d um=%d bm=%d\n", 517 + var->yres, var->vsync_len, 518 + var->upper_margin, var->lower_margin); 519 + pr_debug("var: pixclock=%d pcd=%d\n", var->pixclock, pcd); 520 521 #if DEBUG_VAR 522 if (var->xres < 16 || var->xres > 1024) ··· 589 if (pcd) 590 new_regs.lccr3 |= LCCR3_PixClkDiv(pcd); 591 592 + pr_debug("nlccr0 = 0x%08x\n", new_regs.lccr0); 593 + pr_debug("nlccr1 = 0x%08x\n", new_regs.lccr1); 594 + pr_debug("nlccr2 = 0x%08x\n", new_regs.lccr2); 595 + pr_debug("nlccr3 = 0x%08x\n", new_regs.lccr3); 596 597 /* Update shadow copy atomically */ 598 local_irq_save(flags); ··· 637 } 638 639 #if 0 640 + pr_debug("fbi->dmadesc_fblow_cpu = 0x%p\n", fbi->dmadesc_fblow_cpu); 641 + pr_debug("fbi->dmadesc_fbhigh_cpu = 0x%p\n", fbi->dmadesc_fbhigh_cpu); 642 + pr_debug("fbi->dmadesc_palette_cpu = 0x%p\n", fbi->dmadesc_palette_cpu); 643 + pr_debug("fbi->dmadesc_fblow_dma = 0x%x\n", fbi->dmadesc_fblow_dma); 644 + pr_debug("fbi->dmadesc_fbhigh_dma = 0x%x\n", fbi->dmadesc_fbhigh_dma); 645 + pr_debug("fbi->dmadesc_palette_dma = 0x%x\n", fbi->dmadesc_palette_dma); 646 647 + pr_debug("fbi->dmadesc_fblow_cpu->fdadr = 0x%x\n", fbi->dmadesc_fblow_cpu->fdadr); 648 + pr_debug("fbi->dmadesc_fbhigh_cpu->fdadr = 0x%x\n", fbi->dmadesc_fbhigh_cpu->fdadr); 649 + pr_debug("fbi->dmadesc_palette_cpu->fdadr = 0x%x\n", fbi->dmadesc_palette_cpu->fdadr); 650 651 + pr_debug("fbi->dmadesc_fblow_cpu->fsadr = 0x%x\n", fbi->dmadesc_fblow_cpu->fsadr); 652 + pr_debug("fbi->dmadesc_fbhigh_cpu->fsadr = 0x%x\n", fbi->dmadesc_fbhigh_cpu->fsadr); 653 + pr_debug("fbi->dmadesc_palette_cpu->fsadr = 0x%x\n", fbi->dmadesc_palette_cpu->fsadr); 654 655 + pr_debug("fbi->dmadesc_fblow_cpu->ldcmd = 0x%x\n", fbi->dmadesc_fblow_cpu->ldcmd); 656 + pr_debug("fbi->dmadesc_fbhigh_cpu->ldcmd = 0x%x\n", fbi->dmadesc_fbhigh_cpu->ldcmd); 657 + pr_debug("fbi->dmadesc_palette_cpu->ldcmd = 0x%x\n", fbi->dmadesc_palette_cpu->ldcmd); 658 #endif 659 660 fbi->reg_lccr0 = new_regs.lccr0; ··· 684 */ 685 static inline void __pxafb_backlight_power(struct pxafb_info *fbi, int on) 686 { 687 + pr_debug("pxafb: backlight o%s\n", on ? "n" : "ff"); 688 689 if (pxafb_backlight_power) 690 pxafb_backlight_power(on); ··· 692 693 static inline void __pxafb_lcd_power(struct pxafb_info *fbi, int on) 694 { 695 + pr_debug("pxafb: LCD power o%s\n", on ? "n" : "ff"); 696 697 if (pxafb_lcd_power) 698 pxafb_lcd_power(on); ··· 740 741 static void pxafb_enable_controller(struct pxafb_info *fbi) 742 { 743 + pr_debug("pxafb: Enabling LCD controller\n"); 744 + pr_debug("fdadr0 0x%08x\n", (unsigned int) fbi->fdadr0); 745 + pr_debug("fdadr1 0x%08x\n", (unsigned int) fbi->fdadr1); 746 + pr_debug("reg_lccr0 0x%08x\n", (unsigned int) fbi->reg_lccr0); 747 + pr_debug("reg_lccr1 0x%08x\n", (unsigned int) fbi->reg_lccr1); 748 + pr_debug("reg_lccr2 0x%08x\n", (unsigned int) fbi->reg_lccr2); 749 + pr_debug("reg_lccr3 0x%08x\n", (unsigned int) fbi->reg_lccr3); 750 751 /* enable LCD controller clock */ 752 pxa_set_cken(CKEN16_LCD, 1); ··· 761 FDADR1 = fbi->fdadr1; 762 LCCR0 |= LCCR0_ENB; 763 764 + pr_debug("FDADR0 0x%08x\n", (unsigned int) FDADR0); 765 + pr_debug("FDADR1 0x%08x\n", (unsigned int) FDADR1); 766 + pr_debug("LCCR0 0x%08x\n", (unsigned int) LCCR0); 767 + pr_debug("LCCR1 0x%08x\n", (unsigned int) LCCR1); 768 + pr_debug("LCCR2 0x%08x\n", (unsigned int) LCCR2); 769 + pr_debug("LCCR3 0x%08x\n", (unsigned int) LCCR3); 770 } 771 772 static void pxafb_disable_controller(struct pxafb_info *fbi) 773 { 774 DECLARE_WAITQUEUE(wait, current); 775 776 + pr_debug("pxafb: disabling LCD controller\n"); 777 778 set_current_state(TASK_UNINTERRUPTIBLE); 779 add_wait_queue(&fbi->ctrlr_wait, &wait); ··· 1039 fbi->palette_size = fbi->fb.var.bits_per_pixel == 8 ? 256 : 16; 1040 1041 palette_mem_size = fbi->palette_size * sizeof(u16); 1042 + pr_debug("pxafb: palette_mem_size = 0x%08lx\n", palette_mem_size); 1043 1044 fbi->palette_cpu = (u16 *)(fbi->map_cpu + PAGE_SIZE - palette_mem_size); 1045 fbi->palette_dma = fbi->map_dma + PAGE_SIZE - palette_mem_size;
-9
drivers/video/pxafb.h
··· 114 #define PXA_NAME "PXA" 115 116 /* 117 - * Debug macros 118 - */ 119 - #if DEBUG 120 - # define DPRINTK(fmt, args...) printk("%s: " fmt, __FUNCTION__ , ## args) 121 - #else 122 - # define DPRINTK(fmt, args...) 123 - #endif 124 - 125 - /* 126 * Minimum X and Y resolutions 127 */ 128 #define MIN_XRES 64
··· 114 #define PXA_NAME "PXA" 115 116 /* 117 * Minimum X and Y resolutions 118 */ 119 #define MIN_XRES 64
+2
include/asm-arm/elf.h
··· 124 if (((ex).e_flags & EF_ARM_EABI_MASK) || \ 125 ((ex).e_flags & EF_ARM_SOFT_FLOAT)) \ 126 set_thread_flag(TIF_USING_IWMMXT); \ 127 } while (0) 128 129 #endif
··· 124 if (((ex).e_flags & EF_ARM_EABI_MASK) || \ 125 ((ex).e_flags & EF_ARM_SOFT_FLOAT)) \ 126 set_thread_flag(TIF_USING_IWMMXT); \ 127 + else \ 128 + clear_thread_flag(TIF_USING_IWMMXT); \ 129 } while (0) 130 131 #endif