Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 57895
b: refs/heads/master
c: 614c3c8
h: refs/heads/master
i:
  57893: d470f1d
  57891: db9c748
  57887: d65249b
v: v3
  • Loading branch information
Roland Dreier committed Jun 12, 2007
1 parent eeb71ff commit b50d5d0
Show file tree
Hide file tree
Showing 325 changed files with 7,226 additions and 7,006 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 044f620ac65d0d90727cdbd0c058e4d150d62ddc
refs/heads/master: 614c3c85b5b4c3776439d464939c123cce679dee
16 changes: 8 additions & 8 deletions trunk/CREDITS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3301,6 +3301,14 @@ S: 12725 SW Millikan Way, Suite 400
S: Beaverton, Oregon 97005
S: USA

N: Li Yang
E: leoli@freescale.com
D: Freescale Highspeed USB device driver
D: Freescale QE SoC support and Ethernet driver
S: B-1206 Jingmao Guojigongyu
S: 16 Baliqiao Nanjie, Beijing 101100
S: People's Repulic of China

N: Marcelo Tosatti
E: marcelo@kvack.org
D: v2.4 kernel maintainer
Expand Down Expand Up @@ -3718,14 +3726,6 @@ S: 542 West 112th Street, 5N
S: New York, New York 10025
S: USA

N: Li Yang
E: leoli@freescale.com
D: Freescale Highspeed USB device driver
D: Freescale QE SoC support and Ethernet driver
S: B-1206 Jingmao Guojigongyu
S: 16 Baliqiao Nanjie, Beijing 101100
S: People's Repulic of China

N: Victor Yodaiken
E: yodaiken@fsmlabs.com
D: RTLinux (RealTime Linux)
Expand Down
82 changes: 36 additions & 46 deletions trunk/MAINTAINERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -723,52 +723,42 @@ M: rpurdie@rpsys.net
S: Maintained

BLACKFIN ARCHITECTURE
P: Aubrey Li
M: aubrey.li@analog.com
P: Bernd Schmidt
M: bernd.schmidt@analog.com
P: Bryan Wu
M: bryan.wu@analog.com
P: Grace Pan
M: grace.pan@analog.com
P: Marc Hoffman
M: marc.hoffman@analog.com
P: Michael Hennerich
M: michael.hennerich@analog.com
P: Mike Frysinger
M: michael.frysinger@analog.com
P: Jerry Zeng
M: jerry.zeng@analog.com
P: Jie Zhang
M: jie.zhang@analog.com
P: Robin Getz
M: robin.getz@analog.com
P: Roy Huang
M: roy.huang@analog.com
P: Sonic Zhang
M: sonic.zhang@analog.com
P: Vivi Li
M: vivi.li@analog.com
P: Yi Li
M: yi.li@analog.com
L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
W: http://blackfin.uclinux.org
S: Supported

BLACKFIN RTC DRIVER
P: Mike Frysinger
M: michael.frysinger@analog.com
M: vapier.adi@gmail.com
L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
W: http://blackfin.uclinux.org
S: Supported
P: Aubrey Li
M: aubrey.li@analog.com
P: Bernd Schmidt
M: bernd.schmidt@analog.com
P: Bryan Wu
M: bryan.wu@analog.com
P: Grace Pan
M: grace.pan@analog.com
P: Michael Hennerich
M: michael.hennerich@analog.com
P: Mike Frysinger
M: michael.frysinger@analog.com
P: Jane Lv
M: jane.lv@analog.com
P: Jerry Zeng
M: jerry.zeng@analog.com
P: Jie Zhang
M: jie.zhang@analog.com
P: Robin Getz
M: robin.getz@analog.com
P: Roy Huang
M: roy.huang@analog.com
P: Sonic Zhang
M: sonic.zhang@analog.com
P: Yi Li
M: yi.li@analog.com
L: uclinux-dist-devel@blackfin.uclinux.org
W: http://blackfin.uclinux.org
S: Supported

BLACKFIN SERIAL DRIVER
P: Aubrey Li
M: aubrey.li@analog.com
L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
W: http://blackfin.uclinux.org
S: Supported
P: Aubrey Li
M: aubrey.li@analog.com
L: uclinux-dist-devel@blackfin.uclinux.org
W: http://blackfin.uclinux.org
S: Supported

BAYCOM/HDLCDRV DRIVERS FOR AX.25
P: Thomas Sailer
Expand Down Expand Up @@ -4022,11 +4012,11 @@ S: Supported

