Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3362/1: [cleanup] - duplicate decleration of mem_fclk_21285
[ARM] 3365/1: [cleanup] header for compat.c exported functions
[ARM] 3364/1: [cleanup] warning fix - definitions for enable_hlt and disable_hlt
[ARM] 3363/1: [cleanup] process.c - fix warnings
[ARM] 3358/1: [S3C2410] add missing SPI DMA resources
[ARM] 3357/1: enable frontlight on collie
[ARM] Fix "thead" typo
+56
-5
+21
arch/arm/common/locomo.c
+21
arch/arm/common/locomo.c
···
629
629
}
630
630
#endif
631
631
632
+
633
+
#define LCM_ALC_EN 0x8000
634
+
635
+
void frontlight_set(struct locomo *lchip, int duty, int vr, int bpwf)
636
+
{
637
+
unsigned long flags;
638
+
639
+
spin_lock_irqsave(&lchip->lock, flags);
640
+
locomo_writel(bpwf, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALS);
641
+
udelay(100);
642
+
locomo_writel(duty, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALD);
643
+
locomo_writel(bpwf | LCM_ALC_EN, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALS);
644
+
spin_unlock_irqrestore(&lchip->lock, flags);
645
+
}
646
+
647
+
632
648
/**
633
649
* locomo_probe - probe for a single LoCoMo chip.
634
650
* @phys_addr: physical address of device.
···
704
688
/* FrontLight */
705
689
locomo_writel(0, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALS);
706
690
locomo_writel(0, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALD);
691
+
692
+
/* Same constants can be used for collie and poodle
693
+
(depending on CONFIG options in original sharp code)? */
694
+
frontlight_set(lchip, 163, 0, 148);
695
+
707
696
/* Longtime timer */
708
697
locomo_writel(0, lchip->base + LOCOMO_LTINT);
709
698
/* SPI */
+2
arch/arm/kernel/compat.c
+2
arch/arm/kernel/compat.c
+13
arch/arm/kernel/compat.h
+13
arch/arm/kernel/compat.h
···
1
+
/*
2
+
* linux/arch/arm/kernel/compat.h
3
+
*
4
+
* Copyright (C) 2001 Russell King
5
+
*
6
+
* This program is free software; you can redistribute it and/or modify
7
+
* it under the terms of the GNU General Public License version 2 as
8
+
* published by the Free Software Foundation.
9
+
*/
10
+
11
+
extern void convert_to_tag_list(struct tag *tags);
12
+
13
+
extern void squash_mem_tags(struct tag *tag);
+2
-1
arch/arm/kernel/process.c
+2
-1
arch/arm/kernel/process.c
···
27
27
#include <linux/kallsyms.h>
28
28
#include <linux/init.h>
29
29
#include <linux/cpu.h>
30
+
#include <linux/elfcore.h>
30
31
31
32
#include <asm/leds.h>
32
33
#include <asm/processor.h>
···
84
83
* This is our default idle handler. We need to disable
85
84
* interrupts here to ensure we don't miss a wakeup call.
86
85
*/
87
-
void default_idle(void)
86
+
static void default_idle(void)
88
87
{
89
88
if (hlt_counter)
90
89
cpu_relax();
+1
-1
arch/arm/kernel/ptrace.c
+1
-1
arch/arm/kernel/ptrace.c
···
628
628
if (!test_ti_thread_flag(thread, TIF_USING_IWMMXT))
629
629
return -EACCES;
630
630
iwmmxt_task_release(thread); /* force a reload */
631
-
return copy_from_user(&thead->fpstate.iwmmxt, ufp, IWMMXT_SIZE)
631
+
return copy_from_user(&thread->fpstate.iwmmxt, ufp, IWMMXT_SIZE)
632
632
? -EFAULT : 0;
633
633
}
634
634
+2
-3
arch/arm/kernel/setup.c
+2
-3
arch/arm/kernel/setup.c
···
37
37
#include <asm/mach/irq.h>
38
38
#include <asm/mach/time.h>
39
39
40
+
#include "compat.h"
41
+
40
42
#ifndef MEM_SIZE
41
43
#define MEM_SIZE (16*1024*1024)
42
44
#endif
···
55
53
__setup("fpe=", fpe_setup);
56
54
#endif
57
55
58
-
extern unsigned int mem_fclk_21285;
59
56
extern void paging_init(struct meminfo *, struct machine_desc *desc);
60
-
extern void convert_to_tag_list(struct tag *tags);
61
-
extern void squash_mem_tags(struct tag *tag);
62
57
extern void reboot_setup(char *str);
63
58
extern int root_mountflags;
64
59
extern void _stext, _text, _etext, __data_start, _edata, _end;
+12
arch/arm/mach-s3c2410/devs.c
+12
arch/arm/mach-s3c2410/devs.c
···
334
334
335
335
};
336
336
337
+
static u64 s3c_device_spi0_dmamask = 0xffffffffUL;
338
+
337
339
struct platform_device s3c_device_spi0 = {
338
340
.name = "s3c2410-spi",
339
341
.id = 0,
340
342
.num_resources = ARRAY_SIZE(s3c_spi0_resource),
341
343
.resource = s3c_spi0_resource,
344
+
.dev = {
345
+
.dma_mask = &s3c_device_spi0_dmamask,
346
+
.coherent_dma_mask = 0xffffffffUL
347
+
}
342
348
};
343
349
344
350
EXPORT_SYMBOL(s3c_device_spi0);
···
365
359
366
360
};
367
361
362
+
static u64 s3c_device_spi1_dmamask = 0xffffffffUL;
363
+
368
364
struct platform_device s3c_device_spi1 = {
369
365
.name = "s3c2410-spi",
370
366
.id = 1,
371
367
.num_resources = ARRAY_SIZE(s3c_spi1_resource),
372
368
.resource = s3c_spi1_resource,
369
+
.dev = {
370
+
.dma_mask = &s3c_device_spi1_dmamask,
371
+
.coherent_dma_mask = 0xffffffffUL
372
+
}
373
373
};
374
374
375
375
EXPORT_SYMBOL(s3c_device_spi1);