XFS FILESYSTEM
P: Silicon Graphics Inc
P: Tim Shimmin
P: Tim Shimmin, David Chatterton
M: xfs-masters@oss.sgi.com
L: xfs@oss.sgi.com
W: http://oss.sgi.com/projects/xfs
T: git git://oss.sgi.com:8090/xfs/xfs-2.6.git
T: git git://oss.sgi.com:8090/xfs/xfs-2.6
S: Supported

XILINX UARTLITE SERIAL DRIVER
Expand Down
4 changes: 2 additions & 2 deletions trunk/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 22
EXTRAVERSION = -rc5
NAME = Holy Dancing Manatees, Batman!
EXTRAVERSION = -rc4
NAME = Jeff Thinks I Should Change This, But To What?

# *DOCUMENTATION*
# To see a list of typical targets execute "make help"
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/arm/mach-s3c2440/mach-anubis.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ static struct map_desc anubis_iodesc[] __initdata = {
.length = SZ_4K,
.type = MT_DEVICE,
}, {
.virtual = (u32)ANUBIS_VA_IDREG,
.pfn = __phys_to_pfn(ANUBIS_PA_IDREG),
.virtual = (u32)ANUBIS_VA_CTRL2,
.pfn = __phys_to_pfn(ANUBIS_PA_CTRL2),
.length = SZ_4K,
.type = MT_DEVICE,
},
Expand Down
58 changes: 4 additions & 54 deletions trunk/arch/arm/mach-s3c2440/mach-osiris.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include <linux/timer.h>
#include <linux/init.h>
#include <linux/device.h>
#include <linux/sysdev.h>
#include <linux/serial_core.h>

#include <asm/mach/arch.h>
Expand Down Expand Up @@ -66,11 +65,6 @@ static struct map_desc osiris_iodesc[] __initdata = {
/* CPLD control registers */

{
.virtual = (u32)OSIRIS_VA_CTRL0,
.pfn = __phys_to_pfn(OSIRIS_PA_CTRL0),
.length = SZ_16K,
.type = MT_DEVICE,
}, {
.virtual = (u32)OSIRIS_VA_CTRL1,
.pfn = __phys_to_pfn(OSIRIS_PA_CTRL1),
.length = SZ_16K,
Expand All @@ -80,11 +74,6 @@ static struct map_desc osiris_iodesc[] __initdata = {
.pfn = __phys_to_pfn(OSIRIS_PA_CTRL2),
.length = SZ_16K,
.type = MT_DEVICE,
}, {
.virtual = (u32)OSIRIS_VA_IDREG,
.pfn = __phys_to_pfn(OSIRIS_PA_IDREG),
.length = SZ_16K,
.type = MT_DEVICE,
},
};

Expand Down Expand Up @@ -206,13 +195,13 @@ static void osiris_nand_select(struct s3c2410_nand_set *set, int slot)
pr_debug("osiris_nand: selecting slot %d (set %p,%p)\n",
slot, set, set->nr_map);

tmp = __raw_readb(OSIRIS_VA_CTRL0);
tmp &= ~OSIRIS_CTRL0_NANDSEL;
tmp = __raw_readb(OSIRIS_VA_CTRL1);
tmp &= ~OSIRIS_CTRL1_NANDSEL;
tmp |= slot;

pr_debug("osiris_nand: ctrl0 now %02x\n", tmp);
pr_debug("osiris_nand: ctrl1 now %02x\n", tmp);

__raw_writeb(tmp, OSIRIS_VA_CTRL0);
__raw_writeb(tmp, OSIRIS_VA_CTRL1);
}

static struct s3c2410_platform_nand osiris_nand_info = {
Expand Down Expand Up @@ -246,45 +235,10 @@ static struct platform_device osiris_pcmcia = {
.resource = osiris_pcmcia_resource,
};

/* Osiris power management device */

#ifdef CONFIG_PM
static unsigned char pm_osiris_ctrl0;

static int osiris_pm_suspend(struct sys_device *sd, pm_message_t state)
{
pm_osiris_ctrl0 = __raw_readb(OSIRIS_VA_CTRL0);
return 0;
}

static int osiris_pm_resume(struct sys_device *sd)
{
if (pm_osiris_ctrl0 & OSIRIS_CTRL0_FIX8)
__raw_writeb(OSIRIS_CTRL1_FIX8, OSIRIS_VA_CTRL1);

return 0;
}

#else
#define osiris_pm_suspend NULL
#define osiris_pm_resume NULL
#endif

static struct sysdev_class osiris_pm_sysclass = {
set_kset_name("mach-osiris"),
.suspend = osiris_pm_suspend,
.resume = osiris_pm_resume,
};

static struct sys_device osiris_pm_sysdev = {
.cls = &osiris_pm_sysclass,
};

/* Standard Osiris devices */

static struct platform_device *osiris_devices[] __initdata = {
&s3c_device_i2c,
&s3c_device_wdt,
&s3c_device_nand,
&osiris_pcmcia,
};
Expand Down Expand Up @@ -334,9 +288,6 @@ static void __init osiris_map_io(void)

static void __init osiris_init(void)
{
sysdev_class_register(&osiris_pm_sysclass);
sysdev_register(&osiris_pm_sysdev);

platform_add_devices(osiris_devices, ARRAY_SIZE(osiris_devices));
};

Expand All @@ -348,6 +299,5 @@ MACHINE_START(OSIRIS, "Simtec-OSIRIS")
.map_io = osiris_map_io,
.init_machine = osiris_init,
.init_irq = s3c24xx_init_irq,
.init_machine = osiris_init,
.timer = &s3c24xx_timer,
MACHINE_END
4 changes: 0 additions & 4 deletions trunk/arch/arm/vfp/entry.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ do_vfp:
add r10, r10, #TI_VFPSTATE @ r10 = workspace
ldr pc, [r4] @ call VFP entry point

ENTRY(vfp_null_entry)
mov pc, lr
ENDPROC(vfp_null_entry)

.LCvfp:
.word vfp_vector

Expand Down
5 changes: 1 addition & 4 deletions trunk/arch/arm/vfp/vfpmodule.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@
*/
void vfp_testing_entry(void);
void vfp_support_entry(void);
void vfp_null_entry(void);

void (*vfp_vector)(void) = vfp_null_entry;
void (*vfp_vector)(void) = vfp_testing_entry;
union vfp_state *last_VFP_context[NR_CPUS];

/*
Expand Down Expand Up @@ -322,10 +321,8 @@ static int __init vfp_init(void)
* The handler is already setup to just log calls, so
* we just need to read the VFPSID register.
*/
vfp_vector = vfp_testing_entry;
vfpsid = fmrx(FPSID);
barrier();
vfp_vector = vfp_null_entry;

printk(KERN_INFO "VFP support v0.3: ");
if (VFP_arch) {
Expand Down
1 change: 0 additions & 1 deletion trunk/arch/avr32/boards/atstk1000/atstk1002.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ static struct spi_board_info spi0_board_info[] __initdata = {
.modalias = "ltv350qv",
.max_speed_hz = 16000000,
.chip_select = 1,
.mode = SPI_MODE_3,
},
};

Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/avr32/mm/fault.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ asmlinkage void do_page_fault(unsigned long ecr, struct pt_regs *regs)
up_read(&mm->mmap_sem);

if (user_mode(regs)) {
if (exception_trace && printk_ratelimit())
if (exception_trace)
printk("%s%s[%d]: segfault at %08lx pc %08lx "
"sp %08lx ecr %lu\n",
is_init(tsk) ? KERN_EMERG : KERN_INFO,
Expand Down
35 changes: 35 additions & 0 deletions trunk/arch/blackfin/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,41 @@ config BFIN_IDLE_LED_PIN
default 0x08 if (BFIN533_STAMP && BFIN_IDLE_LED_NUM = 2)
default 0x10 if (BFIN533_STAMP && BFIN_IDLE_LED_NUM = 3)

comment "Console UART Setup"

choice
prompt "Baud Rate"
default BAUD_57600
config BAUD_9600
bool "9600"
config BAUD_19200
bool "19200"
config BAUD_38400
bool "38400"
config BAUD_57600
bool "57600"
config BAUD_115200
bool "115200"
endchoice

choice
prompt "Parity"
default BAUD_NO_PARITY
config BAUD_NO_PARITY
bool "No Parity"
config BAUD_PARITY
bool "Parity"
endchoice

choice
prompt "Stop Bits"
default BAUD_1_STOPBIT
config BAUD_1_STOPBIT
bool "1"
config BAUD_2_STOPBIT
bool "2"
endchoice

endmenu


Expand Down
Loading

0 comments on commit b50d5d0

Please sign in to comment.