[ARM] Add more syscalls

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5a059f1ac0ed0c937257027aed5da50241f5ec2b
Commit: 5a059f1ac0ed0c937257027aed5da50241f5ec2b
Parent: 99f5e9718185f07458ae70c2282c2153a2256c91
Author: Russell King <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 17 18:23:10 2006 +
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Sun Dec 17 18:23:31 2006 +

[ARM] Add more syscalls

Add:
  sys_unshare
  sys_set_robust_list
  sys_get_robust_list
  sys_splice
  sys_arm_sync_file_range
  sys_tee
  sys_vmsplice
  sys_move_pages
  sys_getcpu

Special note about sys_arm_sync_file_range(), which is implemented as:

asmlinkage long sys_arm_sync_file_range(int fd, unsigned int flags,
loff_t offset, loff_t nbytes)
{
return sys_sync_file_range(fd, offset, nbytes, flags);
}

We can't export sys_sync_file_range() directly on ARM because the
argument list someone picked does not fit in the available registers.
Would be nice if... there was an arch maintainer review mechanism for
new syscalls before they hit the kernel.

Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 arch/arm/kernel/calls.S   |   24 ++--
 arch/arm/kernel/sys_arm.c |   13 +
 include/asm-arm/unistd.h  |   12 
 3 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
index e8f7436..f7598cb 100644
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
@@ -110,7 +110,7 @@
CALL(sys_ni_syscall)/* was sys_profil */
CALL(sys_statfs)
 /* 100 */  CALL(sys_fstatfs)
-   CALL(sys_ni_syscall)
+   CALL(sys_ni_syscall)/* sys_ioperm */
CALL(OBSOLETE(ABI(sys_socketcall, sys_oabi_socketcall)))
CALL(sys_syslog)
CALL(sys_setitimer)
@@ -132,7 +132,7 @@
 /* 120 */  CALL(sys_clone_wrapper)
CALL(sys_setdomainname)
CALL(sys_newuname)
-   CALL(sys_ni_syscall)
+   CALL(sys_ni_syscall)/* modify_ldt */
CALL(sys_adjtimex)
 /* 125 */  CALL(sys_mprotect)
CALL(sys_sigprocmask)
@@ -146,7 +146,7 @@
CALL(sys_bdflush)
 /* 135 */  CALL(sys_sysfs)
CALL(sys_personality)
-   CALL(sys_ni_syscall)/* CALL(_sys_afs_syscall) */
+   CALL(sys_ni_syscall)/* reserved for afs_syscall */
CALL(sys_setfsuid16)
CALL(sys_setfsgid16)
 /* 140 */  CALL(sys_llseek)
@@ -175,7 +175,7 @@
CALL(sys_arm_mremap)
CALL(sys_setresuid16)
 /* 165 */  CALL(sys_getresuid16)
-   CALL(sys_ni_syscall)
+   CALL(sys_ni_syscall)/* vm86 */
CALL(sys_ni_syscall)/* was sys_query_module */
CALL(sys_poll)
CALL(sys_nfsservctl)
@@ -197,8 +197,8 @@
 /* 185 */  CALL(sys_capset)
CALL(sys_sigaltstack_wrapper)
CALL(sys_sendfile)
-   CALL(sys_ni_syscall)
-   CALL(sys_ni_syscall)
+   CALL(sys_ni_syscall)/* getpmsg */
+   CALL(sys_ni_syscall)/* putpmsg */
 /* 190 */  CALL(sys_vfork_wrapper)
CALL(sys_getrlimit)
CALL(sys_mmap2)
@@ -344,6 +344,18 @@
CALL(sys_readlinkat)
CALL(sys_fchmodat)
CALL(sys_faccessat)
+/* 335 */  CALL(sys_ni_syscall)/* eventually pselect6 */
+   CALL(sys_ni_syscall)/* eventually ppoll */
+   CALL(sys_unshare)
+   CALL(sys_set_robust_list)
+   CALL(sys_get_robust_list)
+/* 340 */  CALL(sys_splice)
+   CALL(sys_arm_sync_file_range)
+   CALL(sys_tee)
+   CALL(sys_vmsplice)
+   CALL(sys_move_pages)
+/* 345 */  CALL(sys_getcpu)
+   CALL(sys_ni_syscall)/* eventually epoll_pwait */
 #ifndef syscalls_counted
 .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
 #define syscalls_counted
diff --git a/arch/arm/kernel/sys_arm.c b/arch/arm/kernel/sys_arm.c
index 00c18d3..3d4fcbc 100644
--- a/arch/arm/kernel/sys_arm.c
+++ b/arch/arm/kernel/sys_arm.c
@@ -328,3 +328,16 @@ asmlinkage long sys_arm_fadvise64_64(int fd, int advice,
 {
return sys_fadvise64_64(fd, offset, len, advice);
 }
+
+/*
+ * Yet more syscall fsckage - we can't fit sys_sync_file_range's
+ * arguments into the available registers with EABI.  So, let's
+ * create an ARM specific syscall for this which has _sane_
+ * arguments.  (This incidentally also has an ABI-independent
+ * argument layout.)
+ */
+asmlinkage long sys_

[ARM] Fix BUG()s in ioremap() code

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c924aff853bdc1c9841dd22440f931fba5ab3a59
Commit: c924aff853bdc1c9841dd22440f931fba5ab3a59
Parent: 5a059f1ac0ed0c937257027aed5da50241f5ec2b
Author: Russell King <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 17 23:29:57 2006 +
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Sun Dec 17 23:29:57 2006 +

[ARM] Fix BUG()s in ioremap() code

We need to ensure that the area size is page aligned so that
remap_area_pte() doesn't increment the address past the end of
the desired area.

Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 arch/arm/mm/ioremap.c |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
index 3bb3951..251685f 100644
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
@@ -292,6 +292,8 @@ __ioremap_pfn(unsigned long pfn, unsigned long offset, 
size_t size,
if (pfn >= 0x10 && (__pfn_to_phys(pfn) & ~SUPERSECTION_MASK))
return NULL;
 
+   size = PAGE_ALIGN(size);
+
area = get_vm_area(size, VM_IOREMAP);
if (!area)
return NULL;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ARM] 4034/1: pxafb: Fix compile errors

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=46a34d68901c12621ef09f11a5d410b92f0643e4
Commit: 46a34d68901c12621ef09f11a5d410b92f0643e4
Parent: c924aff853bdc1c9841dd22440f931fba5ab3a59
Author: Richard Purdie <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 17 01:01:11 2006 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Sun Dec 17 23:37:45 2006 +

[ARM] 4034/1: pxafb: Fix compile errors

Fix pxafb compile failures when CONFIG_FB_PXA_PARAMETERS is enabled
after recent structure changes.

Signed-off-by: Richard Purdie <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 drivers/video/pxafb.c |   40 
 1 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 38eb0b6..b4947c8 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -1216,7 +1216,7 @@ static int __init pxafb_parse_options(struct device *dev, 
char *options)
done:
if (res_specified) {
dev_info(dev, "overriding resolution: %dx%d\n", 
xres, yres);
-   inf->xres = xres; inf->yres = yres;
+   inf->modes[0].xres = xres; inf->modes[0].yres = 
yres;
}
if (bpp_specified)
switch (bpp) {
@@ -1225,48 +1225,48 @@ static int __init pxafb_parse_options(struct device 
*dev, char *options)
case 4:
case 8:
case 16:
-   inf->bpp = bpp;
+   inf->modes[0].bpp = bpp;
dev_info(dev, "overriding bit depth: 
%d\n", bpp);
break;
default:
dev_err(dev, "Depth %d is not valid\n", 
bpp);
}
 } else if (!strncmp(this_opt, "pixclock:", 9)) {
-inf->pixclock = simple_strtoul(this_opt+9, NULL, 0);
-   dev_info(dev, "override pixclock: %ld\n", 
inf->pixclock);
+inf->modes[0].pixclock = simple_strtoul(this_opt+9, 
NULL, 0);
+   dev_info(dev, "override pixclock: %ld\n", 
inf->modes[0].pixclock);
 } else if (!strncmp(this_opt, "left:", 5)) {
-inf->left_margin = simple_strtoul(this_opt+5, NULL, 0);
-   dev_info(dev, "override left: %u\n", inf->left_margin);
+inf->modes[0].left_margin = simple_strtoul(this_opt+5, 
NULL, 0);
+   dev_info(dev, "override left: %u\n", 
inf->modes[0].left_margin);
 } else if (!strncmp(this_opt, "right:", 6)) {
-inf->right_margin = simple_strtoul(this_opt+6, NULL, 
0);
-   dev_info(dev, "override right: %u\n", 
inf->right_margin);
+inf->modes[0].right_margin = 
simple_strtoul(this_opt+6, NULL, 0);
+   dev_info(dev, "override right: %u\n", 
inf->modes[0].right_margin);
 } else if (!strncmp(this_opt, "upper:", 6)) {
-inf->upper_margin = simple_strtoul(this_opt+6, NULL, 
0);
-   dev_info(dev, "override upper: %u\n", 
inf->upper_margin);
+inf->modes[0].upper_margin = 
simple_strtoul(this_opt+6, NULL, 0);
+   dev_info(dev, "override upper: %u\n", 
inf->modes[0].upper_margin);
 } else if (!strncmp(this_opt, "lower:", 6)) {
-inf->lower_margin = simple_strtoul(this_opt+6, NULL, 
0);
-   dev_info(dev, "override lower: %u\n", 
inf->lower_margin);
+inf->modes[0].lower_margin = 
simple_strtoul(this_opt+6, NULL, 0);
+   dev_info(dev, "override lower: %u\n", 
inf->modes[0].lower_margin);
 } else if (!strncmp(this_opt, "hsynclen:", 9)) {
-inf->hsync_len = simple_strtoul(this_opt+9, NULL, 0);
-   dev_info(dev, "override hsynclen: %u\n", 
inf->hsync_len);
+inf->modes[0].hsync_len = simple_strtoul(this_opt+9, 
NULL, 0);
+   dev_info(dev, "override hsynclen: %u\n", 
inf->modes[0].hsync_len);
 } else if (!strncmp(this_opt, "vsynclen:", 9)) {
-inf->vsync_len = simple_strtoul(this_opt+9, NULL, 0);
-   dev_info(dev, "override vsynclen: %u\n", 
inf->vsync_len);
+inf->modes[0].vsync_len = simple_strtoul(this_opt+9, 
NULL, 0);
+   dev_info(dev, "override vsynclen: %u\n", 
inf->modes[0].vsync_len);
   

[ARM] 4035/1: fix collie compilation

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=2343217fb770ef2b172a12186c0cd0526bfb7d0c
Commit: 2343217fb770ef2b172a12186c0cd0526bfb7d0c
Parent: 46a34d68901c12621ef09f11a5d410b92f0643e4
Author: Pavel Machek <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 17 13:21:05 2006 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Sun Dec 17 23:37:47 2006 +

[ARM] 4035/1: fix collie compilation

Thanks to Al Viro, here's fix to 2.6.20-rc1-git, so that collie
compiles, again. It was broken by INIT_WORK changes.

Signed-off-by: Pavel Machek <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 drivers/video/sa1100fb.c |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index cd10b18..5d2a4a4 100644
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@@ -1200,9 +1200,9 @@ static void set_ctrlr_state(struct sa1100fb_info *fbi, 
u_int state)
  * Our LCD controller task (which is called when we blank or unblank)
  * via keventd.
  */
-static void sa1100fb_task(void *dummy)
+static void sa1100fb_task(struct work_struct *w)
 {
-   struct sa1100fb_info *fbi = dummy;
+   struct sa1100fb_info *fbi = container_of(w, struct sa1100fb_info, task);
u_int state = xchg(&fbi->task_state, -1);
 
set_ctrlr_state(fbi, state);
@@ -1444,7 +1444,7 @@ static struct sa1100fb_info * __init 
sa1100fb_init_fbinfo(struct device *dev)
  fbi->max_bpp / 8;
 
init_waitqueue_head(&fbi->ctrlr_wait);
-   INIT_WORK(&fbi->task, sa1100fb_task, fbi);
+   INIT_WORK(&fbi->task, sa1100fb_task);
init_MUTEX(&fbi->ctrlr_sem);
 
return fbi;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ARM] 4038/1: S3C24XX: Fix copyrights in include/asm-arm/arch-s3c2410 (core)

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f056076ea727f7c291daf17da4ae25af474f0c67
Commit: f056076ea727f7c291daf17da4ae25af474f0c67
Parent: 2343217fb770ef2b172a12186c0cd0526bfb7d0c
Author: Ben Dooks <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 17 19:59:20 2006 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Sun Dec 17 23:37:48 2006 +

[ARM] 4038/1: S3C24XX: Fix copyrights in include/asm-arm/arch-s3c2410 (core)

Fix copyright notices in include/asm-arm/arch-s3c2410
to actually have `Copyright` in the line. This patch
deals with all the core files.

Signed-off-by: Ben Dooks <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 include/asm-arm/arch-s3c2410/audio.h   |2 +-
 include/asm-arm/arch-s3c2410/hardware.h|4 ++--
 include/asm-arm/arch-s3c2410/iic.h |2 +-
 include/asm-arm/arch-s3c2410/leds-gpio.h   |2 +-
 include/asm-arm/arch-s3c2410/map.h |4 ++--
 include/asm-arm/arch-s3c2410/nand.h|4 ++--
 include/asm-arm/arch-s3c2410/system.h  |4 ++--
 include/asm-arm/arch-s3c2410/timex.h   |4 ++--
 include/asm-arm/arch-s3c2410/uncompress.h  |4 ++--
 include/asm-arm/arch-s3c2410/usb-control.h |4 ++--
 10 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/include/asm-arm/arch-s3c2410/audio.h 
b/include/asm-arm/arch-s3c2410/audio.h
index 7e0..65e0acf 100644
--- a/include/asm-arm/arch-s3c2410/audio.h
+++ b/include/asm-arm/arch-s3c2410/audio.h
@@ -1,6 +1,6 @@
 /* linux/include/asm-arm/arch-s3c2410/audio.h
  *
- * (c) 2004-2005 Simtec Electronics
+ * Copyright (c) 2004-2005 Simtec Electronics
  * http://www.simtec.co.uk/products/SWLINUX/
  * Ben Dooks <[EMAIL PROTECTED]>
  *
diff --git a/include/asm-arm/arch-s3c2410/hardware.h 
b/include/asm-arm/arch-s3c2410/hardware.h
index 871f8af..729565e 100644
--- a/include/asm-arm/arch-s3c2410/hardware.h
+++ b/include/asm-arm/arch-s3c2410/hardware.h
@@ -1,7 +1,7 @@
 /* linux/include/asm-arm/arch-s3c2410/hardware.h
  *
- * (c) 2003 Simtec Electronics
- *  Ben Dooks <[EMAIL PROTECTED]>
+ * Copyright (c) 2003 Simtec Electronics
+ * Ben Dooks <[EMAIL PROTECTED]>
  *
  * S3C2410 - hardware
  *
diff --git a/include/asm-arm/arch-s3c2410/iic.h 
b/include/asm-arm/arch-s3c2410/iic.h
index ed3d6c7..71211c8 100644
--- a/include/asm-arm/arch-s3c2410/iic.h
+++ b/include/asm-arm/arch-s3c2410/iic.h
@@ -1,6 +1,6 @@
 /* linux/include/asm-arm/arch-s3c2410/iic.h
  *
- * (c) 2004 Simtec Electronics
+ * Copyright (c) 2004 Simtec Electronics
  * Ben Dooks <[EMAIL PROTECTED]>
  *
  * S3C2410 - I2C Controller platfrom_device info
diff --git a/include/asm-arm/arch-s3c2410/leds-gpio.h 
b/include/asm-arm/arch-s3c2410/leds-gpio.h
index f07ed04..800846e 100644
--- a/include/asm-arm/arch-s3c2410/leds-gpio.h
+++ b/include/asm-arm/arch-s3c2410/leds-gpio.h
@@ -1,6 +1,6 @@
 /* linux/include/asm-arm/arch-s3c2410/leds-gpio.h
  *
- * (c) 2006 Simtec Electronics
+ * Copyright (c) 2006 Simtec Electronics
  * http://armlinux.simtec.co.uk/
  * Ben Dooks <[EMAIL PROTECTED]>
  *
diff --git a/include/asm-arm/arch-s3c2410/map.h 
b/include/asm-arm/arch-s3c2410/map.h
index 7895042..4ef4eeb 100644
--- a/include/asm-arm/arch-s3c2410/map.h
+++ b/include/asm-arm/arch-s3c2410/map.h
@@ -1,7 +1,7 @@
 /* linux/include/asm-arm/arch-s3c2410/map.h
  *
- * (c) 2003 Simtec Electronics
- *  Ben Dooks <[EMAIL PROTECTED]>
+ * Copyright (c) 2003 Simtec Electronics
+ * Ben Dooks <[EMAIL PROTECTED]>
  *
  * S3C2410 - Memory map definitions
  *
diff --git a/include/asm-arm/arch-s3c2410/nand.h 
b/include/asm-arm/arch-s3c2410/nand.h
index e350ae2..8816f7f 100644
--- a/include/asm-arm/arch-s3c2410/nand.h
+++ b/include/asm-arm/arch-s3c2410/nand.h
@@ -1,7 +1,7 @@
 /* linux/include/asm-arm/arch-s3c2410/nand.h
  *
- * (c) 2004 Simtec Electronics
- *  Ben Dooks <[EMAIL PROTECTED]>
+ * Copyright (c) 2004 Simtec Electronics
+ * Ben Dooks <[EMAIL PROTECTED]>
  *
  * S3C2410 - NAND device controller platfrom_device info
  *
diff --git a/include/asm-arm/arch-s3c2410/system.h 
b/include/asm-arm/arch-s3c2410/system.h
index 4f72a85..ecf250d 100644
--- a/include/asm-arm/arch-s3c2410/system.h
+++ b/include/asm-arm/arch-s3c2410/system.h
@@ -1,7 +1,7 @@
 /* linux/include/asm-arm/arch-s3c2410/system.h
  *
- * (c) 2003 Simtec Electronics
- *  Ben Dooks <[EMAIL PROTECTED]>
+ * Copyright (c) 2003 Simtec Electronics
+ * Ben Dooks <[EMAIL PROTECTED]>
  *
  * S3C2410 - System function defines and includes
  *
diff --git a/include/asm-arm/arch-s3c2410/timex.h 
b/include/asm-arm/arch-s3c2410/timex.h
index 703c337..c16a99c 100644
--- a/include/asm-arm/arch-s3c2410/timex.h
+++ b/include/asm-arm/arch-s3c2410/timex.h
@@ -1,7 +1,7 @@
 /* linux/include/asm-arm/arch-s3c2410/timex.h
  *
- * (c) 2003-2005 Simtec Electronics
- *  Ben Dooks <[EMAIL PROTECTED]>
+ * Copyright (c) 2003-2005 Simtec Electronics
+ * Ben Dooks <[EMAIL PR

[ARM] 4039/1: S3C24XX: Fix copyrights in include/asm-arm/arch-s3c2410 (mach)

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9d6be125ba8b7cd3af4832094bf3643e09d6e39b
Commit: 9d6be125ba8b7cd3af4832094bf3643e09d6e39b
Parent: f056076ea727f7c291daf17da4ae25af474f0c67
Author: Ben Dooks <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 17 20:02:01 2006 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Sun Dec 17 23:37:49 2006 +

[ARM] 4039/1: S3C24XX: Fix copyrights in include/asm-arm/arch-s3c2410 (mach)

Fix copyright notices in include/asm-arm/arch-s3c2410
to actually have `Copyright` in the line. This patch
deals with all the core files.

Signed-off-by: Ben Dooks <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 include/asm-arm/arch-s3c2410/anubis-cpld.h |2 +-
 include/asm-arm/arch-s3c2410/anubis-irq.h  |2 +-
 include/asm-arm/arch-s3c2410/anubis-map.h  |2 +-
 include/asm-arm/arch-s3c2410/bast-cpld.h   |4 ++--
 include/asm-arm/arch-s3c2410/bast-irq.h|4 ++--
 include/asm-arm/arch-s3c2410/bast-map.h|4 ++--
 include/asm-arm/arch-s3c2410/bast-pmu.h|2 +-
 include/asm-arm/arch-s3c2410/h1940-latch.h |2 +-
 include/asm-arm/arch-s3c2410/osiris-cpld.h |2 +-
 include/asm-arm/arch-s3c2410/vr1000-cpld.h |4 ++--
 include/asm-arm/arch-s3c2410/vr1000-irq.h  |4 ++--
 include/asm-arm/arch-s3c2410/vr1000-map.h  |4 ++--
 12 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/include/asm-arm/arch-s3c2410/anubis-cpld.h 
b/include/asm-arm/arch-s3c2410/anubis-cpld.h
index 40e8e27..dcebf6d 100644
--- a/include/asm-arm/arch-s3c2410/anubis-cpld.h
+++ b/include/asm-arm/arch-s3c2410/anubis-cpld.h
@@ -1,6 +1,6 @@
 /* linux/include/asm-arm/arch-s3c2410/anubis-cpld.h
  *
- * (c) 2005 Simtec Electronics
+ * Copyright (c) 2005 Simtec Electronics
  * http://www.simtec.co.uk/products/
  * Ben Dooks <[EMAIL PROTECTED]>
  *
diff --git a/include/asm-arm/arch-s3c2410/anubis-irq.h 
b/include/asm-arm/arch-s3c2410/anubis-irq.h
index 4b5f423..cd77a70 100644
--- a/include/asm-arm/arch-s3c2410/anubis-irq.h
+++ b/include/asm-arm/arch-s3c2410/anubis-irq.h
@@ -1,6 +1,6 @@
 /* linux/include/asm-arm/arch-s3c2410/anubis-irq.h
  *
- * (c) 2005 Simtec Electronics
+ * Copyright (c) 2005 Simtec Electronics
  * http://www.simtec.co.uk/products/
  * Ben Dooks <[EMAIL PROTECTED]>
  *
diff --git a/include/asm-arm/arch-s3c2410/anubis-map.h 
b/include/asm-arm/arch-s3c2410/anubis-map.h
index 058a210..ab076de 100644
--- a/include/asm-arm/arch-s3c2410/anubis-map.h
+++ b/include/asm-arm/arch-s3c2410/anubis-map.h
@@ -1,6 +1,6 @@
 /* linux/include/asm-arm/arch-s3c2410/anubis-map.h
  *
- * (c) 2005 Simtec Electronics
+ * Copyright (c) 2005 Simtec Electronics
  * http://www.simtec.co.uk/products/
  * Ben Dooks <[EMAIL PROTECTED]>
  *
diff --git a/include/asm-arm/arch-s3c2410/bast-cpld.h 
b/include/asm-arm/arch-s3c2410/bast-cpld.h
index 8969cff..034d2c5 100644
--- a/include/asm-arm/arch-s3c2410/bast-cpld.h
+++ b/include/asm-arm/arch-s3c2410/bast-cpld.h
@@ -1,7 +1,7 @@
 /* linux/include/asm-arm/arch-s3c2410/bast-cpld.h
  *
- * (c) 2003,2004 Simtec Electronics
- *  Ben Dooks <[EMAIL PROTECTED]>
+ * Copyright (c) 2003,2004 Simtec Electronics
+ * Ben Dooks <[EMAIL PROTECTED]>
  *
  * BAST - CPLD control constants
  *
diff --git a/include/asm-arm/arch-s3c2410/bast-irq.h 
b/include/asm-arm/arch-s3c2410/bast-irq.h
index 15ffa66..726c046 100644
--- a/include/asm-arm/arch-s3c2410/bast-irq.h
+++ b/include/asm-arm/arch-s3c2410/bast-irq.h
@@ -1,7 +1,7 @@
 /* linux/include/asm-arm/arch-s3c2410/bast-irq.h
  *
- * (c) 2003,2004 Simtec Electronics
- *  Ben Dooks <[EMAIL PROTECTED]>
+ * Copyright (c) 2003,2004 Simtec Electronics
+ * Ben Dooks <[EMAIL PROTECTED]>
  *
  * Machine BAST - IRQ Number definitions
  *
diff --git a/include/asm-arm/arch-s3c2410/bast-map.h 
b/include/asm-arm/arch-s3c2410/bast-map.h
index 727cef8..86ac1c1 100644
--- a/include/asm-arm/arch-s3c2410/bast-map.h
+++ b/include/asm-arm/arch-s3c2410/bast-map.h
@@ -1,7 +1,7 @@
 /* linux/include/asm-arm/arch-s3c2410/bast-map.h
  *
- * (c) 2003,2004 Simtec Electronics
- *  Ben Dooks <[EMAIL PROTECTED]>
+ * Copyright (c) 2003,2004 Simtec Electronics
+ * Ben Dooks <[EMAIL PROTECTED]>
  *
  * Machine BAST - Memory map definitions
  *
diff --git a/include/asm-arm/arch-s3c2410/bast-pmu.h 
b/include/asm-arm/arch-s3c2410/bast-pmu.h
index 8283602..37a11fe 100644
--- a/include/asm-arm/arch-s3c2410/bast-pmu.h
+++ b/include/asm-arm/arch-s3c2410/bast-pmu.h
@@ -1,6 +1,6 @@
 /* linux/include/asm-arm/arch-s3c2410/bast-pmu.h
  *
- * (c) 2003,2004 Simtec Electronics
+ * Copyright (c) 2003,2004 Simtec Electronics
  * Ben Dooks <[EMAIL PROTECTED]>
  * Vincent Sanders <[EMAIL PROTECTED]>
  *
diff --git a/include/asm-arm/arch-s3c2410/h1940-latch.h 
b/include/asm-arm/arch-s3c2410/h1940-latch.h
index c580241..22a7efd 100644
--- a/include/asm-arm/arch-s3c2410/h1940-latch.h
+++ b/include/asm-arm/arch-s3c2

[ARM] 4040/1: S3C24XX: Fix copyrights in arch/arm/mach-s3c2410

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c16f7bd8d48f64ba2d87ab821288815c9e35b14d
Commit: c16f7bd8d48f64ba2d87ab821288815c9e35b14d
Parent: 9d6be125ba8b7cd3af4832094bf3643e09d6e39b
Author: Ben Dooks <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 17 20:05:21 2006 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Sun Dec 17 23:37:51 2006 +

[ARM] 4040/1: S3C24XX: Fix copyrights in arch/arm/mach-s3c2410

Fix the copyright messages in arch/arm/mach-s3c2410
to actually have `Copyright` in the line.

Signed-off-by: Ben Dooks <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 arch/arm/mach-s3c2410/dma.c |2 +-
 arch/arm/mach-s3c2410/s3c2410-dma.c |2 +-
 arch/arm/mach-s3c2410/s3c2412-dma.c |2 +-
 arch/arm/mach-s3c2410/s3c2440-dma.c |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-s3c2410/dma.c b/arch/arm/mach-s3c2410/dma.c
index 01abb0a..717322a 100644
--- a/arch/arm/mach-s3c2410/dma.c
+++ b/arch/arm/mach-s3c2410/dma.c
@@ -1,6 +1,6 @@
 /* linux/arch/arm/mach-s3c2410/dma.c
  *
- * (c) 2003-2005,2006 Simtec Electronics
+ * Copyright (c) 2003-2005,2006 Simtec Electronics
  * Ben Dooks <[EMAIL PROTECTED]>
  *
  * S3C2410 DMA core
diff --git a/arch/arm/mach-s3c2410/s3c2410-dma.c 
b/arch/arm/mach-s3c2410/s3c2410-dma.c
index 51e5098..93cc31f 100644
--- a/arch/arm/mach-s3c2410/s3c2410-dma.c
+++ b/arch/arm/mach-s3c2410/s3c2410-dma.c
@@ -1,6 +1,6 @@
 /* linux/arch/arm/mach-s3c2410/s3c2410-dma.c
  *
- * (c) 2006 Simtec Electronics
+ * Copyright (c) 2006 Simtec Electronics
  * Ben Dooks <[EMAIL PROTECTED]>
  *
  * S3C2410 DMA selection
diff --git a/arch/arm/mach-s3c2410/s3c2412-dma.c 
b/arch/arm/mach-s3c2410/s3c2412-dma.c
index 171f370..dcf582a 100644
--- a/arch/arm/mach-s3c2410/s3c2412-dma.c
+++ b/arch/arm/mach-s3c2410/s3c2412-dma.c
@@ -1,6 +1,6 @@
 /* linux/arch/arm/mach-s3c2410/s3c2412-dma.c
  *
- * (c) 2006 Simtec Electronics
+ * Copyright (c) 2006 Simtec Electronics
  * Ben Dooks <[EMAIL PROTECTED]>
  *
  * S3C2412 DMA selection
diff --git a/arch/arm/mach-s3c2410/s3c2440-dma.c 
b/arch/arm/mach-s3c2410/s3c2440-dma.c
index 11e109c..e07ac72 100644
--- a/arch/arm/mach-s3c2410/s3c2440-dma.c
+++ b/arch/arm/mach-s3c2410/s3c2440-dma.c
@@ -1,6 +1,6 @@
 /* linux/arch/arm/mach-s3c2410/s3c2440-dma.c
  *
- * (c) 2006 Simtec Electronics
+ * Copyright (c) 2006 Simtec Electronics
  * Ben Dooks <[EMAIL PROTECTED]>
  *
  * S3C2440 DMA selection
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ARM] 4041/1: S3C24XX: Fix sparse errors from VA addresses

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=cdcb38352b6cf97241d4c3969f93f792026d18cc
Commit: cdcb38352b6cf97241d4c3969f93f792026d18cc
Parent: c16f7bd8d48f64ba2d87ab821288815c9e35b14d
Author: Ben Dooks <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 17 20:15:13 2006 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Sun Dec 17 23:37:52 2006 +

[ARM] 4041/1: S3C24XX: Fix sparse errors from VA addresses

Fix address-space conversion errors from passing addresses
generated from include/asm-arm/arch-s3c2410/map.h by adding
an __force argument to the `void __iomem *` for all the
virtual addresses.

Signed-off-by: Ben Dooks <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 include/asm-arm/arch-s3c2410/map.h |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/asm-arm/arch-s3c2410/map.h 
b/include/asm-arm/arch-s3c2410/map.h
index 4ef4eeb..6746114 100644
--- a/include/asm-arm/arch-s3c2410/map.h
+++ b/include/asm-arm/arch-s3c2410/map.h
@@ -25,7 +25,7 @@
  */
 
 #ifndef __ASSEMBLY__
-#define S3C2410_ADDR(x)  ((void __iomem *)0xF000 + (x))
+#define S3C2410_ADDR(x)  ((void __iomem __force *)0xF000 + (x))
 #else
 #define S3C2410_ADDR(x)  (0xF000 + (x))
 #endif
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ARM] 4042/1: H1940: Fix sparse errors from VA addresses

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=2d8c1cef84dcba462e1806c1223aecd97df33f99
Commit: 2d8c1cef84dcba462e1806c1223aecd97df33f99
Parent: cdcb38352b6cf97241d4c3969f93f792026d18cc
Author: Ben Dooks <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 17 20:18:40 2006 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Sun Dec 17 23:37:53 2006 +

[ARM] 4042/1: H1940: Fix sparse errors from VA addresses

Fix address-space conversion errors from passing addresses
generated from include/asm-arm/arch-s3c2410/map.h by adding
an __force argument to the `void __iomem *` for all the
virtual addresses.

Signed-off-by: Ben Dooks <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 include/asm-arm/arch-s3c2410/h1940-latch.h |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/asm-arm/arch-s3c2410/h1940-latch.h 
b/include/asm-arm/arch-s3c2410/h1940-latch.h
index 22a7efd..c3de5ab 100644
--- a/include/asm-arm/arch-s3c2410/h1940-latch.h
+++ b/include/asm-arm/arch-s3c2410/h1940-latch.h
@@ -16,7 +16,7 @@
 
 
 #ifndef __ASSEMBLY__
-#define H1940_LATCH((void __iomem *)0xF800)
+#define H1940_LATCH((void __force __iomem *)0xF800)
 #else
 #define H1940_LATCH0xF800
 #endif
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ARM] 4043/1: S3C24XX: fix sparse warnings in arch/arm/mach-s3c2410/s3c2440-clock.c

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e546e8af469ee97ffea8903b21c39e5131fd33bd
Commit: e546e8af469ee97ffea8903b21c39e5131fd33bd
Parent: 2d8c1cef84dcba462e1806c1223aecd97df33f99
Author: Ben Dooks <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 17 20:38:14 2006 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Sun Dec 17 23:37:54 2006 +

[ARM] 4043/1: S3C24XX: fix sparse warnings in 
arch/arm/mach-s3c2410/s3c2440-clock.c

Fix the sparse errors in arch/arm/mach-s3c2410/s3c2440-clock.c

warning: symbol 'clk_h' shadows an earlier one
warning: symbol 'clk_p' shadows an earlier one
warning: symbol 'clk_upll' shadows an earlier one

Signed-off-by: Ben Dooks <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 arch/arm/mach-s3c2410/s3c2440-clock.c |   24 
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/arch/arm/mach-s3c2410/s3c2440-clock.c 
b/arch/arm/mach-s3c2410/s3c2440-clock.c
index 1579686..ba13c1d 100644
--- a/arch/arm/mach-s3c2410/s3c2440-clock.c
+++ b/arch/arm/mach-s3c2410/s3c2440-clock.c
@@ -113,18 +113,18 @@ static int s3c2440_clk_add(struct sys_device *sysdev)
 {
unsigned long camdivn = __raw_readl(S3C2440_CAMDIVN);
unsigned long clkdivn;
-   struct clk *clk_h;
-   struct clk *clk_p;
-   struct clk *clk_upll;
+   struct clk *clock_h;
+   struct clk *clock_p;
+   struct clk *clock_upll;
 
printk("S3C2440: Clock Support, DVS %s\n",
   (camdivn & S3C2440_CAMDIVN_DVSEN) ? "on" : "off");
 
-   clk_p = clk_get(NULL, "pclk");
-   clk_h = clk_get(NULL, "hclk");
-   clk_upll = clk_get(NULL, "upll");
+   clock_p = clk_get(NULL, "pclk");
+   clock_h = clk_get(NULL, "hclk");
+   clock_upll = clk_get(NULL, "upll");
 
-   if (IS_ERR(clk_p) || IS_ERR(clk_h) || IS_ERR(clk_upll)) {
+   if (IS_ERR(clock_p) || IS_ERR(clock_h) || IS_ERR(clock_upll)) {
printk(KERN_ERR "S3C2440: Failed to get parent clocks\n");
return -EINVAL;
}
@@ -132,8 +132,8 @@ static int s3c2440_clk_add(struct sys_device *sysdev)
/* check rate of UPLL, and if it is near 96MHz, then change
 * to using half the UPLL rate for the system */
 
-   if (clk_get_rate(clk_upll) > (94 * MHZ)) {
-   clk_usb_bus.rate = clk_get_rate(clk_upll) / 2;
+   if (clk_get_rate(clock_upll) > (94 * MHZ)) {
+   clk_usb_bus.rate = clk_get_rate(clock_upll) / 2;
 
mutex_lock(&clocks_mutex);
 
@@ -144,9 +144,9 @@ static int s3c2440_clk_add(struct sys_device *sysdev)
mutex_unlock(&clocks_mutex);
}
 
-   s3c2440_clk_cam.parent = clk_h;
-   s3c2440_clk_ac97.parent = clk_p;
-   s3c2440_clk_cam_upll.parent = clk_upll;
+   s3c2440_clk_cam.parent = clock_h;
+   s3c2440_clk_ac97.parent = clock_p;
+   s3c2440_clk_cam_upll.parent = clock_upll;
 
s3c24xx_register_clock(&s3c2440_clk_ac97);
s3c24xx_register_clock(&s3c2440_clk_cam);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ARM] 4044/1: S3C24XX: fix sparse warnings in arch/arm/mach-s3c2410/s3c2442-clock.c

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3e940b6a90c346a224c97570a97a150a16f1c036
Commit: 3e940b6a90c346a224c97570a97a150a16f1c036
Parent: e546e8af469ee97ffea8903b21c39e5131fd33bd
Author: Ben Dooks <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 17 20:41:45 2006 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Sun Dec 17 23:37:56 2006 +

[ARM] 4044/1: S3C24XX: fix sparse warnings in 
arch/arm/mach-s3c2410/s3c2442-clock.c

Fix sparse errors in arch/arm/mach-s3c2410/s3c2442-clock.c

warning: symbol 'clk_h' shadows an earlier one
warning: symbol 'clk_p' shadows an earlier one
warning: symbol 'clk_upll' shadows an earlier one

Signed-off-by: Ben Dooks <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 arch/arm/mach-s3c2410/s3c2442-clock.c |   22 +++---
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/arch/arm/mach-s3c2410/s3c2442-clock.c 
b/arch/arm/mach-s3c2410/s3c2442-clock.c
index d9f54b5..4e292ca 100644
--- a/arch/arm/mach-s3c2410/s3c2442-clock.c
+++ b/arch/arm/mach-s3c2410/s3c2442-clock.c
@@ -117,18 +117,18 @@ static int s3c2442_clk_add(struct sys_device *sysdev)
 {
unsigned long camdivn = __raw_readl(S3C2440_CAMDIVN);
unsigned long clkdivn;
-   struct clk *clk_h;
-   struct clk *clk_p;
-   struct clk *clk_upll;
+   struct clk *clock_h;
+   struct clk *clock_p;
+   struct clk *clock_upll;
 
printk("S3C2442: Clock Support, DVS %s\n",
   (camdivn & S3C2440_CAMDIVN_DVSEN) ? "on" : "off");
 
-   clk_p = clk_get(NULL, "pclk");
-   clk_h = clk_get(NULL, "hclk");
-   clk_upll = clk_get(NULL, "upll");
+   clock_p = clk_get(NULL, "pclk");
+   clock_h = clk_get(NULL, "hclk");
+   clock_upll = clk_get(NULL, "upll");
 
-   if (IS_ERR(clk_p) || IS_ERR(clk_h) || IS_ERR(clk_upll)) {
+   if (IS_ERR(clock_p) || IS_ERR(clock_h) || IS_ERR(clock_upll)) {
printk(KERN_ERR "S3C2442: Failed to get parent clocks\n");
return -EINVAL;
}
@@ -136,8 +136,8 @@ static int s3c2442_clk_add(struct sys_device *sysdev)
/* check rate of UPLL, and if it is near 96MHz, then change
 * to using half the UPLL rate for the system */
 
-   if (clk_get_rate(clk_upll) > (94 * MHZ)) {
-   clk_usb_bus.rate = clk_get_rate(clk_upll) / 2;
+   if (clk_get_rate(clock_upll) > (94 * MHZ)) {
+   clk_usb_bus.rate = clk_get_rate(clock_upll) / 2;
 
mutex_lock(&clocks_mutex);
 
@@ -148,8 +148,8 @@ static int s3c2442_clk_add(struct sys_device *sysdev)
mutex_unlock(&clocks_mutex);
}
 
-   s3c2442_clk_cam.parent = clk_h;
-   s3c2442_clk_cam_upll.parent = clk_upll;
+   s3c2442_clk_cam.parent = clock_h;
+   s3c2442_clk_cam_upll.parent = clock_upll;
 
s3c24xx_register_clock(&s3c2442_clk_cam);
s3c24xx_register_clock(&s3c2442_clk_cam_upll);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ARM] 4045/1: S3C24XX: remove old VA for non-shared areas

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=58d19d6ea608077e83c30e58ae1494246b1f6b82
Commit: 58d19d6ea608077e83c30e58ae1494246b1f6b82
Parent: 3e940b6a90c346a224c97570a97a150a16f1c036
Author: Ben Dooks <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 17 20:50:55 2006 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Sun Dec 17 23:37:57 2006 +

[ARM] 4045/1: S3C24XX: remove old VA for non-shared areas

Remove old (and non-shared) VA addresses from the mappings
in arch/arm/mach-s3c2410/map.h and anywhere they are being
mapped in arch/arm/mach-s3c2410

Signed-off-by: Ben Dooks <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 arch/arm/mach-s3c2410/s3c2410.c|2 --
 arch/arm/mach-s3c2410/s3c2412.c|1 -
 arch/arm/mach-s3c2410/s3c244x.c|2 --
 include/asm-arm/arch-s3c2410/map.h |   24 ++--
 4 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/arch/arm/mach-s3c2410/s3c2410.c b/arch/arm/mach-s3c2410/s3c2410.c
index 183e403..1e5c504 100644
--- a/arch/arm/mach-s3c2410/s3c2410.c
+++ b/arch/arm/mach-s3c2410/s3c2410.c
@@ -38,11 +38,9 @@
 /* Initial IO mappings */
 
 static struct map_desc s3c2410_iodesc[] __initdata = {
-   IODESC_ENT(USBHOST),
IODESC_ENT(CLKPWR),
IODESC_ENT(LCD),
IODESC_ENT(TIMER),
-   IODESC_ENT(ADC),
IODESC_ENT(WATCHDOG),
 };
 
diff --git a/arch/arm/mach-s3c2410/s3c2412.c b/arch/arm/mach-s3c2410/s3c2412.c
index e76431c..a8cc8f8 100644
--- a/arch/arm/mach-s3c2410/s3c2412.c
+++ b/arch/arm/mach-s3c2410/s3c2412.c
@@ -60,7 +60,6 @@ static struct map_desc s3c2412_iodesc[] __initdata = {
IODESC_ENT(CLKPWR),
IODESC_ENT(LCD),
IODESC_ENT(TIMER),
-   IODESC_ENT(ADC),
IODESC_ENT(WATCHDOG),
 };
 
diff --git a/arch/arm/mach-s3c2410/s3c244x.c b/arch/arm/mach-s3c2410/s3c244x.c
index 9a22582..ffc0b21 100644
--- a/arch/arm/mach-s3c2410/s3c244x.c
+++ b/arch/arm/mach-s3c2410/s3c244x.c
@@ -47,8 +47,6 @@ static struct map_desc s3c244x_iodesc[] __initdata = {
IODESC_ENT(TIMER),
IODESC_ENT(WATCHDOG),
IODESC_ENT(LCD),
-   IODESC_ENT(ADC),
-   IODESC_ENT(USBHOST),
 };
 
 /* uart initialisation */
diff --git a/include/asm-arm/arch-s3c2410/map.h 
b/include/asm-arm/arch-s3c2410/map.h
index 6746114..4505aef 100644
--- a/include/asm-arm/arch-s3c2410/map.h
+++ b/include/asm-arm/arch-s3c2410/map.h
@@ -47,73 +47,65 @@
 #define S3C24XX_SZ_MEMCTRL SZ_1M
 
 /* USB host controller */
-#define S3C24XX_VA_USBHOST S3C2410_ADDR(0x0020)
 #define S3C2400_PA_USBHOST (0x1420)
 #define S3C2410_PA_USBHOST (0x4900)
 #define S3C24XX_SZ_USBHOST SZ_1M
 
 /* DMA controller */
-#define S3C24XX_VA_DMAS3C2410_ADDR(0x0030)
 #define S3C2400_PA_DMA(0x1460)
 #define S3C2410_PA_DMA(0x4B00)
 #define S3C24XX_SZ_DMASZ_1M
 
 /* Clock and Power management */
-#define S3C24XX_VA_CLKPWR  S3C2410_ADDR(0x0040)
+#define S3C24XX_VA_CLKPWR  S3C2410_ADDR(0x0020)
 #define S3C2400_PA_CLKPWR  (0x1480)
 #define S3C2410_PA_CLKPWR  (0x4C00)
 #define S3C24XX_SZ_CLKPWR  SZ_1M
 
 /* LCD controller */
-#define S3C24XX_VA_LCDS3C2410_ADDR(0x0060)
+#define S3C24XX_VA_LCDS3C2410_ADDR(0x0030)
 #define S3C2400_PA_LCD(0x14A0)
 #define S3C2410_PA_LCD(0x4D00)
 #define S3C24XX_SZ_LCDSZ_1M
 
 /* NAND flash controller */
-#define S3C24XX_VA_NAND   S3C2410_ADDR(0x0070)
 #define S3C2410_PA_NAND   (0x4E00)
 #define S3C24XX_SZ_NAND   SZ_1M
 
 /* MMC controller - available on the S3C2400 */
-#define S3C2400_VA_MMCS3C2400_ADDR(0x0070)
 #define S3C2400_PA_MMC(0x15A0)
 #define S3C2400_SZ_MMCSZ_1M
 
 /* UARTs */
-#define S3C24XX_VA_UART   S3C2410_ADDR(0x0080)
+#define S3C24XX_VA_UART   S3C2410_ADDR(0x0040)
 #define S3C2400_PA_UART   (0x1500)
 #define S3C2410_PA_UART   (0x5000)
 #define S3C24XX_SZ_UART   SZ_1M
 
 /* Timers */
-#define S3C24XX_VA_TIMER   S3C2410_ADDR(0x0090)
+#define S3C24XX_VA_TIMER   S3C2410_ADDR(0x0050)
 #define S3C2400_PA_TIMER   (0x1510)
 #define S3C2410_PA_TIMER   (0x5100)
 #define S3C24XX_SZ_TIMER   SZ_1M
 
 /* USB Device port */
-#define S3C24XX_VA_USBDEV  S3C2410_ADDR(0x00A0)
+#define S3C24XX_VA_USBDEV  S3C2410_ADDR(0x0060)
 #define S3C2400_PA_USBDEV  (0x15200140)
 #define S3C2410_PA_USBDEV  (0x5200)
 #define S3C24XX_SZ_USBDEV  SZ_1M
 
 /* Watchdog */
-#define S3C24XX_VA_WATCHDOG S3C2410_ADDR(0x00B0)
+#define S3C24XX_VA_WATCHDOG S3C2410_ADDR(0x0070)
 #define S3C2400_PA_WATCHDOG (0x1530)
 #define S3C2410_PA_WATCHDOG (0x5300)
 #define S3C24XX_SZ_WATCHDOG SZ_1M
 
 /* IIC hardware controller */
-#define S3C24XX_VA_IICS3C2410_ADDR(0x00C0)
 #define S3C2400_PA_IIC(0x1540)
 #define S3C2410_PA_IIC(0x5400)
 #define S3C24XX_SZ

[ARM] 4046/1: S3C24XX: fix sparse errors arch/arm/mach-s3c2410

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7ae9e420de165c2a992d116002d05655138d8f24
Commit: 7ae9e420de165c2a992d116002d05655138d8f24
Parent: 58d19d6ea608077e83c30e58ae1494246b1f6b82
Author: Ben Dooks <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 17 20:59:37 2006 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Sun Dec 17 23:37:58 2006 +

[ARM] 4046/1: S3C24XX: fix sparse errors arch/arm/mach-s3c2410

Fix the following sparse errors in arch/arm/mach-s3c2410
by fixing the include paths and making un-exported items
static.

s3c2410-clock.c:206:12: warning: symbol 's3c2410_baseclk_add' was not 
declared. Should it be static?
s3c2412-clock.c:559:17: warning: symbol 'clks_src' was not declared. Should 
it be static?
s3c2412-clock.c:622:12: warning: symbol 'clks' was not declared. Should it 
be static?
s3c2412-clock.c:630:12: warning: symbol 's3c2412_baseclk_add' was not 
declared. Should it be static?

Signed-off-by: Ben Dooks <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 arch/arm/mach-s3c2410/s3c2410-clock.c |4 
 arch/arm/mach-s3c2410/s3c2412-clock.c |   10 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-s3c2410/s3c2410-clock.c 
b/arch/arm/mach-s3c2410/s3c2410-clock.c
index 00abe19..5815aa0 100644
--- a/arch/arm/mach-s3c2410/s3c2410-clock.c
+++ b/arch/arm/mach-s3c2410/s3c2410-clock.c
@@ -31,12 +31,16 @@
 #include 
 #include 
 
+#include 
+
 #include 
 #include 
 
+#include 
 #include 
 #include 
 
+#include "s3c2410.h"
 #include "clock.h"
 #include "cpu.h"
 
diff --git a/arch/arm/mach-s3c2410/s3c2412-clock.c 
b/arch/arm/mach-s3c2410/s3c2412-clock.c
index c95ed3e..63f980c 100644
--- a/arch/arm/mach-s3c2410/s3c2412-clock.c
+++ b/arch/arm/mach-s3c2410/s3c2412-clock.c
@@ -31,12 +31,16 @@
 #include 
 #include 
 
+#include 
+
 #include 
 #include 
 
+#include 
 #include 
 #include 
 
+#include "s3c2412.h"
 #include "clock.h"
 #include "cpu.h"
 
@@ -49,7 +53,7 @@
  * set the correct muxing at initialisation
 */
 
-int s3c2412_clkcon_enable(struct clk *clk, int enable)
+static int s3c2412_clkcon_enable(struct clk *clk, int enable)
 {
unsigned int clocks = clk->ctrlbit;
unsigned long clkcon;
@@ -556,7 +560,7 @@ struct clk_init {
struct clk  *src_1;
 };
 
-struct clk_init clks_src[] __initdata = {
+static struct clk_init clks_src[] __initdata = {
{
.clk= &clk_usysclk,
.bit= S3C2412_CLKSRC_USBCLK_HCLK,
@@ -619,7 +623,7 @@ static void __init s3c2412_clk_initparents(void)
 
 /* clocks to add straight away */
 
-struct clk *clks[] __initdata = {
+static struct clk *clks[] __initdata = {
&clk_ext,
&clk_usb_bus,
&clk_erefclk,
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ARM] 4048/1: S3C24XX: make s3c2410_pm_resume() static

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9162b7dbf5652a4ae99980235cd8992223258408
Commit: 9162b7dbf5652a4ae99980235cd8992223258408
Parent: 7ae9e420de165c2a992d116002d05655138d8f24
Author: Ben Dooks <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 17 22:44:56 2006 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Sun Dec 17 23:37:59 2006 +

[ARM] 4048/1: S3C24XX: make s3c2410_pm_resume() static

Remove warning from s3c2410_pm_resume() not being
declared by making it static.

Signed-off-by: Ben Dooks <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 arch/arm/mach-s3c2410/s3c2410-pm.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-s3c2410/s3c2410-pm.c 
b/arch/arm/mach-s3c2410/s3c2410-pm.c
index 77c6814..e546fe1 100644
--- a/arch/arm/mach-s3c2410/s3c2410-pm.c
+++ b/arch/arm/mach-s3c2410/s3c2410-pm.c
@@ -87,7 +87,7 @@ static void s3c2410_pm_prepare(void)
 
 }
 
-int s3c2410_pm_resume(struct sys_device *dev)
+static int s3c2410_pm_resume(struct sys_device *dev)
 {
unsigned long tmp;
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ARM] 4049/1: S3C24XX: fix sparse warning due to upf_t in regs-serial.h

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b6d1f542e3f44f8988b601e3ca6277c143282179
Commit: b6d1f542e3f44f8988b601e3ca6277c143282179
Parent: 9162b7dbf5652a4ae99980235cd8992223258408
Author: Ben Dooks <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 17 23:22:26 2006 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Sun Dec 17 23:38:01 2006 +

[ARM] 4049/1: S3C24XX: fix sparse warning due to upf_t in regs-serial.h

Change the include/asm-arm/arch-s3c2410/regs-serial.h
platform data to use the prorper type (upf_t) for the
uart_flags.

Fix all the other parts of arch/arm/mach-s3c2410 to
include  and all other uses of
the include file.

mach-rx3715.c:101:18: warning: incorrect type in initializer (different 
base types)
mach-rx3715.c:101:18:expected unsigned long [unsigned] uart_flags
mach-rx3715.c:101:18:got restricted unsigned int [usertype] [force] 


Signed-off-by: Ben Dooks <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 arch/arm/mach-s3c2410/cpu.c|1 +
 arch/arm/mach-s3c2410/devs.c   |1 +
 arch/arm/mach-s3c2410/mach-anubis.c|1 +
 arch/arm/mach-s3c2410/mach-bast.c  |1 +
 arch/arm/mach-s3c2410/mach-h1940.c |3 +--
 arch/arm/mach-s3c2410/mach-n30.c   |3 +--
 arch/arm/mach-s3c2410/mach-nexcoder.c  |1 +
 arch/arm/mach-s3c2410/mach-osiris.c|1 +
 arch/arm/mach-s3c2410/mach-otom.c  |1 +
 arch/arm/mach-s3c2410/mach-smdk2410.c  |1 +
 arch/arm/mach-s3c2410/mach-smdk2413.c  |1 +
 arch/arm/mach-s3c2410/mach-smdk2440.c  |1 +
 arch/arm/mach-s3c2410/mach-vstms.c |1 +
 arch/arm/mach-s3c2410/pm-simtec.c  |1 -
 arch/arm/mach-s3c2410/pm.c |1 +
 arch/arm/mach-s3c2410/s3c2410-clock.c  |1 +
 arch/arm/mach-s3c2410/s3c2410-dma.c|1 +
 arch/arm/mach-s3c2410/s3c2410.c|1 +
 arch/arm/mach-s3c2410/s3c2412-clock.c  |1 +
 arch/arm/mach-s3c2410/s3c2412-dma.c|1 +
 arch/arm/mach-s3c2410/s3c2412.c|1 +
 arch/arm/mach-s3c2410/s3c2440-dma.c|1 +
 arch/arm/mach-s3c2410/s3c2440.c|1 +
 arch/arm/mach-s3c2410/s3c2442.c|1 +
 arch/arm/mach-s3c2410/s3c244x.c|1 +
 include/asm-arm/arch-s3c2410/regs-serial.h |2 +-
 include/asm-arm/arch-s3c2410/uncompress.h  |1 +
 27 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-s3c2410/cpu.c b/arch/arm/mach-s3c2410/cpu.c
index 9d4899e..ae1f5bb 100644
--- a/arch/arm/mach-s3c2410/cpu.c
+++ b/arch/arm/mach-s3c2410/cpu.c
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
diff --git a/arch/arm/mach-s3c2410/devs.c b/arch/arm/mach-s3c2410/devs.c
index cae35ff..faccde2 100644
--- a/arch/arm/mach-s3c2410/devs.c
+++ b/arch/arm/mach-s3c2410/devs.c
@@ -17,6 +17,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
diff --git a/arch/arm/mach-s3c2410/mach-anubis.c 
b/arch/arm/mach-s3c2410/mach-anubis.c
index e94cdcd..0fad0c2 100644
--- a/arch/arm/mach-s3c2410/mach-anubis.c
+++ b/arch/arm/mach-s3c2410/mach-anubis.c
@@ -15,6 +15,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
diff --git a/arch/arm/mach-s3c2410/mach-bast.c 
b/arch/arm/mach-s3c2410/mach-bast.c
index 2968fb2..b8b7675 100644
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
@@ -16,6 +16,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c 
b/arch/arm/mach-s3c2410/mach-h1940.c
index f5b9809..15b625e 100644
--- a/arch/arm/mach-s3c2410/mach-h1940.c
+++ b/arch/arm/mach-s3c2410/mach-h1940.c
@@ -17,6 +17,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -37,8 +38,6 @@
 #include 
 #include 
 
-#include 
-
 #include "clock.h"
 #include "devs.h"
 #include "cpu.h"
diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c
index 116ac31..0411e9a 100644
--- a/arch/arm/mach-s3c2410/mach-n30.c
+++ b/arch/arm/mach-s3c2410/mach-n30.c
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -37,8 +38,6 @@
 #include 
 #include 
 
-#include 
-
 #include "s3c2410.h"
 #include "clock.h"
 #include "devs.h"
diff --git a/arch/arm/mach-s3c2410/mach-nexcoder.c 
b/arch/arm/mach-s3c2410/mach-nexcoder.c
index 065a1d4..d6dfdad 100644
--- a/arch/arm/mach-s3c2410/mach-nexcoder.c
+++ b/arch/arm/mach-s3c2410/mach-nexcoder.c
@@ -19,6 +19,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
diff --git a/arch/arm/mach-s3c2410/mach-osiris.c 
b/arch/arm/mach-s3c2410/mach-osiris.c
index a4ab144..37b4085 100644
--- a/arch/arm/mach-s3c2410/mach-osiris.c
+++ b/arch/arm/mach-s3c2410/mach-osiris.c
@@ -16,6 +16,7 @@
 #include 
 #include 
 #

[ARM] 4050/1: S3C24XX: remove old changelogs in arch/arm/mach-s3c2410

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=92211ac71e189942968af57e5d0aed30083760ef
Commit: 92211ac71e189942968af57e5d0aed30083760ef
Parent: b6d1f542e3f44f8988b601e3ca6277c143282179
Author: Ben Dooks <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 17 23:26:13 2006 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Sun Dec 17 23:38:02 2006 +

[ARM] 4050/1: S3C24XX: remove old changelogs in arch/arm/mach-s3c2410

Remove old changelog entries in arch/arm/mach-s3c2410
which should be available from the version control
system.

Signed-off-by: Ben Dooks <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 arch/arm/mach-s3c2410/irq.h|2 --
 arch/arm/mach-s3c2410/s3c2440.h|7 ---
 arch/arm/mach-s3c2410/usb-simtec.h |3 ---
 3 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/arch/arm/mach-s3c2410/irq.h b/arch/arm/mach-s3c2410/irq.h
index 3686a00..e5913da 100644
--- a/arch/arm/mach-s3c2410/irq.h
+++ b/arch/arm/mach-s3c2410/irq.h
@@ -8,8 +8,6 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
- *
- * Modifications:
 */
 
 #define irqdbf(x...)
diff --git a/arch/arm/mach-s3c2410/s3c2440.h b/arch/arm/mach-s3c2410/s3c2440.h
index 29cb6df..a75616f 100644
--- a/arch/arm/mach-s3c2410/s3c2440.h
+++ b/arch/arm/mach-s3c2410/s3c2440.h
@@ -8,13 +8,6 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
- *
- * Modifications:
- * 24-Aug-2004 BJD  Start of S3C2440 CPU support
- * 04-Nov-2004 BJD  Added s3c2440_init_uarts()
- * 04-Jan-2005 BJD  Moved uart init to cpu code
- * 10-Jan-2005 BJD  Moved 2440 specific init here
- * 14-Jan-2005 BJD  Split the clock initialisation code
 */
 
 #ifdef CONFIG_CPU_S3C2440
diff --git a/arch/arm/mach-s3c2410/usb-simtec.h 
b/arch/arm/mach-s3c2410/usb-simtec.h
index d8aa612..03842ed 100644
--- a/arch/arm/mach-s3c2410/usb-simtec.h
+++ b/arch/arm/mach-s3c2410/usb-simtec.h
@@ -10,9 +10,6 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
- *
- * Modifications:
- * 20-Aug-2004 BJD  Created
 */
 
 extern int usb_simtec_init(void);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ARM] 4051/1: S3C24XX: clean includes in S3C2440 and S3C2442 support

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=994adcc36d8c2133fce01f4d3fe4e41007555913
Commit: 994adcc36d8c2133fce01f4d3fe4e41007555913
Parent: 92211ac71e189942968af57e5d0aed30083760ef
Author: Ben Dooks <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 17 23:32:21 2006 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Sun Dec 17 23:38:03 2006 +

[ARM] 4051/1: S3C24XX: clean includes in S3C2440 and S3C2442 support

Clean the includes in arch/arm/mach-s3c2410/s3c2440.c
and arch/arm/mach-s3c2410/s3c2442.c which should have
been pruned when these where split and updated.

Signed-off-by: Ben Dooks <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 arch/arm/mach-s3c2410/s3c2440.c |8 
 arch/arm/mach-s3c2410/s3c2440.h |   11 ---
 arch/arm/mach-s3c2410/s3c2442.c |   19 ---
 3 files changed, 0 insertions(+), 38 deletions(-)

diff --git a/arch/arm/mach-s3c2410/s3c2440.c b/arch/arm/mach-s3c2410/s3c2440.c
index b91b114..344eb27 100644
--- a/arch/arm/mach-s3c2410/s3c2440.c
+++ b/arch/arm/mach-s3c2410/s3c2440.c
@@ -29,17 +29,9 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-
 #include "s3c2440.h"
-#include "clock.h"
 #include "devs.h"
 #include "cpu.h"
-#include "pm.h"
 
 static struct sys_device s3c2440_sysdev = {
.cls= &s3c2440_sysclass,
diff --git a/arch/arm/mach-s3c2410/s3c2440.h b/arch/arm/mach-s3c2410/s3c2440.h
index a75616f..dcd3160 100644
--- a/arch/arm/mach-s3c2410/s3c2440.h
+++ b/arch/arm/mach-s3c2410/s3c2440.h
@@ -11,18 +11,7 @@
 */
 
 #ifdef CONFIG_CPU_S3C2440
-
 extern  int s3c2440_init(void);
-
-extern void s3c2440_map_io(struct map_desc *mach_desc, int size);
-
-extern void s3c2440_init_uarts(struct s3c2410_uartcfg *cfg, int no);
-
-extern void s3c2440_init_clocks(int xtal);
-
 #else
-#define s3c2440_init_clocks NULL
-#define s3c2440_init_uarts NULL
-#define s3c2440_map_io NULL
 #define s3c2440_init NULL
 #endif
diff --git a/arch/arm/mach-s3c2410/s3c2442.c b/arch/arm/mach-s3c2410/s3c2442.c
index e593cb0..428732e 100644
--- a/arch/arm/mach-s3c2410/s3c2442.c
+++ b/arch/arm/mach-s3c2410/s3c2442.c
@@ -16,30 +16,11 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
-#include 
-
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
 
 #include "s3c2442.h"
-#include "clock.h"
-#include "devs.h"
 #include "cpu.h"
-#include "pm.h"
 
 static struct sys_device s3c2442_sysdev = {
.cls= &s3c2442_sysclass,
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ARM] Fix warnings from asm/system.h

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=255d1f8639f5877381545d0da6821079ebad1c21
Commit: 255d1f8639f5877381545d0da6821079ebad1c21
Parent: 994adcc36d8c2133fce01f4d3fe4e41007555913
Author: Russell King <[EMAIL PROTECTED]>
AuthorDate: Mon Dec 18 00:12:47 2006 +
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Mon Dec 18 00:12:47 2006 +

[ARM] Fix warnings from asm/system.h

Move adjust_cr() into arch/arm/mm/mmu.c, and move irqflags.h to
a more appropriate place in the header file.

Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 arch/arm/mm/mmu.c|   20 
 include/asm-arm/system.h |   33 -
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index f028aef..655c837 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -154,6 +154,26 @@ static int __init noalign_setup(char *__unused)
 }
 __setup("noalign", noalign_setup);
 
+#ifndef CONFIG_SMP
+void adjust_cr(unsigned long mask, unsigned long set)
+{
+   unsigned long flags;
+
+   mask &= ~CR_A;
+
+   set &= mask;
+
+   local_irq_save(flags);
+
+   cr_no_alignment = (cr_no_alignment & ~mask) | set;
+   cr_alignment = (cr_alignment & ~mask) | set;
+
+   set_cr((get_cr() & ~mask) | set);
+
+   local_irq_restore(flags);
+}
+#endif
+
 struct mem_types {
unsigned intprot_pte;
unsigned intprot_l1;
diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h
index e160aeb..aa223fc 100644
--- a/include/asm-arm/system.h
+++ b/include/asm-arm/system.h
@@ -73,6 +73,7 @@
 #ifndef __ASSEMBLY__
 
 #include 
+#include 
 
 struct thread_info;
 struct task_struct;
@@ -139,6 +140,9 @@ static inline int cpu_is_xsc3(void)
 #definecpu_is_xscale() 1
 #endif
 
+extern unsigned long cr_no_alignment;  /* defined in entry-armv.S */
+extern unsigned long cr_alignment; /* defined in entry-armv.S */
+
 static inline unsigned int get_cr(void)
 {
unsigned int val;
@@ -152,6 +156,10 @@ static inline void set_cr(unsigned int val)
  : : "r" (val) : "cc");
 }
 
+#ifndef CONFIG_SMP
+extern void adjust_cr(unsigned long mask, unsigned long set);
+#endif
+
 #define CPACC_FULL(n)  (3 << (n * 2))
 #define CPACC_SVC(n)   (1 << (n * 2))
 #define CPACC_DISABLE(n)   (0 << (n * 2))
@@ -170,29 +178,6 @@ static inline void set_copro_access(unsigned int val)
  : : "r" (val) : "cc");
 }
 
-extern unsigned long cr_no_alignment;  /* defined in entry-armv.S */
-extern unsigned long cr_alignment; /* defined in entry-armv.S */
-
-#ifndef CONFIG_SMP
-static inline void adjust_cr(unsigned long mask, unsigned long set)
-{
-   unsigned long flags, cr;
-
-   mask &= ~CR_A;
-
-   set &= mask;
-
-   local_irq_save(flags);
-
-   cr_no_alignment = (cr_no_alignment & ~mask) | set;
-   cr_alignment = (cr_alignment & ~mask) | set;
-
-   set_cr((get_cr() & ~mask) | set);
-
-   local_irq_restore(flags);
-}
-#endif
-
 #define UDBG_UNDEFINED (1 << 0)
 #define UDBG_SYSCALL   (1 << 1)
 #define UDBG_BADABORT  (1 << 2)
@@ -248,8 +233,6 @@ static inline void sched_cacheflush(void)
 {
 }
 
-#include 
-
 #ifdef CONFIG_SMP
 
 #define smp_mb()   mb()
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ARM] 4052/1: S3C24XX: Fix PM in arch/arm/mach-s3c2410/Kconfig

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9bcb533c1338813085b0a35a6dd0887eb5a5af67
Commit: 9bcb533c1338813085b0a35a6dd0887eb5a5af67
Parent: 255d1f8639f5877381545d0da6821079ebad1c21
Author: Ben Dooks <[EMAIL PROTECTED]>
AuthorDate: Mon Dec 18 00:39:47 2006 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Mon Dec 18 00:14:53 2006 +

[ARM] 4052/1: S3C24XX: Fix PM in arch/arm/mach-s3c2410/Kconfig

Fix up the CONFIG_PM mixups in arch/arm/mach-s3c2410/Kconfig
causing CONFIG_S3C2410_PM and CONFIG_PM_H1940 to get enabled
permanently.

Signed-off-by: Ben Dooks <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 arch/arm/mach-s3c2410/Kconfig |   15 ++-
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index 9f46bf3..9ac6b5d 100644
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
@@ -43,14 +43,13 @@ config BAST_PC104_IRQ
 
 config PM_H1940
bool
-   depends on PM
help
  Internal node for H1940 and related PM
 
 config ARCH_H1940
bool "IPAQ H1940"
select CPU_S3C2410
-   select PM_H1940
+   select PM_H1940 if PM
help
  Say Y here if you are using the HP IPAQ H1940
 
@@ -122,7 +121,7 @@ config MACH_VR1000
 config MACH_RX3715
bool "HP iPAQ rx3715"
select CPU_S3C2440
-   select PM_H1940
+   select PM_H1940 if PM
help
  Say Y here if you are using the HP iPAQ rx3715.
 
@@ -156,7 +155,6 @@ config S3C2410_CLOCK
 
 config S3C2410_PM
bool
-   depends on CONFIG_PM
help
  Power Management code common to S3C2410 and better
 
@@ -171,7 +169,7 @@ config CPU_S3C2410
bool
depends on ARCH_S3C2410
select S3C2410_CLOCK
-   select S3C2410_PM
+   select S3C2410_PM if PM
help
  Support for S3C2410 and S3C2410A family from the S3C24XX line
  of Samsung Mobile CPUs.
@@ -186,14 +184,13 @@ config CPU_S3C2412_ONLY
 
 config S3C2412_PM
bool
-   default y if PM
-   depends on CPU_S3C2412
help
  Internal config node to apply S3C2412 power management
 
 config CPU_S3C2412
bool
depends on ARCH_S3C2410
+   select S3C2412_PM if PM
help
  Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line
 
@@ -207,7 +204,7 @@ config CPU_S3C2440
bool
depends on ARCH_S3C2410
select S3C2410_CLOCK
-   select S3C2410_PM
+   select S3C2410_PM if PM
select CPU_S3C244X
help
  Support for S3C2440 Samsung Mobile CPU based systems.
@@ -216,7 +213,7 @@ config CPU_S3C2442
bool
depends on ARCH_S3C2420
select S3C2410_CLOCK
-   select S3C2410_PM
+   select S3C2410_PM if PM
select CPU_S3C244X
help
  Support for S3C2442 Samsung Mobile CPU based systems.
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ARM] 4054/1: ep93xx: add HWCAP_CRUNCH

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=99e4a6dda9dc4b863773c0a5857b762474b817cf
Commit: 99e4a6dda9dc4b863773c0a5857b762474b817cf
Parent: 9bcb533c1338813085b0a35a6dd0887eb5a5af67
Author: Lennert Buytenhek <[EMAIL PROTECTED]>
AuthorDate: Mon Dec 18 00:59:10 2006 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Mon Dec 18 00:14:54 2006 +

[ARM] 4054/1: ep93xx: add HWCAP_CRUNCH

Add HWCAP_CRUNCH so that the dynamic linker knows whether it can
use Crunch-optimised libraries or not.

Signed-off-by: Lennert Buytenhek <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 arch/arm/kernel/setup.c |1 +
 arch/arm/mach-ep93xx/core.c |4 
 include/asm-arm/elf.h   |1 +
 3 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index cf2bd42..bbab134 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -855,6 +855,7 @@ static const char *hwcap_str[] = {
"edsp",
"java",
"iwmmxt",
+   "crunch",
NULL
 };
 
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
index d649b39..6b26346 100644
--- a/arch/arm/mach-ep93xx/core.c
+++ b/arch/arm/mach-ep93xx/core.c
@@ -477,4 +477,8 @@ void __init ep93xx_init_devices(void)
 
platform_device_register(&ep93xx_rtc_device);
platform_device_register(&ep93xx_ohci_device);
+
+#ifdef CONFIG_CRUNCH
+   elf_hwcap |= HWCAP_CRUNCH;
+#endif
 }
diff --git a/include/asm-arm/elf.h b/include/asm-arm/elf.h
index 642382d..3679a8a 100644
--- a/include/asm-arm/elf.h
+++ b/include/asm-arm/elf.h
@@ -52,6 +52,7 @@ typedef struct user_fp elf_fpregset_t;
 #define HWCAP_EDSP 128
 #define HWCAP_JAVA 256
 #define HWCAP_IWMMXT   512
+#define HWCAP_CRUNCH   1024
 
 #ifdef __KERNEL__
 #ifndef __ASSEMBLY__
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ARM] 4055/1: iop13xx: fix phys_io/io_pg_offst for iq81340mc/sc

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6d2e857d02a59332b7cd89aeac8b5962a357ac7a
Commit: 6d2e857d02a59332b7cd89aeac8b5962a357ac7a
Parent: 99e4a6dda9dc4b863773c0a5857b762474b817cf
Author: Lennert Buytenhek <[EMAIL PROTECTED]>
AuthorDate: Mon Dec 18 01:01:08 2006 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Mon Dec 18 00:14:56 2006 +

[ARM] 4055/1: iop13xx: fix phys_io/io_pg_offst for iq81340mc/sc

The phys_io/io_pg_offst machine record variables were being set
to bogus values, causing problems when enabling DEBUG_LL.

Signed-off-by: Lennert Buytenhek <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 arch/arm/mach-iop13xx/iq81340mc.c  |6 +++---
 arch/arm/mach-iop13xx/iq81340sc.c  |6 +++---
 include/asm-arm/arch-iop13xx/iq81340.h |5 +
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/arch/arm/mach-iop13xx/iq81340mc.c 
b/arch/arm/mach-iop13xx/iq81340mc.c
index ee59578..2a1bbfe 100644
--- a/arch/arm/mach-iop13xx/iq81340mc.c
+++ b/arch/arm/mach-iop13xx/iq81340mc.c
@@ -88,11 +88,11 @@ static struct sys_timer iq81340mc_timer = {
 
 MACHINE_START(IQ81340MC, "Intel IQ81340MC")
/* Maintainer: Dan Williams <[EMAIL PROTECTED]> */
-   .phys_io= PHYS_IO,
-   .io_pg_offst= IO_PG_OFFSET,
+   .phys_io= IOP13XX_PMMR_PHYS_MEM_BASE,
+   .io_pg_offst= (IOP13XX_PMMR_VIRT_MEM_BASE >> 18) & 0xfffc,
+   .boot_params= 0x0100,
.map_io = iop13xx_map_io,
.init_irq   = iop13xx_init_irq,
.timer  = &iq81340mc_timer,
-   .boot_params= BOOT_PARAM_OFFSET,
.init_machine   = iq81340mc_init,
 MACHINE_END
diff --git a/arch/arm/mach-iop13xx/iq81340sc.c 
b/arch/arm/mach-iop13xx/iq81340sc.c
index 6677e14..5ad2b62 100644
--- a/arch/arm/mach-iop13xx/iq81340sc.c
+++ b/arch/arm/mach-iop13xx/iq81340sc.c
@@ -90,11 +90,11 @@ static struct sys_timer iq81340sc_timer = {
 
 MACHINE_START(IQ81340SC, "Intel IQ81340SC")
/* Maintainer: Dan Williams <[EMAIL PROTECTED]> */
-   .phys_io= PHYS_IO,
-   .io_pg_offst= IO_PG_OFFSET,
+   .phys_io= IOP13XX_PMMR_PHYS_MEM_BASE,
+   .io_pg_offst= (IOP13XX_PMMR_VIRT_MEM_BASE >> 18) & 0xfffc,
+   .boot_params= 0x0100,
.map_io = iop13xx_map_io,
.init_irq   = iop13xx_init_irq,
.timer  = &iq81340sc_timer,
-   .boot_params= BOOT_PARAM_OFFSET,
.init_machine   = iq81340sc_init,
 MACHINE_END
diff --git a/include/asm-arm/arch-iop13xx/iq81340.h 
b/include/asm-arm/arch-iop13xx/iq81340.h
index b98f8f1..ba2cf93 100644
--- a/include/asm-arm/arch-iop13xx/iq81340.h
+++ b/include/asm-arm/arch-iop13xx/iq81340.h
@@ -24,8 +24,5 @@
 #define PBI_CF_IDE_BASE (IQ81340_CMP_FLSH)
 #define PBI_CF_BAR_ADDR (IOP13XX_PBI_BAR1)
 
-/* These are the values used in the Machine description */
-#define PHYS_IO 0xfe00
-#define IO_PG_OFFSET0xff00
-#define BOOT_PARAM_OFFSET  0x0100
+
 #endif /* _IQ81340_H_ */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ARM] 4056/1: iop13xx: fix resource.end off-by-one in flash setup

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ab9d90db956dec1a83f4c4ef443df6bdbfc3f25d
Commit: ab9d90db956dec1a83f4c4ef443df6bdbfc3f25d
Parent: 6d2e857d02a59332b7cd89aeac8b5962a357ac7a
Author: Lennert Buytenhek <[EMAIL PROTECTED]>
AuthorDate: Mon Dec 18 01:02:24 2006 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Mon Dec 18 00:14:58 2006 +

[ARM] 4056/1: iop13xx: fix resource.end off-by-one in flash setup

The struct resource 'end' field is inclusive, the iop13xx flash
setup code got this wrong.

Signed-off-by: Lennert Buytenhek <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 arch/arm/mach-iop13xx/setup.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-iop13xx/setup.c b/arch/arm/mach-iop13xx/setup.c
index 3756d2c..5fbeb28 100644
--- a/arch/arm/mach-iop13xx/setup.c
+++ b/arch/arm/mach-iop13xx/setup.c
@@ -337,7 +337,7 @@ void __init iop13xx_platform_init(void)
 
 #ifdef CONFIG_MTD_PHYSMAP
iq8134x_flash_resource.end = iq8134x_flash_resource.start +
-   iq8134x_probe_flash_size();
+   iq8134x_probe_flash_size() - 1;
if (iq8134x_flash_resource.end > iq8134x_flash_resource.start)
iop13xx_devices[plat_idx++] = &iq8134x_flash;
else
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ARM] 4057/1: ixp23xx: unconditionally enable hardware coherency

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c041ffb36407897bbc3b7bf87d1fa856ce085cdf
Commit: c041ffb36407897bbc3b7bf87d1fa856ce085cdf
Parent: ab9d90db956dec1a83f4c4ef443df6bdbfc3f25d
Author: Lennert Buytenhek <[EMAIL PROTECTED]>
AuthorDate: Mon Dec 18 01:04:09 2006 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Mon Dec 18 00:14:59 2006 +

[ARM] 4057/1: ixp23xx: unconditionally enable hardware coherency

On ixp23xx, it was thought to be necessary to disable coherency to work
around certain silicon errata.  This turns out not to be the case --
none of the documented errata workarounds require disabling coherency,
and disabling coherency does not work around any existing errata.

Furthermore, all ixp23xx models do support coherency, so we should just
unconditionally enable coherency for all ixp23xx.

Signed-off-by: Lennert Buytenhek <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 include/asm-arm/arch-ixp23xx/memory.h |   16 +---
 1 files changed, 1 insertions(+), 15 deletions(-)

diff --git a/include/asm-arm/arch-ixp23xx/memory.h 
b/include/asm-arm/arch-ixp23xx/memory.h
index c85fc06..6d859d7 100644
--- a/include/asm-arm/arch-ixp23xx/memory.h
+++ b/include/asm-arm/arch-ixp23xx/memory.h
@@ -41,21 +41,7 @@
data = *((volatile int *)IXP23XX_PCI_SDRAM_BAR);\
 __phys_to_virtb - (data & 0xfff0)) + 0x))); })
 
-/*
- * Coherency support.  Only supported on A2 CPUs or on A1
- * systems that have the cache coherency workaround.
- */
-static inline int __ixp23xx_arch_is_coherent(void)
-{
-   extern unsigned int processor_id;
-
-   if (((processor_id & 15) >= 4) || machine_is_roadrunner())
-   return 1;
-
-   return 0;
-}
-
-#define arch_is_coherent() __ixp23xx_arch_is_coherent()
+#define arch_is_coherent() 1
 
 #endif
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ARM] 4015/1: s3c2410 cpu ifdefs

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0f7d667ba341337b77b31ce81be04b16b3964cf6
Commit: 0f7d667ba341337b77b31ce81be04b16b3964cf6
Parent: c041ffb36407897bbc3b7bf87d1fa856ce085cdf
Author: Krzysztof Helt <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 12 15:02:32 2006 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Mon Dec 18 00:15:42 2006 +

[ARM] 4015/1: s3c2410 cpu ifdefs

The patch adds ifdefs around per cpu definitions. Otherwise, if
not all cpu types are selected, the kernel does not link.

Signed-off-by: Krzysztof Helt <[EMAIL PROTECTED]>
Signed-off-by: Ben Dooks <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 arch/arm/mach-s3c2410/s3c2410-dma.c |6 --
 arch/arm/mach-s3c2410/s3c2410-pm.c  |6 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-s3c2410/s3c2410-dma.c 
b/arch/arm/mach-s3c2410/s3c2410-dma.c
index 824a8f7..e67ba39 100644
--- a/arch/arm/mach-s3c2410/s3c2410-dma.c
+++ b/arch/arm/mach-s3c2410/s3c2410-dma.c
@@ -132,6 +132,7 @@ static int s3c2410_dma_add(struct sys_device *sysdev)
return s3c24xx_dma_init_map(&s3c2410_dma_sel);
 }
 
+#if defined(CONFIG_CPU_S3C2410)
 static struct sysdev_driver s3c2410_dma_driver = {
.add= s3c2410_dma_add,
 };
@@ -142,9 +143,10 @@ static int __init s3c2410_dma_init(void)
 }
 
 arch_initcall(s3c2410_dma_init);
+#endif
 
+#if defined(CONFIG_CPU_S3C2442)
 /* S3C2442 DMA contains the same selection table as the S3C2410 */
-
 static struct sysdev_driver s3c2442_dma_driver = {
.add= s3c2410_dma_add,
 };
@@ -155,5 +157,5 @@ static int __init s3c2442_dma_init(void)
 }
 
 arch_initcall(s3c2442_dma_init);
-
+#endif
 
diff --git a/arch/arm/mach-s3c2410/s3c2410-pm.c 
b/arch/arm/mach-s3c2410/s3c2410-pm.c
index e546fe1..8bb6e5e 100644
--- a/arch/arm/mach-s3c2410/s3c2410-pm.c
+++ b/arch/arm/mach-s3c2410/s3c2410-pm.c
@@ -111,6 +111,7 @@ static int s3c2410_pm_add(struct sys_device *dev)
return 0;
 }
 
+#if defined(CONFIG_CPU_S3C2410)
 static struct sysdev_driver s3c2410_pm_driver = {
.add= s3c2410_pm_add,
.resume = s3c2410_pm_resume,
@@ -124,7 +125,9 @@ static int __init s3c2410_pm_drvinit(void)
 }
 
 arch_initcall(s3c2410_pm_drvinit);
+#endif
 
+#if defined(CONFIG_CPU_S3C2440)
 static struct sysdev_driver s3c2440_pm_driver = {
.add= s3c2410_pm_add,
.resume = s3c2410_pm_resume,
@@ -136,7 +139,9 @@ static int __init s3c2440_pm_drvinit(void)
 }
 
 arch_initcall(s3c2440_pm_drvinit);
+#endif
 
+#if defined(CONFIG_CPU_S3C2442)
 static struct sysdev_driver s3c2442_pm_driver = {
.add= s3c2410_pm_add,
.resume = s3c2410_pm_resume,
@@ -148,3 +153,4 @@ static int __init s3c2442_pm_drvinit(void)
 }
 
 arch_initcall(s3c2442_pm_drvinit);
+#endif
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ARM] 4022/1: iop13xx: generic irq fixups

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3a2aeda86d9af50510b370cb01bc38aef213a36d
Commit: 3a2aeda86d9af50510b370cb01bc38aef213a36d
Parent: 0f7d667ba341337b77b31ce81be04b16b3964cf6
Author: Dan Williams <[EMAIL PROTECTED]>
AuthorDate: Thu Dec 14 23:31:20 2006 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Tue Dec 19 19:48:53 2006 +

[ARM] 4022/1: iop13xx: generic irq fixups

* use irq_chip
* use handle_level_irq

Signed-off-by: Dan Williams <[EMAIL PROTECTED]>
Signed-off-by: Lennert Buytenhek <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 arch/arm/mach-iop13xx/irq.c |   22 +-
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/arch/arm/mach-iop13xx/irq.c b/arch/arm/mach-iop13xx/irq.c
index c4d9c8c..dbbc07c 100644
--- a/arch/arm/mach-iop13xx/irq.c
+++ b/arch/arm/mach-iop13xx/irq.c
@@ -222,25 +222,29 @@ iop13xx_irq_unmask3(unsigned int irq)
iop13xx_cp6_restore(cp_flags);
 }
 
-static struct irqchip iop13xx_irqchip0 = {
+static struct irq_chip iop13xx_irqchip1 = {
+   .name   = "IOP13xx-1",
.ack= iop13xx_irq_mask0,
.mask   = iop13xx_irq_mask0,
.unmask = iop13xx_irq_unmask0,
 };
 
-static struct irqchip iop13xx_irqchip1 = {
+static struct irq_chip iop13xx_irqchip2 = {
+   .name   = "IOP13xx-2",
.ack= iop13xx_irq_mask1,
.mask   = iop13xx_irq_mask1,
.unmask = iop13xx_irq_unmask1,
 };
 
-static struct irqchip iop13xx_irqchip2 = {
+static struct irq_chip iop13xx_irqchip3 = {
+   .name   = "IOP13xx-3",
.ack= iop13xx_irq_mask2,
.mask   = iop13xx_irq_mask2,
.unmask = iop13xx_irq_unmask2,
 };
 
-static struct irqchip iop13xx_irqchip3 = {
+static struct irq_chip iop13xx_irqchip4 = {
+   .name   = "IOP13xx-4",
.ack= iop13xx_irq_mask3,
.mask   = iop13xx_irq_mask3,
.unmask = iop13xx_irq_unmask3,
@@ -270,15 +274,15 @@ void __init iop13xx_init_irq(void)
 
for(i = 0; i < NR_IOP13XX_IRQS; i++) {
if (i < 32)
-   set_irq_chip(i, &iop13xx_irqchip0);
-   else if (i < 64)
set_irq_chip(i, &iop13xx_irqchip1);
-   else if (i < 96)
+   else if (i < 64)
set_irq_chip(i, &iop13xx_irqchip2);
-   else
+   else if (i < 96)
set_irq_chip(i, &iop13xx_irqchip3);
+   else
+   set_irq_chip(i, &iop13xx_irqchip4);
 
-   set_irq_handler(i, do_level_IRQ);
+   set_irq_handler(i, handle_level_irq);
set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
}
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ARM] 4059/1: VR1000: fix LED3's platform device number

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=abac08d734151a51506deb35f10caa3b7830659a
Commit: abac08d734151a51506deb35f10caa3b7830659a
Parent: 3a2aeda86d9af50510b370cb01bc38aef213a36d
Author: Ben Dooks <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 19 19:10:13 2006 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Tue Dec 19 19:48:54 2006 +

[ARM] 4059/1: VR1000: fix LED3's platform device number

LED 3 should have been registered with the
platform deviceid of 3, instead of 1 (which
was used for LED 1).

Signed-off-by: Ben Dooks <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 arch/arm/mach-s3c2410/mach-vr1000.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-s3c2410/mach-vr1000.c 
b/arch/arm/mach-s3c2410/mach-vr1000.c
index e2eda39..a382fc0 100644
--- a/arch/arm/mach-s3c2410/mach-vr1000.c
+++ b/arch/arm/mach-s3c2410/mach-vr1000.c
@@ -352,7 +352,7 @@ static struct platform_device vr1000_led2 = {
 
 static struct platform_device vr1000_led3 = {
.name   = "s3c24xx_led",
-   .id = 1,
+   .id = 3,
.dev= {
.platform_data  = &vr1000_led3_pdata,
},
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ARM] 4061/1: xsc3: change of maintainer

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=57fee39f441ad6ac32ac3380eb2833a7d2d8c804
Commit: 57fee39f441ad6ac32ac3380eb2833a7d2d8c804
Parent: abac08d734151a51506deb35f10caa3b7830659a
Author: Lennert Buytenhek <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 19 21:48:15 2006 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Tue Dec 19 21:04:35 2006 +

[ARM] 4061/1: xsc3: change of maintainer

Deepak Saxena has agreed to hand xsc3 maintainership over to me.

Signed-off-by: Lennert Buytenhek <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 arch/arm/mm/proc-xsc3.S |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S
index 43494ae..94a5845 100644
--- a/arch/arm/mm/proc-xsc3.S
+++ b/arch/arm/mm/proc-xsc3.S
@@ -2,7 +2,7 @@
  * linux/arch/arm/mm/proc-xsc3.S
  *
  * Original Author: Matthew Gilbert
- * Current Maintainer: Deepak Saxena <[EMAIL PROTECTED]>
+ * Current Maintainer: Lennert Buytenhek <[EMAIL PROTECTED]>
  *
  * Copyright 2004 (C) Intel Corp.
  * Copyright 2005 (c) MontaVista Software, Inc.
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ARM] 4062/1: S3C24XX: Anubis and Osiris shuld have CONFIG_PM_SIMTEC

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=618b20a13e9ef4ed1d16f1ab94ccce8e4f55f9d9
Commit: 618b20a13e9ef4ed1d16f1ab94ccce8e4f55f9d9
Parent: 2d4ecdf5387a386588ae32e65f14c3c2569d9ef3
Author: Ben Dooks <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 19 23:46:17 2006 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Tue Dec 19 22:54:53 2006 +

[ARM] 4062/1: S3C24XX: Anubis and Osiris shuld have CONFIG_PM_SIMTEC

Both CONFIG_MACH_OSIRIS and CONFIG_MACH_ANUBIS
should select CONFIG_PM_SIMTEC.

This patch moves the selection of CONFIG_PM_SIMTEC
to the machines that require it, as currently done
with other machines in the S3C2410 architecture.

Signed-off-by: Ben Dooks <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 arch/arm/mach-s3c2410/Kconfig |   10 --
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index 9ac6b5d..eb4ec41 100644
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
@@ -5,6 +5,7 @@ menu "S3C24XX Implementations"
 config MACH_AML_M5900
bool "AML M5900 Series"
select CPU_S3C2410
+   select PM_SIMTEC if PM
help
   Say Y here if you are using the American Microsystems M5900 Series

@@ -12,6 +13,7 @@ config MACH_AML_M5900
 config MACH_ANUBIS
bool "Simtec Electronics ANUBIS"
select CPU_S3C2440
+   select PM_SIMTEC if PM
help
  Say Y here if you are using the Simtec Electronics ANUBIS
  development system
@@ -19,6 +21,7 @@ config MACH_ANUBIS
 config MACH_OSIRIS
bool "Simtec IM2440D20 (OSIRIS) module"
select CPU_S3C2440
+   select PM_SIMTEC if PM
help
  Say Y here if you are using the Simtec IM2440D20 module, also
  known as the Osiris.
@@ -26,6 +29,7 @@ config MACH_OSIRIS
 config ARCH_BAST
bool "Simtec Electronics BAST (EB2410ITX)"
select CPU_S3C2410
+   select PM_SIMTEC if PM
select ISA
help
  Say Y here if you are using the Simtec Electronics EB2410ITX
@@ -111,6 +115,7 @@ config MACH_SMDK2413
 
 config MACH_VR1000
bool "Thorcom VR1000"
+   select PM_SIMTEC if PM
select CPU_S3C2410
help
  Say Y here if you are using the Thorcom VR1000 board.
@@ -297,8 +302,9 @@ config S3C2410_PM_CHECK_CHUNKSIZE
 
 config PM_SIMTEC
bool
-   depends on PM && (ARCH_BAST || MACH_VR1000 || MACH_AML_M5900)
-   default y
+   help
+ Common power management code for systems that are
+ compatible with the Simtec style of power management
 
 config S3C2410_LOWLEVEL_UART_PORT
int "S3C2410 UART to use for low-level messages"
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ALSA] via82xx: add __devinitdata

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=082d6c673cae6565d874cd9f64ab304edaa8ef66
Commit: 082d6c673cae6565d874cd9f64ab304edaa8ef66
Parent: f238085415c56618e042252894f2fcc971add645
Author: Andreas Mohr <[EMAIL PROTECTED]>
AuthorDate: Wed Oct 4 17:15:04 2006 +0200
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:55:29 2006 +0100

[ALSA] via82xx: add __devinitdata

add __devinitdata to struct whitelist, since it's used within
a __devinit function.
Add const attribute to iterator variable, too.
Compile-tested (no section warnings etc.) and run-tested
on vt8233, 2.6.18-mm3 (hopefully applies well to current ALSA).

Signed-off-by: Andreas Mohr <[EMAIL PROTECTED]>
Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/pci/via82xx.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index 92b0736..674b842 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -2366,7 +2366,7 @@ struct dxs_whitelist {
 
 static int __devinit check_dxs_list(struct pci_dev *pci, int revision)
 {
-   static struct dxs_whitelist whitelist[] = {
+   static struct dxs_whitelist whitelist[] __devinitdata = {
{ .subvendor = 0x1005, .subdevice = 0x4710, .action = 
VIA_DXS_ENABLE }, /* Avance Logic Mobo */
{ .subvendor = 0x1019, .subdevice = 0x0996, .action = 
VIA_DXS_48K },
{ .subvendor = 0x1019, .subdevice = 0x0a81, .action = 
VIA_DXS_NO_VRA }, /* ECS K7VTA3 v8.0 */
@@ -2427,7 +2427,7 @@ static int __devinit check_dxs_list(struct pci_dev *pci, 
int revision)
{ .subvendor = 0x4005, .subdevice = 0x4710, .action = 
VIA_DXS_SRC },/* MSI K7T266 Pro2 (MS-6380 V2.0) BIOS 3.7 */
{ } /* terminator */
};
-   struct dxs_whitelist *w;
+   const struct dxs_whitelist *w;
unsigned short subsystem_vendor;
unsigned short subsystem_device;
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ALSA] sound/usb/usbaudio: Handle return value of usb_register()

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=cf78bbc4b1dca9ce14b665143cf693c35da47eb0
Commit: cf78bbc4b1dca9ce14b665143cf693c35da47eb0
Parent: 082d6c673cae6565d874cd9f64ab304edaa8ef66
Author: Tobias Klauser <[EMAIL PROTECTED]>
AuthorDate: Wed Oct 4 18:12:43 2006 +0200
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:55:31 2006 +0100

[ALSA] sound/usb/usbaudio: Handle return value of usb_register()

Handle the return value of usb_register() in the module_init function.

Signed-off-by: Tobias Klauser <[EMAIL PROTECTED]>
Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/usb/usbaudio.c |3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index 67202b9..3d7f36f 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -3577,8 +3577,7 @@ static int __init snd_usb_audio_init(void)
printk(KERN_WARNING "invalid nrpacks value.\n");
return -EINVAL;
}
-   usb_register(&usb_audio_driver);
-   return 0;
+   return usb_register(&usb_audio_driver);
 }
 
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ALSA] sound: Don't include i2c-dev.h

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=99b5aa3c10c7cff1e97239fda93649222fc12d25
Commit: 99b5aa3c10c7cff1e97239fda93649222fc12d25
Parent: cf78bbc4b1dca9ce14b665143cf693c35da47eb0
Author: Jean Delvare <[EMAIL PROTECTED]>
AuthorDate: Wed Oct 4 18:38:16 2006 +0200
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:55:32 2006 +0100

[ALSA] sound: Don't include i2c-dev.h

Don't include  as it's not needed.

Signed-off-by: Jean Delvare <[EMAIL PROTECTED]>
Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/aoa/codecs/snd-aoa-codec-onyx.h |1 -
 sound/aoa/codecs/snd-aoa-codec-tas.c  |1 -
 2 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/sound/aoa/codecs/snd-aoa-codec-onyx.h 
b/sound/aoa/codecs/snd-aoa-codec-onyx.h
index aeedda7..ffd2025 100644
--- a/sound/aoa/codecs/snd-aoa-codec-onyx.h
+++ b/sound/aoa/codecs/snd-aoa-codec-onyx.h
@@ -9,7 +9,6 @@
 #define __SND_AOA_CODEC_ONYX_H
 #include 
 #include 
-#include 
 #include 
 #include 
 
diff --git a/sound/aoa/codecs/snd-aoa-codec-tas.c 
b/sound/aoa/codecs/snd-aoa-codec-tas.c
index 9de8485..2cd81fa 100644
--- a/sound/aoa/codecs/snd-aoa-codec-tas.c
+++ b/sound/aoa/codecs/snd-aoa-codec-tas.c
@@ -61,7 +61,6 @@
  */
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ALSA] ac97_codec (ALC655): add EAPD hack for MSI L725 laptop

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e7d24f0bbd0eb0d9a6d337ef67d5e2ad78900488
Commit: e7d24f0bbd0eb0d9a6d337ef67d5e2ad78900488
Parent: 99b5aa3c10c7cff1e97239fda93649222fc12d25
Author: Jaroslav Kysela <[EMAIL PROTECTED]>
AuthorDate: Thu Oct 5 09:30:36 2006 +0200
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:55:34 2006 +0100

[ALSA] ac97_codec (ALC655): add EAPD hack for MSI L725 laptop

New PCI ID described and tested Spectr <[EMAIL PROTECTED]> .

Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/pci/ac97/ac97_patch.c |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c
index 15be6ba..f63025e 100644
--- a/sound/pci/ac97/ac97_patch.c
+++ b/sound/pci/ac97/ac97_patch.c
@@ -2261,7 +2261,8 @@ int patch_alc655(struct snd_ac97 * ac97)
else { /* ALC655 */
if (ac97->subsystem_vendor == 0x1462 &&
(ac97->subsystem_device == 0x0131 || /* MSI S270 laptop */
-ac97->subsystem_device == 0x0161)) /* LG K1 Express */
+ac97->subsystem_device == 0x0161 || /* LG K1 Express */
+ac97->subsystem_device == 0x0351))  /* MSI L725 laptop */
val &= ~(1 << 1); /* Pin 47 is EAPD (for internal 
speaker) */
else
val |= (1 << 1); /* Pin 47 is spdif input pin */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ALSA] use the roundup macro

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=201efe3793b0faab3538a463ad6d63cf0ef4403c
Commit: 201efe3793b0faab3538a463ad6d63cf0ef4403c
Parent: 7ab399262ee636d19db5163a35ac406d5b892a0a
Author: Clemens Ladisch <[EMAIL PROTECTED]>
AuthorDate: Mon Oct 9 08:14:15 2006 +0200
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:55:37 2006 +0100

[ALSA] use the roundup macro

Use the roundup macro instead of manual calculations.

Signed-off-by: Clemens Ladisch <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/core/seq/seq_memory.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c
index 4bffe50..a3dc5e0 100644
--- a/sound/core/seq/seq_memory.c
+++ b/sound/core/seq/seq_memory.c
@@ -151,7 +151,7 @@ int snd_seq_expand_var_event(const struct snd_seq_event 
*event, int count, char
return len;
newlen = len;
if (size_aligned > 0)
-   newlen = ((len + size_aligned - 1) / size_aligned) * 
size_aligned;
+   newlen = roundup(len, size_aligned);
if (count < newlen)
return -EAGAIN;
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ALSA] use the ALIGN macro

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7ab399262ee636d19db5163a35ac406d5b892a0a
Commit: 7ab399262ee636d19db5163a35ac406d5b892a0a
Parent: e7d24f0bbd0eb0d9a6d337ef67d5e2ad78900488
Author: Clemens Ladisch <[EMAIL PROTECTED]>
AuthorDate: Mon Oct 9 08:13:32 2006 +0200
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:55:36 2006 +0100

[ALSA] use the ALIGN macro

Use the ALIGN macro instead of manual calculations.

Signed-off-by: Clemens Ladisch <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/core/sgbuf.c|2 +-
 sound/isa/gus/gus_mem.c   |7 +++
 sound/isa/wavefront/wavefront_synth.c |2 +-
 sound/pci/bt87x.c |2 +-
 sound/pci/es1968.c|2 +-
 sound/pci/maestro3.c  |2 +-
 sound/pci/rme9652/hdsp.c  |4 ++--
 sound/pci/rme9652/rme9652.c   |4 ++--
 sound/pci/trident/trident_main.c  |4 ++--
 sound/pci/ymfpci/ymfpci_main.c|   24 
 10 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/sound/core/sgbuf.c b/sound/core/sgbuf.c
index c30669f..cefd228 100644
--- a/sound/core/sgbuf.c
+++ b/sound/core/sgbuf.c
@@ -27,7 +27,7 @@
 
 /* table entries are align to 32 */
 #define SGBUF_TBL_ALIGN32
-#define sgbuf_align_table(tbl) tbl) + SGBUF_TBL_ALIGN - 1) / 
SGBUF_TBL_ALIGN) * SGBUF_TBL_ALIGN)
+#define sgbuf_align_table(tbl) ALIGN((tbl), SGBUF_TBL_ALIGN)
 
 int snd_free_sgbuf_pages(struct snd_dma_buffer *dmab)
 {
diff --git a/sound/isa/gus/gus_mem.c b/sound/isa/gus/gus_mem.c
index f50c276..7107753 100644
--- a/sound/isa/gus/gus_mem.c
+++ b/sound/isa/gus/gus_mem.c
@@ -143,9 +143,8 @@ static int snd_gf1_mem_find(struct snd_gf1_mem * alloc,
struct snd_gf1_mem_block *pblock;
unsigned int ptr1, ptr2;
 
-   align--;
-   if (w_16 && align < 1)
-   align = 1;
+   if (w_16 && align < 2)
+   align = 2;
block->flags = w_16 ? SNDRV_GF1_MEM_BLOCK_16BIT : 0;
block->owner = SNDRV_GF1_MEM_OWNER_DRIVER;
block->share = 0;
@@ -165,7 +164,7 @@ static int snd_gf1_mem_find(struct snd_gf1_mem * alloc,
if (pblock->next->ptr < boundary)
ptr2 = pblock->next->ptr;
}
-   ptr1 = (pblock->ptr + pblock->size + align) & ~align;
+   ptr1 = ALIGN(pblock->ptr + pblock->size, align);
if (ptr1 >= ptr2)
continue;
size1 = ptr2 - ptr1;
diff --git a/sound/isa/wavefront/wavefront_synth.c 
b/sound/isa/wavefront/wavefront_synth.c
index bed329e..78020d8 100644
--- a/sound/isa/wavefront/wavefront_synth.c
+++ b/sound/isa/wavefront/wavefront_synth.c
@@ -1068,7 +1068,7 @@ wavefront_send_sample (snd_wavefront_t *dev,
blocksize = max_blksize;
} else {
/* round to nearest 16-byte value */
-   blocksize = ((length-written+7)&~0x7);
+   blocksize = ALIGN(length - written, 8);
}
 
if (snd_wavefront_cmd (dev, WFC_DOWNLOAD_BLOCK, NULL, NULL)) {
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index d33a370..05e0091 100644
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -699,7 +699,7 @@ static int __devinit snd_bt87x_pcm(struct snd_bt87x *chip, 
int device, char *nam
 SNDRV_DMA_TYPE_DEV_SG,
 
snd_dma_pci_data(chip->pci),
128 * 1024,
-   (255 * 4092 + 1023) & 
~1023);
+   ALIGN(255 * 4092, 
1024));
 }
 
 static int __devinit snd_bt87x_create(struct snd_card *card,
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index 092da53..01c521d 100644
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -1337,7 +1337,7 @@ static struct esm_memory *snd_es1968_new_memory(struct 
es1968 *chip, int size)
struct esm_memory *buf;
struct list_head *p;

-   size = ((size + ESM_MEM_ALIGN - 1) / ESM_MEM_ALIGN) * ESM_MEM_ALIGN;
+   size = ALIGN(size, ESM_MEM_ALIGN);
mutex_lock(&chip->memory_mutex);
list_for_each(p, &chip->buf_list) {
buf = list_entry(p, struct esm_memory, list);
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c
index 8cab342..563c9ec 100644
--- a/sound/pci/maestro3.c
+++ b/sound/pci/maestro3.c
@@ -2377,7 +2377,7 @@ static int __devinit snd_m3_assp_client_init(struct 
snd_m3 *chip, struct m3_dma
 * shifted list address is aligned.
 * list address = (mem address >> 1) >> 7;
 */
-   data_bytes = (data_bytes + 255) & ~255;

[ALSA] ymfpci: fix swap_rear for S/PDIF passthrough

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d9301263cce69ee4ef989de5bbe57515ef71a780
Commit: d9301263cce69ee4ef989de5bbe57515ef71a780
Parent: 201efe3793b0faab3538a463ad6d63cf0ef4403c
Author: Glen Masgai <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 10 09:27:19 2006 +0200
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:55:38 2006 +0100

[ALSA] ymfpci: fix swap_rear for S/PDIF passthrough

This patch fixes incorrect assignment of swap_rear,
which was broken since patch 'ymfpci - make rear channel swap optional'
It removes module_param rear_swap.

Signed-off-by: Glen Masgai <[EMAIL PROTECTED]>
Signed-off-by: Clemens Ladisch <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 include/sound/ymfpci.h |3 +--
 sound/pci/ymfpci/ymfpci.c  |5 +
 sound/pci/ymfpci/ymfpci_main.c |8 
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/include/sound/ymfpci.h b/include/sound/ymfpci.h
index d41cda9..a3c5de5 100644
--- a/include/sound/ymfpci.h
+++ b/include/sound/ymfpci.h
@@ -345,7 +345,6 @@ struct snd_ymfpci {
struct snd_kcontrol *spdif_pcm_ctl;
int mode_dup4ch;
int rear_opened;
-   int rear_swap;
int spdif_opened;
struct {
u16 left;
@@ -378,7 +377,7 @@ int snd_ymfpci_pcm(struct snd_ymfpci *chip, int device, 
struct snd_pcm **rpcm);
 int snd_ymfpci_pcm2(struct snd_ymfpci *chip, int device, struct snd_pcm 
**rpcm);
 int snd_ymfpci_pcm_spdif(struct snd_ymfpci *chip, int device, struct snd_pcm 
**rpcm);
 int snd_ymfpci_pcm_4ch(struct snd_ymfpci *chip, int device, struct snd_pcm 
**rpcm);
-int snd_ymfpci_mixer(struct snd_ymfpci *chip, int rear_switch, int rear_swap);
+int snd_ymfpci_mixer(struct snd_ymfpci *chip, int rear_switch);
 int snd_ymfpci_timer(struct snd_ymfpci *chip, int device);
 
 #endif /* __SOUND_YMFPCI_H */
diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c
index 186453f..fd9b7b8 100644
--- a/sound/pci/ymfpci/ymfpci.c
+++ b/sound/pci/ymfpci/ymfpci.c
@@ -49,7 +49,6 @@ static long mpu_port[SNDRV_CARDS];
 static long joystick_port[SNDRV_CARDS];
 #endif
 static int rear_switch[SNDRV_CARDS];
-static int rear_swap[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = 1 };
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for the Yamaha DS-1 PCI soundcard.");
@@ -67,8 +66,6 @@ MODULE_PARM_DESC(joystick_port, "Joystick port address");
 #endif
 module_param_array(rear_switch, bool, NULL, 0444);
 MODULE_PARM_DESC(rear_switch, "Enable shared rear/line-in switch");
-module_param_array(rear_swap, bool, NULL, 0444);
-MODULE_PARM_DESC(rear_swap, "Swap rear channels (must be enabled for correct 
IEC958 (S/PDIF)) output");
 
 static struct pci_device_id snd_ymfpci_ids[] = {
 { 0x1073, 0x0004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },   /* YMF724 */
@@ -298,7 +295,7 @@ static int __devinit snd_card_ymfpci_probe(struct pci_dev 
*pci,
snd_card_free(card);
return err;
}
-   if ((err = snd_ymfpci_mixer(chip, rear_switch[dev], rear_swap[dev])) < 
0) {
+   if ((err = snd_ymfpci_mixer(chip, rear_switch[dev])) < 0) {
snd_card_free(card);
return err;
}
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index 79c58f3..16be1f3 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -910,7 +910,7 @@ static int snd_ymfpci_playback_open(struct 
snd_pcm_substream *substream)
ypcm = runtime->private_data;
ypcm->output_front = 1;
ypcm->output_rear = chip->mode_dup4ch ? 1 : 0;
-   ypcm->swap_rear = chip->rear_swap;
+   ypcm->swap_rear = 0;
spin_lock_irq(&chip->reg_lock);
if (ypcm->output_rear) {
ymfpci_open_extension(chip);
@@ -936,6 +936,7 @@ static int snd_ymfpci_playback_spdif_open(struct 
snd_pcm_substream *substream)
ypcm = runtime->private_data;
ypcm->output_front = 0;
ypcm->output_rear = 1;
+   ypcm->swap_rear = 1;
spin_lock_irq(&chip->reg_lock);
snd_ymfpci_writew(chip, YDSXGR_SPDIFOUTCTRL,
  snd_ymfpci_readw(chip, YDSXGR_SPDIFOUTCTRL) | 2);
@@ -963,6 +964,7 @@ static int snd_ymfpci_playback_4ch_open(struct 
snd_pcm_substream *substream)
ypcm = runtime->private_data;
ypcm->output_front = 0;
ypcm->output_rear = 1;
+   ypcm->swap_rear = 0;
spin_lock_irq(&chip->reg_lock);
ymfpci_open_extension(chip);
chip->rear_opened++;
@@ -1755,7 +1757,7 @@ static void snd_ymfpci_mixer_free_ac97(struct snd_ac97 
*ac97)
chip->ac97 = NULL;
 }
 
-int __devinit snd_ymfpci_mixer(struct snd_ymfpci *chip, int rear_switch, int 
rear_swap)
+int __devinit snd_ymfpci_mixer(struct snd_ymfpci *chip, int rear_switch)
 {
struct snd_ac97_template ac97;

[ALSA] hda-codec - Fix wrong error checks in patch_{realtek,analog}.c

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=bd2033f27f346610b11b40a74ff7d1d023abcfd9
Commit: bd2033f27f346610b11b40a74ff7d1d023abcfd9
Parent: d9301263cce69ee4ef989de5bbe57515ef71a780
Author: Takashi Iwai <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 10 19:49:31 2006 +0200
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:55:39 2006 +0100

[ALSA] hda-codec - Fix wrong error checks in patch_{realtek,analog}.c

Fix wrong error checks of *_ch_mode_put() in patch_realtek.c and
patch_analog.c.  snd_hda_ch_mode_put() could return a positive
value for success, too.

Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/pci/hda/patch_analog.c  |2 +-
 sound/pci/hda/patch_realtek.c |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index edd22de..2e0db62 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -1640,7 +1640,7 @@ static int ad198x_ch_mode_put(struct snd_kcontrol 
*kcontrol,
int err = snd_hda_ch_mode_put(codec, ucontrol, spec->channel_mode,
  spec->num_channel_mode,
  &spec->multiout.max_channels);
-   if (! err && spec->need_dac_fix)
+   if (err >= 0 && spec->need_dac_fix)
spec->multiout.num_dacs = spec->multiout.max_channels / 2;
return err;
 }
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index fb96144..5f55679 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -271,7 +271,7 @@ static int alc_ch_mode_put(struct snd_kcontrol *kcontrol,
int err = snd_hda_ch_mode_put(codec, ucontrol, spec->channel_mode,
  spec->num_channel_mode,
  &spec->multiout.max_channels);
-   if (! err && spec->need_dac_fix)
+   if (err >= 0 && spec->need_dac_fix)
spec->multiout.num_dacs = spec->multiout.max_channels / 2;
return err;
 }
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ALSA] hda-codec - Don't return error at initialization of modem codec

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=83af036d9878dc5b7ba72efa52f066a25639740e
Commit: 83af036d9878dc5b7ba72efa52f066a25639740e
Parent: bd2033f27f346610b11b40a74ff7d1d023abcfd9
Author: Takashi Iwai <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 10 20:01:01 2006 +0200
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:55:41 2006 +0100

[ALSA] hda-codec - Don't return error at initialization of modem codec

Some modem codec seem to fail in the initialization, and this
stopped loading of the whole module although the audio is OK.
Since it's usually a non-fatal issue, the driver tries to proceed
to initialize now.

Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/pci/hda/patch_si3054.c |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/sound/pci/hda/patch_si3054.c b/sound/pci/hda/patch_si3054.c
index cc87dff..ed5e45e 100644
--- a/sound/pci/hda/patch_si3054.c
+++ b/sound/pci/hda/patch_si3054.c
@@ -243,7 +243,8 @@ static int si3054_init(struct hda_codec *codec)
 
if((val&SI3054_MEI_READY) != SI3054_MEI_READY) {
snd_printk(KERN_ERR "si3054: cannot initialize. EXT MID = 
%04x\n", val);
-   return -EACCES;
+   /* let's pray that this is no fatal error */
+   /* return -EACCES; */
}
 
SET_REG(codec, SI3054_GPIO_POLARITY, 0x);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ALSA] hdsp: precise_ptr control switched off by default

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=176546ab562fa696e56d67d4f1ea85851275ebf8
Commit: 176546ab562fa696e56d67d4f1ea85851275ebf8
Parent: 83af036d9878dc5b7ba72efa52f066a25639740e
Author: Remy Bruno <[EMAIL PROTECTED]>
AuthorDate: Mon Oct 16 12:32:53 2006 +0200
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:55:42 2006 +0100

[ALSA] hdsp: precise_ptr control switched off by default

precise_ptr option causes dysfunction with hdsp driver.
Turn it off as default.

Signed-off-by: Remy Bruno <[EMAIL PROTECTED]>
Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/pci/rme9652/hdsp.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index e31c10e..af2e59e 100644
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -4940,7 +4940,7 @@ static int __devinit snd_hdsp_create(struct snd_card 
*card,
}
 
hdsp->irq = pci->irq;
-   hdsp->precise_ptr = 1;
+   hdsp->precise_ptr = 0;
hdsp->use_midi_tasklet = 1;
 
if ((err = snd_hdsp_initialize_memory(hdsp)) < 0)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ALSA] hda-codec - Fix a typo

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3bc89529594767b0f894589f6c05b2d9821b6791
Commit: 3bc89529594767b0f894589f6c05b2d9821b6791
Parent: 176546ab562fa696e56d67d4f1ea85851275ebf8
Author: Takashi Iwai <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 17 20:41:38 2006 +0200
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:55:43 2006 +0100

[ALSA] hda-codec - Fix a typo

Fixed a typo in proc file.

Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/pci/hda/hda_proc.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c
index d737f17..e695655 100644
--- a/sound/pci/hda/hda_proc.c
+++ b/sound/pci/hda/hda_proc.c
@@ -45,7 +45,7 @@ static const char *get_wid_type_name(unsigned int wid_value)
if (names[wid_value])
return names[wid_value];
else
-   return "UNKOWN Widget";
+   return "UNKNOWN Widget";
 }
 
 static void print_amp_caps(struct snd_info_buffer *buffer,
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ALSA] pcm core: fix silence_start calculations

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9a826ddba6e087b1be24dd78cd0eac42f7eb7e97
Commit: 9a826ddba6e087b1be24dd78cd0eac42f7eb7e97
Parent: 3bc89529594767b0f894589f6c05b2d9821b6791
Author: Clemens Ladisch <[EMAIL PROTECTED]>
AuthorDate: Mon Oct 23 16:26:57 2006 +0200
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:55:43 2006 +0100

[ALSA] pcm core: fix silence_start calculations

The case where silence_size < boundary was broken because different
parts of the snd_pcm_playback_silence() function disagreed about whether
silence_start should point to the start or to the end of the buffer part
to be silenced.
This patch changes the code to always use to the start, which also
simplifies several calculations.

Signed-off-by: Clemens Ladisch <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/core/pcm_lib.c |8 +++-
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index 0bb142a..b336797 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -79,19 +79,17 @@ void snd_pcm_playback_silence(struct snd_pcm_substream 
*substream, snd_pcm_ufram
runtime->silence_filled -= frames;
if ((snd_pcm_sframes_t)runtime->silence_filled < 0) {
runtime->silence_filled = 0;
-   runtime->silence_start = (ofs + frames) - 
runtime->buffer_size;
+   runtime->silence_start = new_hw_ptr;
} else {
-   runtime->silence_start = ofs - 
runtime->silence_filled;
+   runtime->silence_start = ofs;
}
-   if ((snd_pcm_sframes_t)runtime->silence_start < 0)
-   runtime->silence_start += runtime->boundary;
}
frames = runtime->buffer_size - runtime->silence_filled;
}
snd_assert(frames <= runtime->buffer_size, return);
if (frames == 0)
return;
-   ofs = (runtime->silence_start + runtime->silence_filled) % 
runtime->buffer_size;
+   ofs = runtime->silence_start % runtime->buffer_size;
while (frames > 0) {
transfer = ofs + frames > runtime->buffer_size ? 
runtime->buffer_size - ofs : frames;
if (runtime->access == SNDRV_PCM_ACCESS_RW_INTERLEAVED ||
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ALSA] hda-codec - Add model for HP q965

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=efeccac5b79d3569112c886396935ce574f6af9e
Commit: efeccac5b79d3569112c886396935ce574f6af9e
Parent: 9a826ddba6e087b1be24dd78cd0eac42f7eb7e97
Author: Takashi Iwai <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 24 14:57:52 2006 +0200
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:55:45 2006 +0100

[ALSA] hda-codec - Add model for HP q965

Added a model entry (HP_BPC) for HP q965 with ALC262 codec.

Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/pci/hda/patch_realtek.c |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 5f55679..29e4c48 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -5872,6 +5872,8 @@ static struct hda_board_config alc262_cfg_tbl[] = {
{ .modelname = "hp-bpc", .config = ALC262_HP_BPC },
{ .pci_subvendor = 0x103c, .pci_subdevice = 0x280c,
  .config = ALC262_HP_BPC }, /* xw4400 */
+   { .pci_subvendor = 0x103c, .pci_subdevice = 0x2801,
+ .config = ALC262_HP_BPC }, /* q965 */
{ .pci_subvendor = 0x103c, .pci_subdevice = 0x3014,
  .config = ALC262_HP_BPC }, /* xw6400 */
{ .pci_subvendor = 0x103c, .pci_subdevice = 0x3015,
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ALSA] sound/core/control.c: remove dead code

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0e5d720ced4111cc75dd8cf66ab7b68607a0b306
Commit: 0e5d720ced4111cc75dd8cf66ab7b68607a0b306
Parent: efeccac5b79d3569112c886396935ce574f6af9e
Author: Adrian Bunk <[EMAIL PROTECTED]>
AuthorDate: Tue Nov 7 13:42:54 2006 +0100
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:55:46 2006 +0100

[ALSA] sound/core/control.c: remove dead code

This patch removes some obviously dead code spotted by the Coverity
checker.

Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/core/control.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/core/control.c b/sound/core/control.c
index 48ef0a0..0c7bcd6 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -1275,7 +1275,7 @@ static ssize_t snd_ctl_read(struct file *file, char 
__user *buffer,
schedule();
remove_wait_queue(&ctl->change_sleep, &wait);
if (signal_pending(current))
-   return result > 0 ? result : -ERESTARTSYS;
+   return -ERESTARTSYS;
spin_lock_irq(&ctl->read_lock);
}
kev = snd_kctl_event(ctl->events.next);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ALSA] hda-codec - Fix model for ASUS V1j laptop

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4a95cd86604740cf8cd27166e22a24944ed1e2f6
Commit: 4a95cd86604740cf8cd27166e22a24944ed1e2f6
Parent: 0e5d720ced4111cc75dd8cf66ab7b68607a0b306
Author: Takashi Iwai <[EMAIL PROTECTED]>
AuthorDate: Tue Nov 7 13:48:42 2006 +0100
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:55:47 2006 +0100

[ALSA] hda-codec - Fix model for ASUS V1j laptop

Add a proper model entry (laptop-eapd) for ASUS V1j laptop with
AD1986A codec.

Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/pci/hda/patch_analog.c |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 2e0db62..0790803 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -822,6 +822,8 @@ static struct hda_board_config ad1986a_cfg_tbl[] = {
  .config = AD1986A_LAPTOP_EAPD }, /* ASUS U5F */
{ .pci_subvendor = 0x1043, .pci_subdevice = 0x1297,
  .config = AD1986A_LAPTOP_EAPD }, /* ASUS Z62F */
+   { .pci_subvendor = 0x1043, .pci_subdevice = 0x12b3,
+ .config = AD1986A_LAPTOP_EAPD }, /* ASUS V1j */
{ .pci_subvendor = 0x103c, .pci_subdevice = 0x30af,
  .config = AD1986A_LAPTOP_EAPD }, /* HP Compaq Presario B2800 */
{ .pci_subvendor = 0x17aa, .pci_subdevice = 0x2066,
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ALSA] hda-codec - Fix detection of supported sample rates

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ee3527b0362e3b1b2e212d6161869aff9a8a98a0
Commit: ee3527b0362e3b1b2e212d6161869aff9a8a98a0
Parent: 4a95cd86604740cf8cd27166e22a24944ed1e2f6
Author: Takashi Iwai <[EMAIL PROTECTED]>
AuthorDate: Tue Nov 7 16:09:00 2006 +0100
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:55:48 2006 +0100

[ALSA] hda-codec - Fix detection of supported sample rates

Don't include 9.6kHz in the list of supported sample rates.
Since this rate isn't indicated in AC_PAR_PCM parameter,
the driver might guess wrongly as if it's available.

Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/pci/hda/hda_codec.c |3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 71482c1..18bbc87 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -1367,9 +1367,6 @@ static struct hda_rate_tbl rate_bits[] = {
{ 176400, SNDRV_PCM_RATE_176400, 0x5800 },/* 4 x 44 */
{ 192000, SNDRV_PCM_RATE_192000, 0x1800 }, /* 4 x 48 */
 
-   /* not autodetected value */
-   { 9600, SNDRV_PCM_RATE_KNOT, 0x0400 }, /* 1/5 x 48 */
-
{ 0 } /* terminator */
 };
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ALSA] hda-codec - Verbose proc output for PCM parameters

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b90d7760ea784f916cb1fc0d8123410f1f0c9194
Commit: b90d7760ea784f916cb1fc0d8123410f1f0c9194
Parent: ee3527b0362e3b1b2e212d6161869aff9a8a98a0
Author: Takashi Iwai <[EMAIL PROTECTED]>
AuthorDate: Tue Nov 7 16:10:06 2006 +0100
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:55:49 2006 +0100

[ALSA] hda-codec - Verbose proc output for PCM parameters

Make the output for PCM parameters more verbose, showing
each rate, bits and format.

Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/pci/hda/hda_proc.c |   51 ++---
 1 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c
index e695655..17df4d0 100644
--- a/sound/pci/hda/hda_proc.c
+++ b/sound/pci/hda/hda_proc.c
@@ -88,6 +88,48 @@ static void print_amp_vals(struct snd_info_buffer *buffer,
snd_iprintf(buffer, "\n");
 }
 
+static void print_pcm_rates(struct snd_info_buffer *buffer, unsigned int pcm)
+{
+   static unsigned int rates[] = {
+   8000, 11025, 16000, 22050, 32000, 44100, 48000, 88200,
+   96000, 176400, 192000, 384000
+   };
+   int i;
+
+   pcm &= AC_SUPPCM_RATES;
+   snd_iprintf(buffer, "rates [0x%x]:", pcm);
+   for (i = 0; i < ARRAY_SIZE(rates); i++) 
+   if (pcm & (1 << i))
+   snd_iprintf(buffer, " %d", rates[i]);
+   snd_iprintf(buffer, "\n");
+}
+
+static void print_pcm_bits(struct snd_info_buffer *buffer, unsigned int pcm)
+{
+   static unsigned int bits[] = { 8, 16, 20, 24, 32 };
+   int i;
+
+   pcm = (pcm >> 16) & 0xff;
+   snd_iprintf(buffer, "bits [0x%x]:", pcm);
+   for (i = 0; i < ARRAY_SIZE(bits); i++)
+   if (pcm & (1 << i))
+   snd_iprintf(buffer, " %d", bits[i]);
+   snd_iprintf(buffer, "\n");
+}
+
+static void print_pcm_formats(struct snd_info_buffer *buffer,
+ unsigned int streams)
+{
+   snd_iprintf(buffer, "formats [0x%x]:", streams & 0xf);
+   if (streams & AC_SUPFMT_PCM)
+   snd_iprintf(buffer, " PCM");
+   if (streams & AC_SUPFMT_FLOAT32)
+   snd_iprintf(buffer, " FLOAT");
+   if (streams & AC_SUPFMT_AC3)
+   snd_iprintf(buffer, " AC3");
+   snd_iprintf(buffer, "\n");
+}
+
 static void print_pcm_caps(struct snd_info_buffer *buffer,
   struct hda_codec *codec, hda_nid_t nid)
 {
@@ -97,8 +139,9 @@ static void print_pcm_caps(struct snd_info_buffer *buffer,
snd_iprintf(buffer, "N/A\n");
return;
}
-   snd_iprintf(buffer, "rates 0x%03x, bits 0x%02x, types 0x%x\n",
-   pcm & AC_SUPPCM_RATES, (pcm >> 16) & 0xff, stream & 0xf);
+   print_pcm_rates(buffer, pcm);
+   print_pcm_bits(buffer, pcm);
+   print_pcm_formats(buffer, stream);
 }
 
 static const char *get_jack_location(u32 cfg)
@@ -210,7 +253,7 @@ static void print_codec_info(struct snd_info_entry *entry, 
struct snd_info_buffe
snd_iprintf(buffer, "Revision Id: 0x%x\n", codec->revision_id);
if (! codec->afg)
return;
-   snd_iprintf(buffer, "Default PCM: ");
+   snd_iprintf(buffer, "Default PCM:\n");
print_pcm_caps(buffer, codec, codec->afg);
snd_iprintf(buffer, "Default Amp-In caps: ");
print_amp_caps(buffer, codec, codec->afg, HDA_INPUT);
@@ -278,7 +321,7 @@ static void print_codec_info(struct snd_info_entry *entry, 
struct snd_info_buffe
 
if ((wid_type == AC_WID_AUD_OUT || wid_type == AC_WID_AUD_IN) &&
(wid_caps & AC_WCAP_FORMAT_OVRD)) {
-   snd_iprintf(buffer, "  PCM: ");
+   snd_iprintf(buffer, "  PCM:\n");
print_pcm_caps(buffer, codec, nid);
}
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ALSA] ac97 - Fix potential negative array index

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c19bcdc64a13c6d7eedfdb46d705531e24e69cad
Commit: c19bcdc64a13c6d7eedfdb46d705531e24e69cad
Parent: b90d7760ea784f916cb1fc0d8123410f1f0c9194
Author: Takashi Iwai <[EMAIL PROTECTED]>
AuthorDate: Wed Nov 8 15:48:43 2006 +0100
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:55:50 2006 +0100

[ALSA] ac97 - Fix potential negative array index

Fix the case cidx2 >= 0 and cidx2 < 0 which may result in negative
array index.

Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/pci/ac97/ac97_patch.c |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c
index f63025e..e813968 100644
--- a/sound/pci/ac97/ac97_patch.c
+++ b/sound/pci/ac97/ac97_patch.c
@@ -1467,7 +1467,9 @@ static void patch_ad1881_chained(struct snd_ac97 * ac97, 
int unchained_idx, int
snd_ac97_write_cache(ac97, AC97_AD_CODEC_CFG, 0x0002);  // ID1C
ac97->spec.ad18xx.codec_cfg[unchained_idx] = 0x0002;
if (cidx1 >= 0) {
-   if (patch_ad1881_chained1(ac97, cidx1, 0x0006)) // SDIE 
| ID1C
+   if (cidx2 < 0)
+   patch_ad1881_chained1(ac97, cidx1, 0);
+   else if (patch_ad1881_chained1(ac97, cidx1, 0x0006))// SDIE 
| ID1C
patch_ad1881_chained1(ac97, cidx2, 0);
else if (patch_ad1881_chained1(ac97, cidx2, 0x0006))// SDIE 
| ID1C
patch_ad1881_chained1(ac97, cidx1, 0);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ALSA] hda-codec - fix typo in PCI IDs

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ba8bdf8584c6f8af6d009dfd716ea5ee37fc15cd
Commit: ba8bdf8584c6f8af6d009dfd716ea5ee37fc15cd
Parent: c19bcdc64a13c6d7eedfdb46d705531e24e69cad
Author: Christian Hesse <[EMAIL PROTECTED]>
AuthorDate: Wed Nov 8 15:50:41 2006 +0100
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:55:52 2006 +0100

[ALSA] hda-codec - fix typo in PCI IDs

my notebook is a Samsung X11 of course... The attached patch fixes the typo.

Signed-off-by: Christian Hesse <[EMAIL PROTECTED]>
Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/pci/hda/patch_analog.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 0790803..25b5787 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -811,7 +811,7 @@ static struct hda_board_config ad1986a_cfg_tbl[] = {
{ .pci_subvendor = 0x144d, .pci_subdevice = 0xc024,
  .config = AD1986A_LAPTOP_EAPD }, /* Samsung R65-T2300 Charis */
{ .pci_subvendor = 0x144d, .pci_subdevice = 0xc026,
- .config = AD1986A_LAPTOP_EAPD }, /* Samsung X10-T2300 Culesa */
+ .config = AD1986A_LAPTOP_EAPD }, /* Samsung X11-T2300 Culesa */
{ .pci_subvendor = 0x1043, .pci_subdevice = 0x1153,
  .config = AD1986A_LAPTOP_EAPD }, /* ASUS M9 */
{ .pci_subvendor = 0x1043, .pci_subdevice = 0x1213,
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ALSA] Fix races in PCM OSS emulation

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e3a5d59a17e9a42e3f3e0e37342b2679bab2ff43
Commit: e3a5d59a17e9a42e3f3e0e37342b2679bab2ff43
Parent: ba8bdf8584c6f8af6d009dfd716ea5ee37fc15cd
Author: Takashi Iwai <[EMAIL PROTECTED]>
AuthorDate: Tue Nov 14 13:03:19 2006 +0100
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:55:54 2006 +0100

[ALSA] Fix races in PCM OSS emulation

Fixed the race among multiple threads accessing the OSS PCM
instance concurrently by simply introducing a mutex for protecting
a setup of the PCM.

Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 include/sound/pcm_oss.h  |1 +
 sound/core/oss/pcm_oss.c |   52 +++--
 2 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/include/sound/pcm_oss.h b/include/sound/pcm_oss.h
index c854647..1cd4f64 100644
--- a/include/sound/pcm_oss.h
+++ b/include/sound/pcm_oss.h
@@ -56,6 +56,7 @@ struct snd_pcm_oss_runtime {
size_t mmap_bytes;
char *buffer;   /* vmallocated period */
size_t buffer_used; /* used length from period 
buffer */
+   struct mutex params_lock;
 #ifdef CONFIG_SND_PCM_OSS_PLUGINS
struct snd_pcm_plugin *plugin_first;
struct snd_pcm_plugin *plugin_last;
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index e0821eb..786a82e 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -810,6 +810,8 @@ static int snd_pcm_oss_change_params(struct 
snd_pcm_substream *substream)
struct snd_mask sformat_mask;
struct snd_mask mask;
 
+   if (mutex_lock_interruptible(&runtime->oss.params_lock))
+   return -EINTR;
sw_params = kmalloc(sizeof(*sw_params), GFP_KERNEL);
params = kmalloc(sizeof(*params), GFP_KERNEL);
sparams = kmalloc(sizeof(*sparams), GFP_KERNEL);
@@ -1020,6 +1022,7 @@ failure:
kfree(sw_params);
kfree(params);
kfree(sparams);
+   mutex_unlock(&runtime->oss.params_lock);
return err;
 }
 
@@ -1307,14 +1310,17 @@ static ssize_t snd_pcm_oss_write1(struct 
snd_pcm_substream *substream, const cha
 
if ((tmp = snd_pcm_oss_make_ready(substream)) < 0)
return tmp;
+   mutex_lock(&runtime->oss.params_lock);
while (bytes > 0) {
if (bytes < runtime->oss.period_bytes || 
runtime->oss.buffer_used > 0) {
tmp = bytes;
if (tmp + runtime->oss.buffer_used > 
runtime->oss.period_bytes)
tmp = runtime->oss.period_bytes - 
runtime->oss.buffer_used;
if (tmp > 0) {
-   if (copy_from_user(runtime->oss.buffer + 
runtime->oss.buffer_used, buf, tmp))
-   return xfer > 0 ? 
(snd_pcm_sframes_t)xfer : -EFAULT;
+   if (copy_from_user(runtime->oss.buffer + 
runtime->oss.buffer_used, buf, tmp)) {
+   tmp = -EFAULT;
+   goto err;
+   }
}
runtime->oss.buffer_used += tmp;
buf += tmp;
@@ -1325,22 +1331,24 @@ static ssize_t snd_pcm_oss_write1(struct 
snd_pcm_substream *substream, const cha
tmp = snd_pcm_oss_write2(substream, 
runtime->oss.buffer + runtime->oss.period_ptr, 
 
runtime->oss.buffer_used - runtime->oss.period_ptr, 1);
if (tmp <= 0)
-   return xfer > 0 ? 
(snd_pcm_sframes_t)xfer : tmp;
+   goto err;
runtime->oss.bytes += tmp;
runtime->oss.period_ptr += tmp;
runtime->oss.period_ptr %= 
runtime->oss.period_bytes;
if (runtime->oss.period_ptr == 0 ||
runtime->oss.period_ptr == 
runtime->oss.buffer_used)
runtime->oss.buffer_used = 0;
-   else if ((substream->f_flags & O_NONBLOCK) != 0)
-   return xfer > 0 ? xfer : -EAGAIN;
+   else if ((substream->f_flags & O_NONBLOCK) != 
0) {
+   tmp = -EAGAIN;
+   goto err;
+   }
}
} else {
tmp = snd_pcm_oss_write2(substream,
 (const char __force *)buf,
 runtime-

[ALSA] Fix invalid assignment of PCI revision

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=01f681da496831eb3aff5a908cefdafe74dd263b
Commit: 01f681da496831eb3aff5a908cefdafe74dd263b
Parent: e3a5d59a17e9a42e3f3e0e37342b2679bab2ff43
Author: Takashi Iwai <[EMAIL PROTECTED]>
AuthorDate: Thu Nov 16 15:39:07 2006 +0100
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:55:55 2006 +0100

[ALSA] Fix invalid assignment of PCI revision

Fix the type of PCI revision to char from int and avoid invalid
assignment with pointer cast.

Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 include/sound/ymfpci.h |2 +-
 sound/pci/ca0106/ca0106.h  |2 +-
 sound/pci/ca0106/ca0106_main.c |2 +-
 sound/pci/emu10k1/emu10k1x.c   |4 ++--
 sound/pci/ymfpci/ymfpci_main.c |2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/sound/ymfpci.h b/include/sound/ymfpci.h
index a3c5de5..f3514ee 100644
--- a/include/sound/ymfpci.h
+++ b/include/sound/ymfpci.h
@@ -286,7 +286,7 @@ struct snd_ymfpci {
int irq;
 
unsigned int device_id; /* PCI device ID */
-   unsigned int rev;   /* PCI revision */
+   unsigned char rev;  /* PCI revision */
unsigned long reg_area_phys;
void __iomem *reg_area_virt;
struct resource *res_reg_area;
diff --git a/sound/pci/ca0106/ca0106.h b/sound/pci/ca0106/ca0106.h
index 9cb66c5..aaac6e5 100644
--- a/sound/pci/ca0106/ca0106.h
+++ b/sound/pci/ca0106/ca0106.h
@@ -590,7 +590,7 @@ struct snd_ca0106 {
struct resource *res_port;
int irq;
 
-   unsigned int revision;  /* chip revision */
+   unsigned char revision; /* chip revision */
unsigned int serial;/* serial number */
unsigned short model;   /* subsystem id */
 
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index 6fa4a30..2adbd00 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -1283,7 +1283,7 @@ static int __devinit snd_ca0106_create(struct snd_card 
*card,
 
pci_set_master(pci);
/* read revision & serial */
-   pci_read_config_byte(pci, PCI_REVISION_ID, (char *)&chip->revision);
+   pci_read_config_byte(pci, PCI_REVISION_ID, &chip->revision);
pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &chip->serial);
pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &chip->model);
 #if 1
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index c46905a..e072439 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -235,7 +235,7 @@ struct emu10k1x {
struct resource *res_port;
int irq;
 
-   unsigned int revision;  /* chip revision */
+   unsigned char revision; /* chip revision */
unsigned int serial;/* serial number */
unsigned short model;   /* subsystem id */
 
@@ -943,7 +943,7 @@ static int __devinit snd_emu10k1x_create(struct snd_card 
*card,
 
pci_set_master(pci);
/* read revision & serial */
-   pci_read_config_byte(pci, PCI_REVISION_ID, (char *)&chip->revision);
+   pci_read_config_byte(pci, PCI_REVISION_ID, &chip->revision);
pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &chip->serial);
pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &chip->model);
snd_printk(KERN_INFO "Model %04x Rev %08x Serial %08x\n", chip->model,
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index 16be1f3..843dcca 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -2291,7 +2291,7 @@ int __devinit snd_ymfpci_create(struct snd_card *card,
chip->pci = pci;
chip->irq = -1;
chip->device_id = pci->device;
-   pci_read_config_byte(pci, PCI_REVISION_ID, (u8 *)&chip->rev);
+   pci_read_config_byte(pci, PCI_REVISION_ID, &chip->rev);
chip->reg_area_phys = pci_resource_start(pci, 0);
chip->reg_area_virt = ioremap_nocache(chip->reg_area_phys, 0x8000);
pci_set_master(pci);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ALSA] Remove IRQF_DISABLED for shared PCI irqs

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=437a5a4606c12ab904793a7cad5b2062fc76c04e
Commit: 437a5a4606c12ab904793a7cad5b2062fc76c04e
Parent: 01f681da496831eb3aff5a908cefdafe74dd263b
Author: Takashi Iwai <[EMAIL PROTECTED]>
AuthorDate: Tue Nov 21 12:14:23 2006 +0100
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:55:57 2006 +0100

[ALSA] Remove IRQF_DISABLED for shared PCI irqs

Fix IRQ flags for PCI devices.
The shared IRQs for PCI devices shouldn't be allocated with
IRQF_DISABLED.  Also, when MSI is enabled, IRQF_SHARED shouldn't
be used.
The patch removes unnecessary cast in request_irq and free_irq,
too.

Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 .../sound/alsa/DocBook/writing-an-alsa-driver.tmpl |8 
 sound/isa/sb/sb_common.c   |2 +-
 sound/pci/ad1889.c |4 ++--
 sound/pci/ali5451/ali5451.c|5 +++--
 sound/pci/als300.c |6 +++---
 sound/pci/atiixp.c |2 +-
 sound/pci/atiixp_modem.c   |2 +-
 sound/pci/au88x0/au88x0.c  |2 +-
 sound/pci/azt3328.c|5 +++--
 sound/pci/bt87x.c  |2 +-
 sound/pci/ca0106/ca0106_main.c |5 ++---
 sound/pci/cmipci.c |2 +-
 sound/pci/cs4281.c |2 +-
 sound/pci/cs46xx/cs46xx_lib.c  |2 +-
 sound/pci/cs5535audio/cs5535audio.c|2 +-
 sound/pci/echoaudio/echoaudio.c|6 +++---
 sound/pci/emu10k1/emu10k1_main.c   |5 +++--
 sound/pci/emu10k1/emu10k1x.c   |5 ++---
 sound/pci/ens1370.c|2 +-
 sound/pci/es1938.c |4 ++--
 sound/pci/es1968.c |6 +++---
 sound/pci/fm801.c  |2 +-
 sound/pci/hda/hda_intel.c  |3 ++-
 sound/pci/ice1712/ice1712.c|2 +-
 sound/pci/ice1712/ice1724.c|2 +-
 sound/pci/intel8x0.c   |4 ++--
 sound/pci/intel8x0m.c  |4 ++--
 sound/pci/korg1212/korg1212.c  |2 +-
 sound/pci/maestro3.c   |2 +-
 sound/pci/mixart/mixart.c  |5 +++--
 sound/pci/nm256/nm256.c|2 +-
 sound/pci/pcxhr/pcxhr.c|2 +-
 sound/pci/riptide/riptide.c|5 ++---
 sound/pci/rme32.c  |3 ++-
 sound/pci/rme96.c  |3 ++-
 sound/pci/rme9652/hdsp.c   |3 ++-
 sound/pci/rme9652/hdspm.c  |3 +--
 sound/pci/rme9652/rme9652.c|3 ++-
 sound/pci/sonicvibes.c |5 +++--
 sound/pci/trident/trident_main.c   |2 +-
 sound/pci/via82xx.c|2 +-
 sound/pci/via82xx_modem.c  |2 +-
 sound/pci/vx222/vx222.c|4 ++--
 sound/pci/ymfpci/ymfpci_main.c |5 +++--
 44 files changed, 78 insertions(+), 71 deletions(-)

diff --git a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl 
b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
index 077fbe2..ccd0a95 100644
--- a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
+++ b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
@@ -927,7 +927,7 @@
   
 
 
 
   
@@ -1095,7 +1095,7 @@
 
   /* release the irq */
   if (chip->irq >= 0)
-  free_irq(chip->irq, (void *)chip);
+  free_irq(chip->irq, chip);
   /* release the i/o ports & memory */
   pci_release_regions(chip->pci);
   /* disable the PCI entry */
@@ -1148,7 +1148,7 @@
   }
   chip->port = pci_resource_start(pci, 0);
   if (request_irq(pci->irq, snd_mychip_interrupt,
-  IRQF_DISABLED|IRQF_SHARED, "My Chip", chip)) {
+  IRQF_SHARED, "My Chip", chip)) {
   printk(KERN_ERR "cannot grab irq %d\n", pci->irq);
   snd_mychip_free(chip);
   return -EBUSY;
@@ -1387,7 +1387,7 @@
   
 
   
 
diff --git a/sound/isa/sb/sb_common.c b/sound/isa/sb/sb_common.c
index c62a9e3..3094f38 100644
--- a/sound/isa/sb/sb_common.c
+

[ALSA] snd_hda_intel 3stack mode for ASUS P5P-L2

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a48bb28c167b5cad1bd4978dbb83c89252caab78
Commit: a48bb28c167b5cad1bd4978dbb83c89252caab78
Parent: 437a5a4606c12ab904793a7cad5b2062fc76c04e
Author: Nickolay V. Shmyrev <[EMAIL PROTECTED]>
AuthorDate: Tue Nov 21 18:56:37 2006 +0100
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:55:58 2006 +0100

[ALSA] snd_hda_intel 3stack mode for ASUS P5P-L2

I have ASUS P5PL2 motherboard and it's embedded sound card requires
the following patch which sets '3stack' model to operate properly:
00:1b.0 0403: 8086:27d8 (rev 01)
Subsystem: 1043:817f
Flags: bus master, fast devsel, latency 0, IRQ 177
Memory at dfdf8000 (64-bit, non-prefetchable) [size=16K]
Capabilities: [50] Power Management version 2
Capabilities: [60] Message Signalled Interrupts: 64bit+
Queue=0/0 Enable-
Capabilities: [70] Express Unknown type IRQ 0

Signed-off-by: Nickolay V. Shmyrev <[EMAIL PROTECTED]>
Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/pci/hda/patch_analog.c |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 25b5787..076365b 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -794,6 +794,8 @@ static struct hda_board_config ad1986a_cfg_tbl[] = {
{ .modelname = "3stack",.config = AD1986A_3STACK },
{ .pci_subvendor = 0x10de, .pci_subdevice = 0xcb84,
  .config = AD1986A_3STACK }, /* ASUS A8N-VM CSM */
+   { .pci_subvendor = 0x1043, .pci_subdevice = 0x817f,
+ .config = AD1986A_3STACK }, /* ASUS P5P-L2 */
{ .pci_subvendor = 0x1043, .pci_subdevice = 0x81b3,
  .config = AD1986A_3STACK }, /* ASUS P5RD2-VM / P5GPL-X SE */
{ .pci_subvendor = 0x1043, .pci_subdevice = 0x81cb,
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ALSA] sound: initialize rawmidi substream list

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c13893d7be4f159b359a1b7ee46b3646ecb2fe20
Commit: c13893d7be4f159b359a1b7ee46b3646ecb2fe20
Parent: a48bb28c167b5cad1bd4978dbb83c89252caab78
Author: Akinobu Mita <[EMAIL PROTECTED]>
AuthorDate: Thu Nov 23 12:02:33 2006 +0100
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:55:59 2006 +0100

[ALSA] sound: initialize rawmidi substream list

If snd_rawmidi_new() failed to allocate substreams for input
(snd_rawmidi_alloc_substreams() failed to populate a
&rmidi->streams[SNDRV_RAWMIDI_STREAM_INPUT]), it will try to
free rawmidi instance by snd_rawmidi_free().
But it will cause oops because snd_rawmidi_free() tries to free
both of substreams list but list for output
(&rmidi->streams[SNDRV_RAWMIDI_STREAM_OUTPUT]) is not initialized yet.

Signed-off-by: Akinobu Mita <[EMAIL PROTECTED]>
Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/core/rawmidi.c |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c
index 269c467..0f055bf 100644
--- a/sound/core/rawmidi.c
+++ b/sound/core/rawmidi.c
@@ -1385,7 +1385,6 @@ static int snd_rawmidi_alloc_substreams(struct 
snd_rawmidi *rmidi,
struct snd_rawmidi_substream *substream;
int idx;
 
-   INIT_LIST_HEAD(&stream->substreams);
for (idx = 0; idx < count; idx++) {
substream = kzalloc(sizeof(*substream), GFP_KERNEL);
if (substream == NULL) {
@@ -1440,6 +1439,9 @@ int snd_rawmidi_new(struct snd_card *card, char *id, int 
device,
rmidi->device = device;
mutex_init(&rmidi->open_mutex);
init_waitqueue_head(&rmidi->open_wait);
+   INIT_LIST_HEAD(&rmidi->streams[SNDRV_RAWMIDI_STREAM_INPUT].substreams);
+   INIT_LIST_HEAD(&rmidi->streams[SNDRV_RAWMIDI_STREAM_OUTPUT].substreams);
+
if (id != NULL)
strlcpy(rmidi->id, id, sizeof(rmidi->id));
if ((err = snd_rawmidi_alloc_substreams(rmidi,
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ALSA] sound: fix PCM substream list

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4d361285925613516560f81f8c7fc96b89c8b1a8
Commit: 4d361285925613516560f81f8c7fc96b89c8b1a8
Parent: c13893d7be4f159b359a1b7ee46b3646ecb2fe20
Author: Akinobu Mita <[EMAIL PROTECTED]>
AuthorDate: Thu Nov 23 12:03:24 2006 +0100
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:56:00 2006 +0100

[ALSA] sound: fix PCM substream list

If snd_pcm_new_stream() fails to initalize a substream (if
snd_pcm_substream_proc_init() returns error), snd_pcm_new_stream()
immediately return without unlinking that kfree()d substram.
It causes oops when snd_pcm_free() iterates the list of substream to
free them by invalid reference.

Signed-off-by: Akinobu Mita <[EMAIL PROTECTED]>
Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/core/pcm.c |4 
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/sound/core/pcm.c b/sound/core/pcm.c
index 5ac6e19..8e01898 100644
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@ -640,6 +640,10 @@ int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, 
int substream_count)
err = snd_pcm_substream_proc_init(substream);
if (err < 0) {
snd_printk(KERN_ERR "Error in 
snd_pcm_stream_proc_init\n");
+   if (prev == NULL)
+   pstr->substream = NULL;
+   else
+   prev->next = NULL;
kfree(substream);
return err;
}
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ALSA] snd-ca0106: Add new card variant.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e4f55d8010eacb2669c2a68f195993e4563b94c8
Commit: e4f55d8010eacb2669c2a68f195993e4563b94c8
Parent: 4d361285925613516560f81f8c7fc96b89c8b1a8
Author: James Courtier-Dutton <[EMAIL PROTECTED]>
AuthorDate: Sat Nov 25 19:42:29 2006 +
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:56:08 2006 +0100

[ALSA] snd-ca0106: Add new card variant.

Fixed ALSA bug#2326

Signed-off-by: James Courtier-Dutton <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/pci/ca0106/ca0106_main.c |   30 ++
 1 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index 35ac187..881c4ca 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -154,6 +154,7 @@ MODULE_SUPPORTED_DEVICE("{{Creative,SB CA0106 chip}}");
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+static uint subsystem[SNDRV_CARDS]; /* Force card subsystem model */
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for the CA0106 soundcard.");
@@ -161,6 +162,8 @@ module_param_array(id, charp, NULL, 0444);
 MODULE_PARM_DESC(id, "ID string for the CA0106 soundcard.");
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable the CA0106 soundcard.");
+module_param_array(subsystem, uint, NULL, 0444);
+MODULE_PARM_DESC(subsystem, "Force card subsystem model.");
 
 #include "ca0106.h"
 
@@ -194,6 +197,17 @@ static struct snd_ca0106_details ca0106_chip_details[] = {
   .gpio_type = 1,
   .i2c_adc = 1,
   .spi_dac = 1 } ,
+/* New Audigy LS. Has a different DAC. */
+/* SB0570:
+ * CTRL:CA0106-DAT
+ * ADC: WM8775EDS
+ * DAC: WM8768GEDS
+ */
+{ .serial = 0x1002,
+  .name   = "Audigy LS [SB0570a]",
+  .gpio_type = 1,
+  .i2c_adc = 1,
+  .spi_dac = 1 } ,
 /* MSI K8N Diamond Motherboard with onboard SB Live 24bit without AC97 
*/
 /* SB0438
  * CTRL:CA0106-DAT
@@ -1223,7 +1237,7 @@ static unsigned int i2c_adc_init[][2] = {
{ 0x15, ADC_MUX_LINEIN },  /* ADC Mixer control */
 };
 
-static int __devinit snd_ca0106_create(struct snd_card *card,
+static int __devinit snd_ca0106_create(int dev, struct snd_card *card,
 struct pci_dev *pci,
 struct snd_ca0106 **rchip)
 {
@@ -1286,17 +1300,25 @@ static int __devinit snd_ca0106_create(struct snd_card 
*card,
pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &chip->serial);
pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &chip->model);
 #if 1
-   printk(KERN_INFO "Model %04x Rev %08x Serial %08x\n", chip->model,
+   printk(KERN_INFO "snd-ca0106: Model %04x Rev %08x Serial %08x\n", 
chip->model,
   chip->revision, chip->serial);
 #endif
strcpy(card->driver, "CA0106");
strcpy(card->shortname, "CA0106");
 
for (c = ca0106_chip_details; c->serial; c++) {
-   if (c->serial == chip->serial)
+   if (subsystem[dev]) {
+   if (c->serial == subsystem[dev])
+   break;
+   } else if (c->serial == chip->serial)
break;
}
chip->details = c;
+   if (subsystem[dev]) {
+   printk(KERN_INFO "snd-ca0106: Sound card name=%s, 
subsystem=0x%x. Forced to subsytem=0x%x\n",
+c->name, chip->serial, subsystem[dev]);
+   }
+
sprintf(card->longname, "%s at 0x%lx irq %i",
c->name, chip->port, chip->irq);
 
@@ -1539,7 +1561,7 @@ static int __devinit snd_ca0106_probe(struct pci_dev *pci,
if (card == NULL)
return -ENOMEM;
 
-   if ((err = snd_ca0106_create(card, pci, &chip)) < 0) {
+   if ((err = snd_ca0106_create(dev, card, pci, &chip)) < 0) {
snd_card_free(card);
return err;
}
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ALSA] snd-ca0106: Fix typos.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d5f6a38d9896614e2e78a82c6cb818721601c52f
Commit: d5f6a38d9896614e2e78a82c6cb818721601c52f
Parent: e4f55d8010eacb2669c2a68f195993e4563b94c8
Author: James Courtier-Dutton <[EMAIL PROTECTED]>
AuthorDate: Sat Nov 25 19:50:11 2006 +
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:56:09 2006 +0100

[ALSA] snd-ca0106: Fix typos.


Signed-off-by: James Courtier-Dutton <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/pci/ca0106/ca0106_main.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index 881c4ca..f61f052 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -204,7 +204,7 @@ static struct snd_ca0106_details ca0106_chip_details[] = {
  * DAC: WM8768GEDS
  */
 { .serial = 0x1002,
-  .name   = "Audigy LS [SB0570a]",
+  .name   = "Audigy SE OEM [SB0570a]",
   .gpio_type = 1,
   .i2c_adc = 1,
   .spi_dac = 1 } ,
@@ -1315,7 +1315,7 @@ static int __devinit snd_ca0106_create(int dev, struct 
snd_card *card,
}
chip->details = c;
if (subsystem[dev]) {
-   printk(KERN_INFO "snd-ca0106: Sound card name=%s, 
subsystem=0x%x. Forced to subsytem=0x%x\n",
+   printk(KERN_INFO "snd-ca0106: Sound card name=%s, 
subsystem=0x%x. Forced to subsystem=0x%x\n",
 c->name, chip->serial, subsystem[dev]);
}
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ALSA] ac97_codec - trivial fix for bit update functions

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e8bb036a46ec4a9d748672f54a6b2d62c82b6fbd
Commit: e8bb036a46ec4a9d748672f54a6b2d62c82b6fbd
Parent: d5f6a38d9896614e2e78a82c6cb818721601c52f
Author: James C Georgas <[EMAIL PROTECTED]>
AuthorDate: Thu Dec 7 08:10:57 2006 +0100
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:56:10 2006 +0100

[ALSA] ac97_codec - trivial fix for bit update functions

This patch fixes a couple of bit update functions in
alsa-kernel/pci/ac97/ac97_codec.c, which could possibly corrupt bits not
in the given mask.
Specifically, it'll clobber unset bits in the target that are not in the
mask, when the corresponding bit in the given new value is set.

Signed-off-by: James C Georgas <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/pci/ac97/ac97_codec.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index 7abcb10..91d8ceb 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -382,7 +382,7 @@ int snd_ac97_update_bits_nolock(struct snd_ac97 *ac97, 
unsigned short reg,
unsigned short old, new;
 
old = snd_ac97_read_cache(ac97, reg);
-   new = (old & ~mask) | value;
+   new = (old & ~mask) | (value & mask);
change = old != new;
if (change) {
ac97->regs[reg] = new;
@@ -399,7 +399,7 @@ static int snd_ac97_ad18xx_update_pcm_bits(struct snd_ac97 
*ac97, int codec, uns
 
mutex_lock(&ac97->page_mutex);
old = ac97->spec.ad18xx.pcmreg[codec];
-   new = (old & ~mask) | value;
+   new = (old & ~mask) | (value & mask);
change = old != new;
if (change) {
mutex_lock(&ac97->reg_mutex);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ALSA] ac97: Identify CMI9761 chips.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f8cb2c450e7ff61abe75fabc94a4f62667a79c2b
Commit: f8cb2c450e7ff61abe75fabc94a4f62667a79c2b
Parent: e8bb036a46ec4a9d748672f54a6b2d62c82b6fbd
Author: James Courtier-Dutton <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 12 17:05:24 2006 +
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 08:56:11 2006 +0100

[ALSA] ac97: Identify CMI9761 chips.


Signed-off-by: James Courtier-Dutton <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/pci/ac97/ac97_codec.c |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index 91d8ceb..d2994cb 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -129,9 +129,9 @@ static const struct ac97_codec_id snd_ac97_codec_ids[] = {
 { 0x434d4941, 0x, "CMI9738",   patch_cm9738,   NULL },
 { 0x434d4961, 0x, "CMI9739",   patch_cm9739,   NULL },
 { 0x434d4969, 0x, "CMI9780",   patch_cm9780,   NULL },
-{ 0x434d4978, 0x, "CMI9761",   patch_cm9761,   NULL },
-{ 0x434d4982, 0x, "CMI9761",   patch_cm9761,   NULL },
-{ 0x434d4983, 0x, "CMI9761",   patch_cm9761,   NULL },
+{ 0x434d4978, 0x, "CMI9761A",  patch_cm9761,   NULL },
+{ 0x434d4982, 0x, "CMI9761B",  patch_cm9761,   NULL },
+{ 0x434d4983, 0x, "CMI9761A+", patch_cm9761,   NULL },
 { 0x43525900, 0xfff8, "CS4297",NULL,   NULL },
 { 0x43525910, 0xfff8, "CS4297A",   patch_cirrus_spdif, NULL },
 { 0x43525920, 0xfff8, "CS4298",patch_cirrus_spdif, 
NULL },
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[ALSA] version 1.0.14rc1

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7c21699e30a5c0ca4972d1b6ad22350fe63128d3
Commit: 7c21699e30a5c0ca4972d1b6ad22350fe63128d3
Parent: f8cb2c450e7ff61abe75fabc94a4f62667a79c2b
Author: Jaroslav Kysela <[EMAIL PROTECTED]>
AuthorDate: Wed Dec 20 09:11:55 2006 +0100
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 09:11:55 2006 +0100

[ALSA] version 1.0.14rc1

Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 include/sound/version.h |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/sound/version.h b/include/sound/version.h
index 17137f3..2949b9b 100644
--- a/include/sound/version.h
+++ b/include/sound/version.h
@@ -1,3 +1,3 @@
 /* include/version.h.  Generated by alsa/ksync script.  */
-#define CONFIG_SND_VERSION "1.0.13"
-#define CONFIG_SND_DATE " (Tue Nov 28 14:07:24 2006 UTC)"
+#define CONFIG_SND_VERSION "1.0.14rc1"
+#define CONFIG_SND_DATE " (Wed Dec 20 08:11:48 2006 UTC)"
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

drm: fix return value check

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=94f060bd0f78814f4daf8c7942bd710af52c7d6f
Commit: 94f060bd0f78814f4daf8c7942bd710af52c7d6f
Parent: 9202f32558601c2c99ddc438eb3218131d00d413
Author: Akinobu Mita <[EMAIL PROTECTED]>
AuthorDate: Sat Dec 9 10:49:47 2006 +1100
Committer:  Dave Airlie <[EMAIL PROTECTED]>
CommitDate: Mon Dec 11 18:28:45 2006 +1100

drm: fix return value check

class_create() and class_device_create() return error code as a pointer on
failure.  These return values need to be checked by IS_ERR().

Signed-off-by: Akinobu Mita <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Dave Airlie <[EMAIL PROTECTED]>
---
 drivers/char/drm/drm_sysfs.c |8 
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/char/drm/drm_sysfs.c b/drivers/char/drm/drm_sysfs.c
index ba4b8de..cc8e2eb 100644
--- a/drivers/char/drm/drm_sysfs.c
+++ b/drivers/char/drm/drm_sysfs.c
@@ -45,8 +45,8 @@ struct class *drm_sysfs_create(struct module *owner, char 
*name)
int err;
 
class = class_create(owner, name);
-   if (!class) {
-   err = -ENOMEM;
+   if (IS_ERR(class)) {
+   err = PTR_ERR(class);
goto err_out;
}
 
@@ -113,8 +113,8 @@ struct class_device *drm_sysfs_device_add(struct class *cs, 
drm_head_t *head)
MKDEV(DRM_MAJOR, head->minor),
&(head->dev->pdev)->dev,
"card%d", head->minor);
-   if (!class_dev) {
-   err = -ENOMEM;
+   if (IS_ERR(class_dev)) {
+   err = PTR_ERR(class_dev);
goto err_out;
}
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

DRM: handle pci_enable_device failure

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=2c3f0eddfbd7f5c7a5450de287bad805722888c3
Commit: 2c3f0eddfbd7f5c7a5450de287bad805722888c3
Parent: 94f060bd0f78814f4daf8c7942bd710af52c7d6f
Author: Jeff Garzik <[EMAIL PROTECTED]>
AuthorDate: Sat Dec 9 10:50:22 2006 +1100
Committer:  Dave Airlie <[EMAIL PROTECTED]>
CommitDate: Mon Dec 11 18:28:52 2006 +1100

DRM: handle pci_enable_device failure

Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Dave Airlie <[EMAIL PROTECTED]>
---
 drivers/char/drm/drm_stub.c |   12 
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/char/drm/drm_stub.c b/drivers/char/drm/drm_stub.c
index 5fd6dc0..120d102 100644
--- a/drivers/char/drm/drm_stub.c
+++ b/drivers/char/drm/drm_stub.c
@@ -211,14 +211,16 @@ int drm_get_dev(struct pci_dev *pdev, const struct 
pci_device_id *ent,
if (!dev)
return -ENOMEM;
 
-   pci_enable_device(pdev);
+   ret = pci_enable_device(pdev);
+   if (ret)
+   goto err_g1;
 
if ((ret = drm_fill_in_dev(dev, pdev, ent, driver))) {
printk(KERN_ERR "DRM: Fill_in_dev failed.\n");
-   goto err_g1;
+   goto err_g2;
}
if ((ret = drm_get_head(dev, &dev->primary)))
-   goto err_g1;
+   goto err_g2;

DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
 driver->name, driver->major, driver->minor, driver->patchlevel,
@@ -226,7 +228,9 @@ int drm_get_dev(struct pci_dev *pdev, const struct 
pci_device_id *ent,
 
return 0;
 
-  err_g1:
+err_g2:
+   pci_disable_device(pdev);
+err_g1:
drm_free(dev, sizeof(*dev), DRM_MEM_STUB);
return ret;
 }
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

i915_vblank_tasklet: Try harder to avoid tearing.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3188a24c256bae0ed93d81d82db1f1bb6060d727
Commit: 3188a24c256bae0ed93d81d82db1f1bb6060d727
Parent: 2c3f0eddfbd7f5c7a5450de287bad805722888c3
Author: =?utf-8?q?Michel_D=C3=A4nzer?= <[EMAIL PROTECTED]>
AuthorDate: Mon Dec 11 18:32:27 2006 +1100
Committer:  Dave Airlie <[EMAIL PROTECTED]>
CommitDate: Mon Dec 11 18:32:27 2006 +1100

i915_vblank_tasklet: Try harder to avoid tearing.

Previously, if there were several buffer swaps scheduled for the same 
vertical
blank, all but the first blit emitted stood a chance of exhibiting tearing. 
In
order to avoid this, split the blits along slices of each output top to 
bottom.

Signed-off-by: Dave Airlie <[EMAIL PROTECTED]>
---
 drivers/char/drm/i915_irq.c |  199 ++-
 1 files changed, 139 insertions(+), 60 deletions(-)

diff --git a/drivers/char/drm/i915_irq.c b/drivers/char/drm/i915_irq.c
index e5463b1..e2c4b3a 100644
--- a/drivers/char/drm/i915_irq.c
+++ b/drivers/char/drm/i915_irq.c
@@ -46,88 +46,167 @@ static void i915_vblank_tasklet(drm_device_t *dev)
 {
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
unsigned long irqflags;
-   struct list_head *list, *tmp;
+   struct list_head *list, *tmp, hits, *hit;
+   int nhits, nrects, slice[2], upper[2], lower[2], i;
+   unsigned counter[2] = { atomic_read(&dev->vbl_received),
+   atomic_read(&dev->vbl_received2) };
+   drm_drawable_info_t *drw;
+   drm_i915_sarea_t *sarea_priv = dev_priv->sarea_priv;
+   u32 cpp = dev_priv->cpp;
+   u32 cmd = (cpp == 4) ? (XY_SRC_COPY_BLT_CMD |
+   XY_SRC_COPY_BLT_WRITE_ALPHA |
+   XY_SRC_COPY_BLT_WRITE_RGB)
+: XY_SRC_COPY_BLT_CMD;
+   u32 pitchropcpp = (sarea_priv->pitch * cpp) | (0xcc << 16) |
+ (cpp << 23) | (1 << 24);
+   RING_LOCALS;
 
DRM_DEBUG("\n");
 
+   INIT_LIST_HEAD(&hits);
+
+   nhits = nrects = 0;
+
spin_lock_irqsave(&dev_priv->swaps_lock, irqflags);
 
+   /* Find buffer swaps scheduled for this vertical blank */
list_for_each_safe(list, tmp, &dev_priv->vbl_swaps.head) {
drm_i915_vbl_swap_t *vbl_swap =
list_entry(list, drm_i915_vbl_swap_t, head);
-   atomic_t *counter = vbl_swap->pipe ? &dev->vbl_received2 :
-   &dev->vbl_received;
-
-   if ((atomic_read(counter) - vbl_swap->sequence) <= (1<<23)) {
-   drm_drawable_info_t *drw;
-
-   spin_unlock(&dev_priv->swaps_lock);
-
-   spin_lock(&dev->drw_lock);
-
-   drw = drm_get_drawable_info(dev, vbl_swap->drw_id);
-   
-   if (drw) {
-   int i, num_rects = drw->num_rects;
-   drm_clip_rect_t *rect = drw->rects;
-   drm_i915_sarea_t *sarea_priv =
-   dev_priv->sarea_priv;
-   u32 cpp = dev_priv->cpp;
-   u32 cmd = (cpp == 4) ? (XY_SRC_COPY_BLT_CMD |
-   
XY_SRC_COPY_BLT_WRITE_ALPHA |
-   
XY_SRC_COPY_BLT_WRITE_RGB)
-: XY_SRC_COPY_BLT_CMD;
-   u32 pitchropcpp = (sarea_priv->pitch * cpp) |
- (0xcc << 16) | (cpp << 23) |
- (1 << 24);
-   RING_LOCALS;
-
-   i915_kernel_lost_context(dev);
-
-   BEGIN_LP_RING(6);
-
-   OUT_RING(GFX_OP_DRAWRECT_INFO);
-   OUT_RING(0);
-   OUT_RING(0);
-   OUT_RING(sarea_priv->width |
-sarea_priv->height << 16);
-   OUT_RING(sarea_priv->width |
-sarea_priv->height << 16);
-   OUT_RING(0);
 
-   ADVANCE_LP_RING();
+   if ((counter[vbl_swap->pipe] - vbl_swap->sequence) > (1<<23))
+   continue;
+
+   list_del(list);
+   dev_priv->swaps_pending--;
 
-   sarea_priv->ctxOwner = DRM_KERNEL_CONTEXT;
+   spin_unlock(&dev_priv->swaps_lock);
+   spin_lock(&dev->drw_lock);
 
-   for (i = 0; i < num_rects; i++, rect++) {
-   BEGIN

drm: Unify radeon offset checking.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1d6bb8e51dba3db1c15575901022fe72d363e5a4
Commit: 1d6bb8e51dba3db1c15575901022fe72d363e5a4
Parent: 3188a24c256bae0ed93d81d82db1f1bb6060d727
Author: =?utf-8?q?Michel_D=C3=A4nzer?= <[EMAIL PROTECTED]>
AuthorDate: Fri Dec 15 18:54:35 2006 +1100
Committer:  Dave Airlie <[EMAIL PROTECTED]>
CommitDate: Fri Dec 15 18:54:35 2006 +1100

drm: Unify radeon offset checking.

Replace r300_check_offset() with generic radeon_check_offset(), which 
doesn't
reject valid offsets when the framebuffer area is at the very end of the 
card's
32 bit address space. Make radeon_check_and_fixup_offset() use
radeon_check_offset() as well.

This fixes https://bugs.freedesktop.org/show_bug.cgi?id=7697 .
---
 drivers/char/drm/r300_cmdbuf.c  |   32 ++--
 drivers/char/drm/radeon_drv.h   |   15 +++
 drivers/char/drm/radeon_state.c |   13 -
 3 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/drivers/char/drm/r300_cmdbuf.c b/drivers/char/drm/r300_cmdbuf.c
index d14477b..032a022 100644
--- a/drivers/char/drm/r300_cmdbuf.c
+++ b/drivers/char/drm/r300_cmdbuf.c
@@ -242,26 +242,6 @@ static __inline__ int r300_check_range(unsigned reg, int 
count)
return 0;
 }
 
-/*
- * we expect offsets passed to the framebuffer to be either within video 
- * memory or within AGP space 
- */
-static __inline__ int r300_check_offset(drm_radeon_private_t *dev_priv,
-   u32 offset)
-{
-   /* we realy want to check against end of video aperture
-  but this value is not being kept.
-  This code is correct for now (does the same thing as the
-  code that sets MC_FB_LOCATION) in radeon_cp.c */
-   if (offset >= dev_priv->fb_location &&
-   offset < (dev_priv->fb_location + dev_priv->fb_size))
-   return 0;
-   if (offset >= dev_priv->gart_vm_start &&
-   offset < (dev_priv->gart_vm_start + dev_priv->gart_size))
-   return 0;
-   return 1;
-}
-
 static __inline__ int r300_emit_carefully_checked_packet0(drm_radeon_private_t 
*
  dev_priv,
  
drm_radeon_kcmd_buffer_t
@@ -290,7 +270,7 @@ static __inline__ int 
r300_emit_carefully_checked_packet0(drm_radeon_private_t *
case MARK_SAFE:
break;
case MARK_CHECK_OFFSET:
-   if (r300_check_offset(dev_priv, (u32) values[i])) {
+   if (!radeon_check_offset(dev_priv, (u32) values[i])) {
DRM_ERROR
("Offset failed range check (reg=%04x 
sz=%d)\n",
 reg, sz);
@@ -452,7 +432,7 @@ static __inline__ int 
r300_emit_3d_load_vbpntr(drm_radeon_private_t *dev_priv,
i = 1;
while ((k < narrays) && (i < (count + 1))) {
i++;/* skip attribute field */
-   if (r300_check_offset(dev_priv, payload[i])) {
+   if (!radeon_check_offset(dev_priv, payload[i])) {
DRM_ERROR
("Offset failed range check (k=%d i=%d) while 
processing 3D_LOAD_VBPNTR packet.\n",
 k, i);
@@ -463,7 +443,7 @@ static __inline__ int 
r300_emit_3d_load_vbpntr(drm_radeon_private_t *dev_priv,
if (k == narrays)
break;
/* have one more to process, they come in pairs */
-   if (r300_check_offset(dev_priv, payload[i])) {
+   if (!radeon_check_offset(dev_priv, payload[i])) {
DRM_ERROR
("Offset failed range check (k=%d i=%d) while 
processing 3D_LOAD_VBPNTR packet.\n",
 k, i);
@@ -508,7 +488,7 @@ static __inline__ int 
r300_emit_bitblt_multi(drm_radeon_private_t *dev_priv,
if (cmd[1] & (RADEON_GMC_SRC_PITCH_OFFSET_CNTL 
  | RADEON_GMC_DST_PITCH_OFFSET_CNTL)) {
offset = cmd[2] << 10;
-   ret = r300_check_offset(dev_priv, offset);
+   ret = !radeon_check_offset(dev_priv, offset);
if (ret) {
DRM_ERROR("Invalid bitblt first offset is 
%08X\n", offset);
return DRM_ERR(EINVAL);
@@ -518,7 +498,7 @@ static __inline__ int 
r300_emit_bitblt_multi(drm_radeon_private_t *dev_priv,
if ((cmd[1] & RADEON_GMC_SRC_PITCH_OFFSET_CNTL) &&
(cmd[1] & RADEON_GMC_DST_PITCH_OFFSET_CNTL)) {
offset = cmd[3] << 10;
-   ret = r300_check_offset(dev_priv, offset);
+   ret = !radeon_check_offset(dev_priv, of

drm: savage: compat fix from drm git.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=183b4aeefa1ff8e0a792b95d5d56f0994d022449
Commit: 183b4aeefa1ff8e0a792b95d5d56f0994d022449
Parent: 1d6bb8e51dba3db1c15575901022fe72d363e5a4
Author: Eric Anholt <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 19 17:20:02 2006 +1100
Committer:  Dave Airlie <[EMAIL PROTECTED]>
CommitDate: Tue Dec 19 17:20:02 2006 +1100

drm: savage: compat fix from drm git.

Signed-off-by: Dave Airlie <[EMAIL PROTECTED]>
---
 drivers/char/drm/savage_bci.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/char/drm/savage_bci.c b/drivers/char/drm/savage_bci.c
index a9a84f8..b94fab5 100644
--- a/drivers/char/drm/savage_bci.c
+++ b/drivers/char/drm/savage_bci.c
@@ -963,8 +963,8 @@ static int savage_bci_event_emit(DRM_IOCTL_ARGS)
 
event.count = savage_bci_emit_event(dev_priv, event.flags);
event.count |= dev_priv->event_wrap << 16;
-   DRM_COPY_TO_USER_IOCTL(&((drm_savage_event_emit_t __user *) data)->
-  count, event.count, sizeof(event.count));
+   DRM_COPY_TO_USER_IOCTL((drm_savage_event_emit_t __user *) data,
+  event, sizeof(event));
return 0;
 }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

drm: fixup comment header style

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=94bb598e6b7d68690426f4c7c4385823951861eb
Commit: 94bb598e6b7d68690426f4c7c4385823951861eb
Parent: 183b4aeefa1ff8e0a792b95d5d56f0994d022449
Author: Dave Airlie <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 19 17:49:08 2006 +1100
Committer:  Dave Airlie <[EMAIL PROTECTED]>
CommitDate: Tue Dec 19 17:49:08 2006 +1100

drm: fixup comment header style

Signed-off-by: Dave Airlie <[EMAIL PROTECTED]>
---
 drivers/char/drm/radeon_irq.c |4 ++--
 drivers/char/drm/radeon_mem.c |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/char/drm/radeon_irq.c b/drivers/char/drm/radeon_irq.c
index d60519d..3ff0baa 100644
--- a/drivers/char/drm/radeon_irq.c
+++ b/drivers/char/drm/radeon_irq.c
@@ -1,5 +1,5 @@
-/* radeon_irq.c -- IRQ handling for radeon -*- linux-c -*-
- *
+/* radeon_irq.c -- IRQ handling for radeon -*- linux-c -*- */
+/*
  * Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
  *
  * The Weather Channel (TM) funded Tungsten Graphics to develop the
diff --git a/drivers/char/drm/radeon_mem.c b/drivers/char/drm/radeon_mem.c
index 030a6fa..517cad8 100644
--- a/drivers/char/drm/radeon_mem.c
+++ b/drivers/char/drm/radeon_mem.c
@@ -1,5 +1,5 @@
-/* radeon_mem.c -- Simple GART/fb memory manager for radeon -*- linux-c -*-
- *
+/* radeon_mem.c -- Simple GART/fb memory manager for radeon -*- linux-c -*- */
+/*
  * Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
  *
  * The Weather Channel (TM) funded Tungsten Graphics to develop the
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

drm: make kernel context switch same as for drm git tree.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0c4dd906a220fac7997048178ee4f5d8c378b38b
Commit: 0c4dd906a220fac7997048178ee4f5d8c378b38b
Parent: 94bb598e6b7d68690426f4c7c4385823951861eb
Author: Dave Airlie <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 19 17:49:44 2006 +1100
Committer:  Dave Airlie <[EMAIL PROTECTED]>
CommitDate: Tue Dec 19 17:49:44 2006 +1100

drm: make kernel context switch same as for drm git tree.

Signed-off-by: Dave Airlie <[EMAIL PROTECTED]>
---
 drivers/char/drm/drmP.h |3 +--
 drivers/char/drm/drm_lock.c |2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index 0bbb04f..e31af67 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -561,8 +561,7 @@ struct drm_driver {
int (*context_dtor) (struct drm_device * dev, int context);
int (*kernel_context_switch) (struct drm_device * dev, int old,
  int new);
-   void (*kernel_context_switch_unlock) (struct drm_device * dev,
- drm_lock_t *lock);
+   void (*kernel_context_switch_unlock) (struct drm_device * dev);
int (*vblank_wait) (struct drm_device * dev, unsigned int *sequence);
int (*vblank_wait2) (struct drm_device * dev, unsigned int *sequence);
int (*dri_library_name) (struct drm_device *dev, char *buf);
diff --git a/drivers/char/drm/drm_lock.c b/drivers/char/drm/drm_lock.c
index 116ed0f..e9993ba 100644
--- a/drivers/char/drm/drm_lock.c
+++ b/drivers/char/drm/drm_lock.c
@@ -182,7 +182,7 @@ int drm_unlock(struct inode *inode, struct file *filp,
 * modules but is required by the Sparc driver.
 */
if (dev->driver->kernel_context_switch_unlock)
-   dev->driver->kernel_context_switch_unlock(dev, &lock);
+   dev->driver->kernel_context_switch_unlock(dev);
else {
drm_lock_transfer(dev, &dev->lock.hw_lock->lock,
  DRM_KERNEL_CONTEXT);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

drm: r128: comment aligment with drm git

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=83a9e29b0fd753c28e3979d638a8ebfd3f6ebc96
Commit: 83a9e29b0fd753c28e3979d638a8ebfd3f6ebc96
Parent: 0c4dd906a220fac7997048178ee4f5d8c378b38b
Author: Dave Airlie <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 19 17:56:14 2006 +1100
Committer:  Dave Airlie <[EMAIL PROTECTED]>
CommitDate: Tue Dec 19 17:56:14 2006 +1100

drm: r128: comment aligment with drm git

Align some r128 license comments

Signed-off-by: Dave Airlie <[EMAIL PROTECTED]>
---
 drivers/char/drm/r128_drm.h   |3 ++-
 drivers/char/drm/r128_drv.h   |3 ++-
 drivers/char/drm/r128_state.c |3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/char/drm/r128_drm.h b/drivers/char/drm/r128_drm.h
index 5d835b0..6e8af31 100644
--- a/drivers/char/drm/r128_drm.h
+++ b/drivers/char/drm/r128_drm.h
@@ -1,7 +1,8 @@
 /* r128_drm.h -- Public header for the r128 driver -*- linux-c -*-
  * Created: Wed Apr  5 19:24:19 2000 by [EMAIL PROTECTED]
  */
-/* Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
+/*
+ * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
  * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All rights reserved.
  *
diff --git a/drivers/char/drm/r128_drv.h b/drivers/char/drm/r128_drv.h
index 94abffb..f1efb49 100644
--- a/drivers/char/drm/r128_drv.h
+++ b/drivers/char/drm/r128_drv.h
@@ -1,7 +1,8 @@
 /* r128_drv.h -- Private header for r128 driver -*- linux-c -*-
  * Created: Mon Dec 13 09:51:11 1999 by [EMAIL PROTECTED]
  */
-/* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+/*
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
  * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All rights reserved.
  *
diff --git a/drivers/char/drm/r128_state.c b/drivers/char/drm/r128_state.c
index a080cdd..17b11e7 100644
--- a/drivers/char/drm/r128_state.c
+++ b/drivers/char/drm/r128_state.c
@@ -1,7 +1,8 @@
 /* r128_state.c -- State support for r128 -*- linux-c -*-
  * Created: Thu Jan 27 02:53:43 2000 by [EMAIL PROTECTED]
  */
-/* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+/*
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

drm: Stop defining pci_pretty_name

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f9841a8d6018f8bcba77e75c9e368d94f1f22933
Commit: f9841a8d6018f8bcba77e75c9e368d94f1f22933
Parent: 83a9e29b0fd753c28e3979d638a8ebfd3f6ebc96
Author: Jean Delvare <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 19 18:04:33 2006 +1100
Committer:  Dave Airlie <[EMAIL PROTECTED]>
CommitDate: Tue Dec 19 18:04:33 2006 +1100

drm: Stop defining pci_pretty_name

drm drivers no longer use pci_pretty_name so we can stop defining it.

Signed-off-by: Jean Delvare <[EMAIL PROTECTED]>
Signed-off-by: Dave Airlie <[EMAIL PROTECTED]>
---
 drivers/char/drm/drmP.h |4 
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index e31af67..6dcdceb 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -1142,9 +1142,5 @@ extern void *drm_calloc(size_t nmemb, size_t size, int 
area);
 extern unsigned long drm_core_get_map_ofs(drm_map_t * map);
 extern unsigned long drm_core_get_reg_ofs(struct drm_device *dev);
 
-#ifndef pci_pretty_name
-#define pci_pretty_name(dev) ""
-#endif
-
 #endif /* __KERNEL__ */
 #endif
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[POWERPC] cell: update cell_defconfig

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ed8ed9ac06604513edd6be6b1c81b6270296b7fc
Commit: ed8ed9ac06604513edd6be6b1c81b6270296b7fc
Parent: cc016448b0bf0764928275d034e367753bde8162
Author: Arnd Bergmann <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 19 15:32:41 2006 +0100
Committer:  Arnd Bergmann <[EMAIL PROTECTED]>
CommitDate: Tue Dec 19 15:35:35 2006 +0100

[POWERPC] cell: update cell_defconfig

New options appeared in the kernel, and new hardware became
available for us to use.

Signed-off-by: Arnd Bergmann <[EMAIL PROTECTED]>
---
 arch/powerpc/configs/cell_defconfig |  358 ++-
 1 files changed, 314 insertions(+), 44 deletions(-)

diff --git a/arch/powerpc/configs/cell_defconfig 
b/arch/powerpc/configs/cell_defconfig
index a98c982..d1d2515 100644
--- a/arch/powerpc/configs/cell_defconfig
+++ b/arch/powerpc/configs/cell_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.19-rc6
-# Wed Nov 22 15:33:04 2006
+# Linux kernel version: 2.6.20-rc1
+# Tue Dec 19 14:59:53 2006
 #
 CONFIG_PPC64=y
 CONFIG_64BIT=y
@@ -10,6 +10,8 @@ CONFIG_MMU=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_IRQ_PER_CPU=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_ILOG2_U32=y
+CONFIG_ARCH_HAS_ILOG2_U64=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -23,6 +25,7 @@ CONFIG_PPC_OF=y
 CONFIG_PPC_UDBG_16550=y
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
 # CONFIG_DEFAULT_UIMAGE is not set
 
 #
@@ -66,6 +69,7 @@ CONFIG_SYSVIPC=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_CPUSETS=y
+CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -128,14 +132,16 @@ CONFIG_PPC_MULTIPLATFORM=y
 # CONFIG_APUS is not set
 # CONFIG_PPC_PSERIES is not set
 # CONFIG_PPC_ISERIES is not set
+# CONFIG_PPC_MPC52xx is not set
 # CONFIG_PPC_PMAC is not set
 # CONFIG_PPC_MAPLE is not set
 # CONFIG_PPC_PASEMI is not set
 CONFIG_PPC_CELL=y
 CONFIG_PPC_CELL_NATIVE=y
 CONFIG_PPC_IBM_CELL_BLADE=y
-CONFIG_UDBG_RTAS_CONSOLE=y
 CONFIG_PPC_PS3=y
+CONFIG_PPC_NATIVE=y
+CONFIG_UDBG_RTAS_CONSOLE=y
 # CONFIG_U3_DART is not set
 CONFIG_PPC_RTAS=y
 # CONFIG_RTAS_ERROR_LOGGING is not set
@@ -177,12 +183,14 @@ CONFIG_CBE_CPUFREQ=m
 CONFIG_PS3_HTAB_SIZE=20
 # CONFIG_PS3_DYNAMIC_DMA is not set
 CONFIG_PS3_USE_LPAR_ADDR=y
+CONFIG_PS3_VUART=y
 
 #
 # Kernel options
 #
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=250
 CONFIG_PREEMPT_NONE=y
@@ -237,6 +245,7 @@ CONFIG_GENERIC_ISA_DMA=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCIEPORTBUS=y
+# CONFIG_PCI_MULTITHREAD_PROBE is not set
 # CONFIG_PCI_DEBUG is not set
 
 #
@@ -270,7 +279,10 @@ CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 # CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_PNP is not set
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
 CONFIG_NET_IPIP=y
 # CONFIG_NET_IPGRE is not set
 # CONFIG_IP_MROUTE is not set
@@ -289,6 +301,7 @@ CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
 
 #
 # IP: Virtual Server Configuration
@@ -317,31 +330,67 @@ CONFIG_NETFILTER=y
 #
 # Core Netfilter Configuration
 #
-# CONFIG_NETFILTER_NETLINK is not set
-# CONFIG_NETFILTER_XTABLES is not set
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+# CONFIG_NF_CONNTRACK_ENABLED is not set
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 
 #
 # IP: Netfilter Configuration
 #
-CONFIG_IP_NF_CONNTRACK=y
-# CONFIG_IP_NF_CT_ACCT is not set
-# CONFIG_IP_NF_CONNTRACK_MARK is not set
-# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
-CONFIG_IP_NF_CT_PROTO_SCTP=y
-CONFIG_IP_NF_FTP=m
-CONFIG_IP_NF_IRC=m
-# CONFIG_IP_NF_NETBIOS_NS is not set
-CONFIG_IP_NF_TFTP=m
-CONFIG_IP_NF_AMANDA=m
-# CONFIG_IP_NF_PPTP is not set
-# CONFIG_IP_NF_H323 is not set
-# CONFIG_IP_NF_SIP is not set
 CONFIG_IP_NF_QUEUE=m
+CONF

[POWERPC] cell: add forward struct declarations to spu.h

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f1fa16e8816a2285ed77070ce60a6858fb7913cc
Commit: f1fa16e8816a2285ed77070ce60a6858fb7913cc
Parent: ed8ed9ac06604513edd6be6b1c81b6270296b7fc
Author: Arnd Bergmann <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 19 15:32:42 2006 +0100
Committer:  Arnd Bergmann <[EMAIL PROTECTED]>
CommitDate: Tue Dec 19 15:35:36 2006 +0100

[POWERPC] cell: add forward struct declarations to spu.h

Needed to be able to include spu.h independant from other
headers.

Signed-off-by: Arnd Bergmann <[EMAIL PROTECTED]>
---
 include/asm-powerpc/spu.h |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/include/asm-powerpc/spu.h b/include/asm-powerpc/spu.h
index fdad426..3d90264 100644
--- a/include/asm-powerpc/spu.h
+++ b/include/asm-powerpc/spu.h
@@ -161,6 +161,7 @@ struct spu_syscall_block {
 extern long spu_sys_callback(struct spu_syscall_block *s);
 
 /* syscalls implemented in spufs */
+struct file;
 extern struct spufs_calls {
asmlinkage long (*create_thread)(const char __user *name,
unsigned int flags, mode_t mode);
@@ -232,6 +233,7 @@ void spu_remove_sysdev_attr_group(struct attribute_group 
*attrs);
  * to object-id spufs file from user space and the notifer
  * function can assume that spu->ctx is valid.
  */
+struct notifier_block;
 int spu_switch_event_register(struct notifier_block * n);
 int spu_switch_event_unregister(struct notifier_block * n);
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[POWERPC] cell: Enable spider workarounds on all PCI buses

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a24e57be9baed6ccb552fbdb8e7e29e9c2da0375
Commit: a24e57be9baed6ccb552fbdb8e7e29e9c2da0375
Parent: f1fa16e8816a2285ed77070ce60a6858fb7913cc
Author: Jens Osterkamp <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 19 15:32:43 2006 +0100
Committer:  Arnd Bergmann <[EMAIL PROTECTED]>
CommitDate: Tue Dec 19 15:35:37 2006 +0100

[POWERPC] cell: Enable spider workarounds on all PCI buses

Don't limit spider I/O workarounds to the first two buses.
The IBM Cell blade has three of them (one PCI, two PCIe)
and we want to handle them all.

Signed-off-by: Jens Osterkamp <[EMAIL PROTECTED]>
Signed-off-by: Arnd Bergmann <[EMAIL PROTECTED]>
---
 arch/powerpc/platforms/cell/io-workarounds.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/platforms/cell/io-workarounds.c 
b/arch/powerpc/platforms/cell/io-workarounds.c
index 580d425..7c73128 100644
--- a/arch/powerpc/platforms/cell/io-workarounds.c
+++ b/arch/powerpc/platforms/cell/io-workarounds.c
@@ -37,7 +37,7 @@
  */
 #define SPIDER_DISABLE_PREFETCH
 
-#define MAX_SPIDERS2
+#define MAX_SPIDERS3
 
 static struct spider_pci_bus {
void __iomem*regs;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[POWERPC] cell: Fix spufs with "new style" device-tree

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6e22ba63f01b9bdcd1f29251a95047d310526207
Commit: 6e22ba63f01b9bdcd1f29251a95047d310526207
Parent: a24e57be9baed6ccb552fbdb8e7e29e9c2da0375
Author: Benjamin Herrenschmidt <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 19 15:32:44 2006 +0100
Committer:  Arnd Bergmann <[EMAIL PROTECTED]>
CommitDate: Tue Dec 19 15:35:38 2006 +0100

[POWERPC] cell: Fix spufs with "new style" device-tree

Some SPU code was a bit too convoluted and broke when adding support for
the new style device-tree, most notably the struct pages for SPEs no
longer get created. oops...

Signed-off-by: Benjamin Herrenschmidt <[EMAIL PROTECTED]>
Signed-off-by: Arnd Bergmann <[EMAIL PROTECTED]>
---
 arch/powerpc/platforms/cell/spu_priv1_mmio.c |   67 --
 1 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/arch/powerpc/platforms/cell/spu_priv1_mmio.c 
b/arch/powerpc/platforms/cell/spu_priv1_mmio.c
index a5de043..c805e63 100644
--- a/arch/powerpc/platforms/cell/spu_priv1_mmio.c
+++ b/arch/powerpc/platforms/cell/spu_priv1_mmio.c
@@ -37,6 +37,8 @@
 #include "interrupt.h"
 #include "spu_priv1_mmio.h"
 
+static DEFINE_MUTEX(add_spumem_mutex);
+
 struct spu_pdata {
int nid;
struct device_node *devnode;
@@ -68,8 +70,6 @@ static int __init find_spu_node_id(struct device_node *spe)
 static int __init cell_spuprop_present(struct spu *spu, struct device_node 
*spe,
const char *prop)
 {
-   static DEFINE_MUTEX(add_spumem_mutex);
-
const struct address_prop {
unsigned long address;
unsigned int len;
@@ -237,70 +237,88 @@ err:
return ret;
 }
 
-static int spu_map_resource(struct device_node *node, int nr,
-   void __iomem** virt, unsigned long *phys)
+static int spu_map_resource(struct spu *spu, int nr,
+   void __iomem** virt, unsigned long *phys)
 {
+   struct device_node *np = spu_get_pdata(spu)->devnode;
+   unsigned long start_pfn, nr_pages;
+   struct pglist_data *pgdata;
+   struct zone *zone;
struct resource resource = { };
+   unsigned long len;
int ret;
 
-   ret = of_address_to_resource(node, nr, &resource);
+   ret = of_address_to_resource(np, nr, &resource);
if (ret)
goto out;
 
if (phys)
*phys = resource.start;
-   *virt = ioremap(resource.start, resource.end - resource.start);
+   len = resource.end - resource.start + 1;
+   *virt = ioremap(resource.start, len);
if (!*virt)
ret = -EINVAL;
 
+   start_pfn = resource.start >> PAGE_SHIFT;
+   nr_pages = (len + PAGE_SIZE - 1) >> PAGE_SHIFT;
+
+   pgdata = NODE_DATA(spu_get_pdata(spu)->nid);
+   zone = pgdata->node_zones;
+
+   /* XXX rethink locking here */
+   mutex_lock(&add_spumem_mutex);
+   ret = __add_pages(zone, start_pfn, nr_pages);
+   mutex_unlock(&add_spumem_mutex);
+
 out:
return ret;
 }
 
-static int __init spu_map_device(struct spu *spu, struct device_node *node)
+static int __init spu_map_device(struct spu *spu)
 {
+   struct device_node *np = spu_get_pdata(spu)->devnode;
int ret = -ENODEV;
-   spu->name = get_property(node, "name", NULL);
+
+   spu->name = get_property(np, "name", NULL);
if (!spu->name)
goto out;
 
-   ret = spu_map_resource(node, 0, (void __iomem**)&spu->local_store,
-   &spu->local_store_phys);
+   ret = spu_map_resource(spu, 0, (void __iomem**)&spu->local_store,
+  &spu->local_store_phys);
if (ret) {
pr_debug("spu_new: failed to map %s resource 0\n",
-node->full_name);
+np->full_name);
goto out;
}
-   ret = spu_map_resource(node, 1, (void __iomem**)&spu->problem,
-   &spu->problem_phys);
+   ret = spu_map_resource(spu, 1, (void __iomem**)&spu->problem,
+  &spu->problem_phys);
if (ret) {
pr_debug("spu_new: failed to map %s resource 1\n",
-node->full_name);
+np->full_name);
goto out_unmap;
}
-   ret = spu_map_resource(node, 2, (void __iomem**)&spu->priv2,
-   NULL);
+   ret = spu_map_resource(spu, 2, (void __iomem**)&spu->priv2, NULL);
if (ret) {
pr_debug("spu_new: failed to map %s resource 2\n",
-node->full_name);
+np->full_name);
goto out_unmap;
}
if (!firmware_has_feature(FW_FEATURE_LPAR))
-   ret = spu_map_resource(node, 3,
-   (void __iomem**)&spu_get_pdata(spu)->pr

[POWERPC] spufs: fix assignment of node numbers

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ccb4911598172a131b6a2d99d7eecfcee1ecc8f7
Commit: ccb4911598172a131b6a2d99d7eecfcee1ecc8f7
Parent: 6e22ba63f01b9bdcd1f29251a95047d310526207
Author: Arnd Bergmann <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 19 15:32:45 2006 +0100
Committer:  Arnd Bergmann <[EMAIL PROTECTED]>
CommitDate: Tue Dec 19 15:35:39 2006 +0100

[POWERPC] spufs: fix assignment of node numbers

The difference between 'nid' and 'node' fields in an
spu structure was used incorrectly. The common 'node'
number now reflects the NUMA node, and it is used
in other places in the code as well.

The 'nid' value is meaningful only in one place, namely
the computation of the interrupt numbers based on the
physical location of an spu.  Consequently, we look it
up directly in the place where it is used now.

Signed-off-by: Arnd Bergmann <[EMAIL PROTECTED]>
---
 arch/powerpc/platforms/cell/spu_priv1_mmio.c |   30 ++---
 1 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/arch/powerpc/platforms/cell/spu_priv1_mmio.c 
b/arch/powerpc/platforms/cell/spu_priv1_mmio.c
index c805e63..910a926 100644
--- a/arch/powerpc/platforms/cell/spu_priv1_mmio.c
+++ b/arch/powerpc/platforms/cell/spu_priv1_mmio.c
@@ -40,7 +40,6 @@
 static DEFINE_MUTEX(add_spumem_mutex);
 
 struct spu_pdata {
-   int nid;
struct device_node *devnode;
struct spu_priv1 __iomem *priv1;
 };
@@ -58,15 +57,6 @@ struct device_node *spu_devnode(struct spu *spu)
 
 EXPORT_SYMBOL_GPL(spu_devnode);
 
-static int __init find_spu_node_id(struct device_node *spe)
-{
-   const unsigned int *id;
-   struct device_node *cpu;
-   cpu = spe->parent->parent;
-   id = get_property(cpu, "node-id", NULL);
-   return id ? *id : 0;
-}
-
 static int __init cell_spuprop_present(struct spu *spu, struct device_node 
*spe,
const char *prop)
 {
@@ -87,7 +77,7 @@ static int __init cell_spuprop_present(struct spu *spu, 
struct device_node *spe,
start_pfn = p->address >> PAGE_SHIFT;
nr_pages = ((unsigned long)p->len + PAGE_SIZE - 1) >> PAGE_SHIFT;
 
-   pgdata = NODE_DATA(spu_get_pdata(spu)->nid);
+   pgdata = NODE_DATA(spu->node);
zone = pgdata->node_zones;
 
/* XXX rethink locking here */
@@ -140,6 +130,7 @@ static int __init spu_map_interrupts_old(struct spu *spu,
 {
unsigned int isrc;
const u32 *tmp;
+   int nid;
 
/* Get the interrupt source unit from the device-tree */
tmp = get_property(np, "isrc", NULL);
@@ -147,8 +138,15 @@ static int __init spu_map_interrupts_old(struct spu *spu,
return -ENODEV;
isrc = tmp[0];
 
+   tmp = get_property(np->parent->parent, "node-id", NULL);
+   if (!tmp) {
+   printk(KERN_WARNING "%s: can't find node-id\n", __FUNCTION__);
+   nid = spu->node;
+   } else
+   nid = tmp[0];
+
/* Add the node number */
-   isrc |= spu->node << IIC_IRQ_NODE_SHIFT;
+   isrc |= nid << IIC_IRQ_NODE_SHIFT;
 
/* Now map interrupts of all 3 classes */
spu->irqs[0] = irq_create_mapping(NULL, IIC_IRQ_CLASS_0 | isrc);
@@ -262,7 +260,7 @@ static int spu_map_resource(struct spu *spu, int nr,
start_pfn = resource.start >> PAGE_SHIFT;
nr_pages = (len + PAGE_SIZE - 1) >> PAGE_SHIFT;
 
-   pgdata = NODE_DATA(spu_get_pdata(spu)->nid);
+   pgdata = NODE_DATA(spu->node);
zone = pgdata->node_zones;
 
/* XXX rethink locking here */
@@ -360,7 +358,7 @@ static int __init of_create_spu(struct spu *spu, void *data)
}
spu_get_pdata(spu)->devnode = of_node_get(spe);
 
-   spu->node = find_spu_node_id(spe);
+   spu->node = of_node_to_nid(spe);
if (spu->node >= MAX_NUMNODES) {
printk(KERN_WARNING "SPE %s on node %d ignored,"
   " node number too big\n", spe->full_name, spu->node);
@@ -369,10 +367,6 @@ static int __init of_create_spu(struct spu *spu, void 
*data)
goto out_free;
}
 
-   spu_get_pdata(spu)->nid = of_node_to_nid(spe);
-   if (spu_get_pdata(spu)->nid == -1)
-   spu_get_pdata(spu)->nid = 0;
-
ret = spu_map_device(spu);
/* try old method */
if (ret)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[POWERPC] powerpc: add scanning of ebc bus to of_platform

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4bc196266e61be1ea9391a6a52c0399c5b394e5b
Commit: 4bc196266e61be1ea9391a6a52c0399c5b394e5b
Parent: ccb4911598172a131b6a2d99d7eecfcee1ecc8f7
Author: Arnd Bergmann <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 19 15:32:46 2006 +0100
Committer:  Arnd Bergmann <[EMAIL PROTECTED]>
CommitDate: Tue Dec 19 15:35:40 2006 +0100

[POWERPC] powerpc: add scanning of ebc bus to of_platform

This patch add scanning of ebc bus to of_platform, which is needed
to recognize devices located on that bus.

Signed-off-by: Christian Krafft <[EMAIL PROTECTED]>
Signed-off-by: Arnd Bergmann <[EMAIL PROTECTED]>
---
 arch/powerpc/kernel/of_platform.c |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/kernel/of_platform.c 
b/arch/powerpc/kernel/of_platform.c
index 3002ea3..b734517 100644
--- a/arch/powerpc/kernel/of_platform.c
+++ b/arch/powerpc/kernel/of_platform.c
@@ -50,6 +50,7 @@ static struct of_device_id of_default_bus_ids[] = {
{ .type = "plb5", },
{ .type = "plb4", },
{ .type = "opb", },
+   { .type = "ebc", },
{},
 };
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[POWERPC] Workaround oldworld OF bug with IRQs & P2P bridges

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6f67f9d26fe5ced50f716e9620b42c0721d8b8d9
Commit: 6f67f9d26fe5ced50f716e9620b42c0721d8b8d9
Parent: 3cd7613e25ffc0a76080045e179f984a32208829
Author: Benjamin Herrenschmidt <[EMAIL PROTECTED]>
AuthorDate: Fri Dec 15 07:13:26 2006 +1100
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 16:37:47 2006 +1100

[POWERPC] Workaround oldworld OF bug with IRQs & P2P bridges

On some oldworld PowerMacs, OF doesn't assign interrupts properly
beyond P2P bridges. Fortunately, the fix is easy as all those machines
just wire all IRQ lines together to one IRQ which is assigned to the
bridge itself. We already have a special function for parsing Apple
OldWorld interrupts which are special, so let's add to it the ability
to walk up the PCI tree to find interrupts.

This fixes irqs on the lower slots of s900 clones among others.

Signed-off-by: Benjamin Herrenschmidt <[EMAIL PROTECTED]>
Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 arch/powerpc/kernel/prom_parse.c |   15 +--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c
index 0dfbe1c..12c51e4 100644
--- a/arch/powerpc/kernel/prom_parse.c
+++ b/arch/powerpc/kernel/prom_parse.c
@@ -920,9 +920,20 @@ static int of_irq_map_oldworld(struct device_node *device, 
int index,
 
/*
 * Old machines just have a list of interrupt numbers
-* and no interrupt-controller nodes.
+* and no interrupt-controller nodes. We also have dodgy
+* cases where the APPL,interrupts property is completely
+* missing behind pci-pci bridges and we have to get it
+* from the parent (the bridge itself, as apple just wired
+* everything together on these)
 */
-   ints = get_property(device, "AAPL,interrupts", &intlen);
+   while (device) {
+   ints = get_property(device, "AAPL,interrupts", &intlen);
+   if (ints != NULL)
+   break;
+   device = device->parent;
+   if (device && strcmp(device->type, "pci") != 0)
+   break;
+   }
if (ints == NULL)
return -EINVAL;
intlen /= sizeof(u32);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[POWERPC] iSeries: fix viodasd init

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=fb8b50078458ba74c3d3f7bf05f5ddc27b88f051
Commit: fb8b50078458ba74c3d3f7bf05f5ddc27b88f051
Parent: 6f67f9d26fe5ced50f716e9620b42c0721d8b8d9
Author: Stephen Rothwell <[EMAIL PROTECTED]>
AuthorDate: Fri Dec 15 15:40:08 2006 +1100
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 16:37:47 2006 +1100

[POWERPC] iSeries: fix viodasd init

Don't initialise viodasd except on legacy iSeries.

Signed-off-by: Stephen Rothwell <[EMAIL PROTECTED]>
Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 drivers/block/viodasd.c |6 ++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index e19ba4e..68592c3 100644
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -49,6 +49,7 @@
 #include 
 #include 
 #include 
+#include 
 
 MODULE_DESCRIPTION("iSeries Virtual DASD");
 MODULE_AUTHOR("Dave Boutcher");
@@ -769,6 +770,11 @@ static int __init viodasd_init(void)
 {
int rc;
 
+   if (!firmware_has_feature(FW_FEATURE_ISERIES)) {
+   rc = -ENODEV;
+   goto early_fail;
+   }
+
/* Try to open to our host lp */
if (viopath_hostLp == HvLpIndexInvalid)
vio_set_hostlp();
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[POWERPC] iSeries: fix iseries_veth init

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=687d18abed09315a531470a0edcae977ef6a7f9e
Commit: 687d18abed09315a531470a0edcae977ef6a7f9e
Parent: fd38451f1512fd5230e3c5dcc66d1ca867af879b
Author: Stephen Rothwell <[EMAIL PROTECTED]>
AuthorDate: Fri Dec 15 15:42:50 2006 +1100
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 16:37:48 2006 +1100

[POWERPC] iSeries: fix iseries_veth init

Only initialise iseries_veth on legacy iSeries.
Make the init and exit routines static.

Signed-off-by: Stephen Rothwell <[EMAIL PROTECTED]>
Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 drivers/net/iseries_veth.c |9 ++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index d6f4f18..2194b56 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -73,7 +73,7 @@
 #include 
 #include 
 #include 
-
+#include 
 #include 
 #include 
 #include 
@@ -1668,7 +1668,7 @@ static struct vio_driver veth_driver = {
  * Module initialization/cleanup
  */
 
-void __exit veth_module_cleanup(void)
+static void __exit veth_module_cleanup(void)
 {
int i;
struct veth_lpar_connection *cnx;
@@ -1697,11 +1697,14 @@ void __exit veth_module_cleanup(void)
 }
 module_exit(veth_module_cleanup);
 
-int __init veth_module_init(void)
+static int __init veth_module_init(void)
 {
int i;
int rc;
 
+   if (!firmware_has_feature(FW_FEATURE_ISERIES))
+   return -ENODEV;
+
this_lp = HvLpConfig_getLpIndex_outline();
 
for (i = 0; i < HVMAXARCHITECTEDLPS; ++i) {
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[POWERPC] iSeries: fix viocd init

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=31c72ad0d10b561e7e5f843747e7d0c1abf4d6f7
Commit: 31c72ad0d10b561e7e5f843747e7d0c1abf4d6f7
Parent: 687d18abed09315a531470a0edcae977ef6a7f9e
Author: Stephen Rothwell <[EMAIL PROTECTED]>
AuthorDate: Fri Dec 15 15:44:04 2006 +1100
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 16:37:48 2006 +1100

[POWERPC] iSeries: fix viocd init

Only initialise viocd on legacy iSeries.

Signed-off-by: Stephen Rothwell <[EMAIL PROTECTED]>
Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 drivers/cdrom/viocd.c |4 
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index 54ca931..93fbf84 100644
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -47,6 +47,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define VIOCD_DEVICE   "iseries/vcd"
 
@@ -748,6 +749,9 @@ static int __init viocd_init(void)
struct proc_dir_entry *e;
int ret = 0;
 
+   if (!firmware_has_feature(FW_FEATURE_ISERIES))
+   return -ENODEV;
+
if (viopath_hostLp == HvLpIndexInvalid) {
vio_set_hostlp();
/* If we don't have a host, bail out */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[POWERPC] iSeries: fix viocons init

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=94c8f9f974f2ad29b90b2830b189d74a633fef49
Commit: 94c8f9f974f2ad29b90b2830b189d74a633fef49
Parent: 31c72ad0d10b561e7e5f843747e7d0c1abf4d6f7
Author: Stephen Rothwell <[EMAIL PROTECTED]>
AuthorDate: Fri Dec 15 15:45:13 2006 +1100
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 16:37:48 2006 +1100

[POWERPC] iSeries: fix viocons init

Only initialise viocons on legacy iSeries.

Signed-off-by: Stephen Rothwell <[EMAIL PROTECTED]>
Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 drivers/char/viocons.c |7 +++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c
index 0e0da44..8de6b95 100644
--- a/drivers/char/viocons.c
+++ b/drivers/char/viocons.c
@@ -42,6 +42,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -1060,6 +1061,9 @@ static int __init viocons_init2(void)
atomic_t wait_flag;
int rc;
 
+   if (!firmware_has_feature(FW_FEATURE_ISERIES))
+   return -ENODEV;
+
/* +2 for fudge */
rc = viopath_open(HvLpConfig_getPrimaryLpIndex(),
viomajorsubtype_chario, VIOCHAR_WINDOW + 2);
@@ -1145,6 +1149,9 @@ static int __init viocons_init(void)
 {
int i;
 
+   if (!firmware_has_feature(FW_FEATURE_ISERIES))
+   return -ENODEV;
+
printk(VIOCONS_KERN_INFO "registering console\n");
for (i = 0; i < VTTY_PORTS; i++) {
port_info[i].lp = HvLpIndexInvalid;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[POWERPC] iSeries: fix CONFIG_VIOPATH dependency

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ba3ba887c3549656c17675e73e12aaa97c3548f1
Commit: ba3ba887c3549656c17675e73e12aaa97c3548f1
Parent: 94c8f9f974f2ad29b90b2830b189d74a633fef49
Author: Stephen Rothwell <[EMAIL PROTECTED]>
AuthorDate: Fri Dec 15 15:46:39 2006 +1100
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 16:37:48 2006 +1100

[POWERPC] iSeries: fix CONFIG_VIOPATH dependency

This is a long standing typo.

Signed-off-by: Stephen Rothwell <[EMAIL PROTECTED]>
Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 arch/powerpc/platforms/iseries/Kconfig |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/platforms/iseries/Kconfig 
b/arch/powerpc/platforms/iseries/Kconfig
index 887b688..54e6b3b 100644
--- a/arch/powerpc/platforms/iseries/Kconfig
+++ b/arch/powerpc/platforms/iseries/Kconfig
@@ -31,5 +31,5 @@ endmenu
 
 config VIOPATH
bool
-   depends on VIOCONS || VIODASD || VIOCD || VIOTAPE || VETH
+   depends on VIOCONS || VIODASD || VIOCD || VIOTAPE || ISERIES_VETH
default y
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[POWERPC] iSeries: fix viotape init

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=fd38451f1512fd5230e3c5dcc66d1ca867af879b
Commit: fd38451f1512fd5230e3c5dcc66d1ca867af879b
Parent: fb8b50078458ba74c3d3f7bf05f5ddc27b88f051
Author: Stephen Rothwell <[EMAIL PROTECTED]>
AuthorDate: Fri Dec 15 15:41:43 2006 +1100
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 16:37:47 2006 +1100

[POWERPC] iSeries: fix viotape init

Only initialise viotape on legacy iSeries.

Signed-off-by: Stephen Rothwell <[EMAIL PROTECTED]>
Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 drivers/char/viotape.c |5 -
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index 94d79cb..9438512 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -49,7 +49,7 @@
 
 #include 
 #include 
-
+#include 
 #include 
 #include 
 #include 
@@ -997,6 +997,9 @@ int __init viotap_init(void)
int ret;
struct proc_dir_entry *e;
 
+   if (!firmware_has_feature(FW_FEATURE_ISERIES))
+   return -ENODEV;
+
op_struct_list = NULL;
if ((ret = add_op_structs(VIOTAPE_MAXREQ)) < 0) {
printk(VIOTAPE_KERN_WARN "couldn't allocate op structs\n");
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[POWERPC] Fix build of cell zImage.initrd

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d28d027ab386ab64c905bfaa0f1e73a06bb4d9b4
Commit: d28d027ab386ab64c905bfaa0f1e73a06bb4d9b4
Parent: ba3ba887c3549656c17675e73e12aaa97c3548f1
Author: Benjamin Herrenschmidt <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 19 16:42:58 2006 +1100
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 16:37:48 2006 +1100

[POWERPC] Fix build of cell zImage.initrd

The patch adding support for zImage.ps3 didn't add a zImage.initrd.ps3
target causing builds of zImage.initrd to fail when ps3 is included in
the .config. The current method of generating ps3 images doesn't support
initrd's yet, so we create a dummy target that only displays a warning
message instead.

Signed-off-by: Benjamin Herrenschmidt <[EMAIL PROTECTED]>
Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 arch/powerpc/boot/Makefile |3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 343dbcf..98392fb 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -152,6 +152,9 @@ $(obj)/zImage.initrd.miboot: vmlinux $(wrapperbits)
 $(obj)/zImage.ps3: vmlinux
$(STRIP) -s -R .comment $< -o $@
 
+$(obj)/zImage.initrd.ps3: vmlinux
+   @echo "  WARNING zImage.initrd.ps3 not supported (yet)"
+
 $(obj)/uImage: vmlinux $(wrapperbits)
$(call cmd,wrap,uboot)
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[POWERPC] Probe Efika platform before CHRP.

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3f245e2a1eaf603cf9cf4820eb5dd8c5637bc71a
Commit: 3f245e2a1eaf603cf9cf4820eb5dd8c5637bc71a
Parent: d28d027ab386ab64c905bfaa0f1e73a06bb4d9b4
Author: David Woodhouse <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 19 09:54:56 2006 +
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 16:37:48 2006 +1100

[POWERPC] Probe Efika platform before CHRP.

The Efika matches chrp_probe() too, so put its own probe first to make
sure we get it right in a multiplatform build.

Signed-off-by: David Woodhouse <[EMAIL PROTECTED]>
Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 arch/powerpc/platforms/Makefile |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile
index 44d95ea..507d1b9 100644
--- a/arch/powerpc/platforms/Makefile
+++ b/arch/powerpc/platforms/Makefile
@@ -5,9 +5,9 @@ ifeq ($(CONFIG_PPC64),y)
 obj-$(CONFIG_PPC_PMAC) += powermac/
 endif
 endif
+obj-$(CONFIG_PPC_MPC52xx)  += 52xx/
 obj-$(CONFIG_PPC_CHRP) += chrp/
 obj-$(CONFIG_4xx)  += 4xx/
-obj-$(CONFIG_PPC_MPC52xx)  += 52xx/
 obj-$(CONFIG_PPC_83xx) += 83xx/
 obj-$(CONFIG_PPC_85xx) += 85xx/
 obj-$(CONFIG_PPC_86xx) += 86xx/
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[POWERPC] Fix PCI device channel state initialization

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=bb63ab13515951f4d09b16c9e8bd6e50b0f20d1e
Commit: bb63ab13515951f4d09b16c9e8bd6e50b0f20d1e
Parent: 173935f3619ae99fef0cea1dbe4de9c83d6c8e72
Author: Linas Vepstas <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 19 14:00:34 2006 -0600
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 16:37:49 2006 +1100

[POWERPC] Fix PCI device channel state initialization

Initialize the pci device pci channel state. This is critical
for having the pci_channel_offline() routine (in pci.h) to
function correctly.

Signed-off-by: Linas Vepstas <[EMAIL PROTECTED]>
Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 arch/powerpc/kernel/pci_64.c |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index a6b7692..73c59ec 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -360,6 +360,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,
DBG("class: 0x%x\n", dev->class);
 
dev->current_state = 4; /* unknown power state */
+   dev->error_state = pci_channel_io_normal;
 
if (!strcmp(type, "pci") || !strcmp(type, "pciex")) {
/* a PCI-PCI bridge */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[POWERPC] Fix register save area alignment for swapcontext syscall

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1c9bb1a01ac1bc92a0d98cf3e40a7922ee684dc0
Commit: 1c9bb1a01ac1bc92a0d98cf3e40a7922ee684dc0
Parent: bb63ab13515951f4d09b16c9e8bd6e50b0f20d1e
Author: Paul Mackerras <[EMAIL PROTECTED]>
AuthorDate: Wed Dec 20 13:57:06 2006 +1100
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 16:37:49 2006 +1100

[POWERPC] Fix register save area alignment for swapcontext syscall

For 32-bit processes, the getcontext side of the swapcontext system
call (i.e. the saving of the context when the first argument is
non-NULL) has to set the ctx->uc_mcontext.uc_regs pointer to the place
where it saves the registers.  Which it does, but it doesn't ensure
that the pointer is 16-byte aligned.  16-byte alignment is needed
because the Altivec/VMX registers are saved in there, and they need to
be on a 16-byte boundary.

This fixes it by ensuring the appropriate alignment of the pointer.
This issue was pointed out by Jakub Jelinek.

Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 arch/powerpc/kernel/signal_32.c |   16 +---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
index e4ebe1a..6b405a3 100644
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
@@ -835,11 +835,21 @@ long sys_swapcontext(struct ucontext __user *old_ctx,
return -EINVAL;
 
if (old_ctx != NULL) {
+   struct mcontext __user *mctx;
+
+   /*
+* old_ctx might not be 16-byte aligned, in which
+* case old_ctx->uc_mcontext won't be either.
+* Because we have the old_ctx->uc_pad2 field
+* before old_ctx->uc_mcontext, we need to round down
+* from &old_ctx->uc_mcontext to a 16-byte boundary.
+*/
+   mctx = (struct mcontext __user *)
+   ((unsigned long) &old_ctx->uc_mcontext & ~0xfUL);
if (!access_ok(VERIFY_WRITE, old_ctx, sizeof(*old_ctx))
-   || save_user_regs(regs, &old_ctx->uc_mcontext, 0)
+   || save_user_regs(regs, mctx, 0)
|| put_sigset_t(&old_ctx->uc_sigmask, ¤t->blocked)
-   || __put_user(to_user_ptr(&old_ctx->uc_mcontext),
-   &old_ctx->uc_regs))
+   || __put_user(to_user_ptr(mctx), &old_ctx->uc_regs))
return -EFAULT;
}
if (new_ctx == NULL)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

USB: Fix oops in PhidgetServo

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6a7255e1df3cf8f89c2c0c6eeea866c6bb17cfb9
Commit: 6a7255e1df3cf8f89c2c0c6eeea866c6bb17cfb9
Parent: f238085415c56618e042252894f2fcc971add645
Author: Sean Young <[EMAIL PROTECTED]>
AuthorDate: Wed Dec 6 20:27:32 2006 +
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 10:13:22 2006 -0800

USB: Fix oops in PhidgetServo

The PhidgetServo causes an Oops when any of its sysfs attributes are read
or written too, making the driver useless.

Signed-off-by: Sean Young <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
 drivers/usb/misc/phidgetservo.c |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/misc/phidgetservo.c b/drivers/usb/misc/phidgetservo.c
index 7163f05..0d9de2f 100644
--- a/drivers/usb/misc/phidgetservo.c
+++ b/drivers/usb/misc/phidgetservo.c
@@ -282,6 +282,7 @@ servo_probe(struct usb_interface *interface, const struct 
usb_device_id *id)
dev->dev = NULL;
goto out;
}
+   dev_set_drvdata(dev->dev, dev);
 
servo_count = dev->type & SERVO_COUNT_QUAD ? 4 : 1;
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

USB: fix transvibrator disconnect race

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=96ca014d53d2c2f9d3b32fe6f2f003e660c3bc63
Commit: 96ca014d53d2c2f9d3b32fe6f2f003e660c3bc63
Parent: 6a7255e1df3cf8f89c2c0c6eeea866c6bb17cfb9
Author: Oliver Neukum <[EMAIL PROTECTED]>
AuthorDate: Fri Nov 24 12:55:59 2006 +0100
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 10:13:23 2006 -0800

USB: fix transvibrator disconnect race

in disconnect you set the interface's private data to NULL. In your IO
methods you unconditionally follow the pointer into never never land.

Signed-off-by: Oliver Neukum <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
 drivers/usb/misc/trancevibrator.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/misc/trancevibrator.c 
b/drivers/usb/misc/trancevibrator.c
index 33cd91d..67e2fc2 100644
--- a/drivers/usb/misc/trancevibrator.c
+++ b/drivers/usb/misc/trancevibrator.c
@@ -120,8 +120,8 @@ static void tv_disconnect(struct usb_interface *interface)
struct trancevibrator *dev;
 
dev = usb_get_intfdata (interface);
-   usb_set_intfdata(interface, NULL);
device_remove_file(&interface->dev, &dev_attr_speed);
+   usb_set_intfdata(interface, NULL);
usb_put_dev(dev->udev);
kfree(dev);
 }
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

USB: airprime: add device id for dell wireless 5500 hsdpa card

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=87f28bde949125901494f50e4b4a5b609a20a120
Commit: 87f28bde949125901494f50e4b4a5b609a20a120
Parent: 96ca014d53d2c2f9d3b32fe6f2f003e660c3bc63
Author: Eagle Jones <[EMAIL PROTECTED]>
AuthorDate: Fri Nov 24 16:40:04 2006 -0800
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 10:13:23 2006 -0800

USB: airprime: add device id for dell wireless 5500 hsdpa card

Added the device id (0x413c, 0x8115) for the Dell wireless HSDPA 5500,
which is a rebranded Novatel EU730.

Signed-off-by: Eagle Jones <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
 drivers/usb/serial/airprime.c |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/serial/airprime.c b/drivers/usb/serial/airprime.c
index 96c7372..62a0df2 100644
--- a/drivers/usb/serial/airprime.c
+++ b/drivers/usb/serial/airprime.c
@@ -21,6 +21,7 @@ static struct usb_device_id id_table [] = {
{ USB_DEVICE(0x1410, 0x1110) }, /* Novatel Wireless Merlin CDMA */
{ USB_DEVICE(0x1410, 0x1430) }, /* Novatel Merlin XU870 HSDPA/3G */
{ USB_DEVICE(0x1410, 0x1100) }, /* ExpressCard34 Qualcomm 3G CDMA */
+   { USB_DEVICE(0x413c, 0x8115) }, /* Dell Wireless HSDPA 5500 */
{ },
 };
 MODULE_DEVICE_TABLE(usb, id_table);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

USB: ftdi_sio - MachX product ID added

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ec434e9b43c7d41bd6962b79f5374be5ca2ebe2d
Commit: ec434e9b43c7d41bd6962b79f5374be5ca2ebe2d
Parent: 87f28bde949125901494f50e4b4a5b609a20a120
Author: Jan Capek <[EMAIL PROTECTED]>
AuthorDate: Tue Nov 28 22:35:12 2006 +0100
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 10:13:23 2006 -0800

USB: ftdi_sio - MachX product ID added

below is a patch for the ftdi_sio driver to include a new device ID for
CCS MachX PIC programmer.


From: Jan Capek <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
 drivers/usb/serial/ftdi_sio.c |1 +
 drivers/usb/serial/ftdi_sio.h |5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 41b0ad2..6986e75 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -452,6 +452,7 @@ static struct usb_device_id id_table_combined [] = {
{ USB_DEVICE(FTDI_VID, LINX_FUTURE_2_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_CCSICDU20_0_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_CCSICDU40_1_PID) },
+   { USB_DEVICE(FTDI_VID, FTDI_CCSMACHX_2_PID) },
{ USB_DEVICE(FTDI_VID, INSIDE_ACCESSO) },
{ USB_DEVICE(INTREPID_VID, INTREPID_VALUECAN_PID) },
{ USB_DEVICE(INTREPID_VID, INTREPID_NEOVI_PID) },
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index bae117d..40dd394 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -312,8 +312,9 @@
 
 /* CCS Inc. ICDU/ICDU40 product ID - the FT232BM is used in an 
in-circuit-debugger */
 /* unit for PIC16's/PIC18's */
-#define FTDI_CCSICDU20_0_PID0xF9D0 
-#define FTDI_CCSICDU40_1_PID0xF9D1 
+#define FTDI_CCSICDU20_0_PID0xF9D0
+#define FTDI_CCSICDU40_1_PID0xF9D1
+#define FTDI_CCSMACHX_2_PID 0xF9D2
 
 /* Inside Accesso contactless reader (http://www.insidefr.com) */
 #define INSIDE_ACCESSO 0xFAD0
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

USB: removing ifdefed code from gl620a

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=337445313ffb7a7e97f408500c7448044d54f921
Commit: 337445313ffb7a7e97f408500c7448044d54f921
Parent: ec434e9b43c7d41bd6962b79f5374be5ca2ebe2d
Author: Oliver Neukum <[EMAIL PROTECTED]>
AuthorDate: Mon Nov 27 18:41:30 2006 +0100
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 10:13:23 2006 -0800

USB: removing ifdefed code from gl620a

as David has objected to the patch against the gl620a driver,
here's a patch implementing David' suggestion of removing the incomplete
ifdefed code from the gl620a driver.


Signed-off-by: Oliver Neukum <[EMAIL PROTECTED]>
Signed-off-by: David Brownell <[EMAIL PROTECTED]>
---
 drivers/usb/net/gl620a.c |  154 --
 1 files changed, 0 insertions(+), 154 deletions(-)

diff --git a/drivers/usb/net/gl620a.c b/drivers/usb/net/gl620a.c
index a3242be..a6f0f4d 100644
--- a/drivers/usb/net/gl620a.c
+++ b/drivers/usb/net/gl620a.c
@@ -79,160 +79,6 @@ struct gl_header {
struct gl_packetpackets;
 };
 
-#ifdef GENELINK_ACK
-
-// FIXME:  this code is incomplete, not debugged; it doesn't
-// handle interrupts correctly; it should use the generic
-// status IRQ code (which didn't exist back in 2001).
-
-struct gl_priv {
-   struct urb  *irq_urb;
-   charirq_buf [INTERRUPT_BUFSIZE];
-};
-
-static inline int gl_control_write(struct usbnet *dev, u8 request, u16 value)
-{
-   int retval;
-
-   retval = usb_control_msg(dev->udev,
- usb_sndctrlpipe(dev->udev, 0),
- request,
- USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
- value,
- 0,// index
- 0,// data buffer
- 0,// size
- USB_CTRL_SET_TIMEOUT);
-   return retval;
-}
-
-static void gl_interrupt_complete(struct urb *urb)
-{
-   int status = urb->status;
-
-   switch (status) {
-   case 0:
-   /* success */
-   break;
-   case -ECONNRESET:
-   case -ENOENT:
-   case -ESHUTDOWN:
-   /* this urb is terminated, clean up */
-   dbg("%s - urb shutting down with status: %d",
-   __FUNCTION__, status);
-   return;
-   default:
-   dbg("%s - nonzero urb status received: %d",
-   __FUNCTION__, urb->status);
-   }
-
-   status = usb_submit_urb(urb, GFP_ATOMIC);
-   if (status)
-   err("%s - usb_submit_urb failed with result %d",
-__FUNCTION__, status);
-}
-
-static int gl_interrupt_read(struct usbnet *dev)
-{
-   struct gl_priv  *priv = dev->priv_data;
-   int retval;
-
-   // issue usb interrupt read
-   if (priv && priv->irq_urb) {
-   // submit urb
-   if ((retval = usb_submit_urb(priv->irq_urb, GFP_KERNEL)) != 0)
-   dbg("gl_interrupt_read: submit fail - %X...", retval);
-   else
-   dbg("gl_interrupt_read: submit success...");
-   }
-
-   return 0;
-}
-
-// check whether another side is connected
-static int genelink_check_connect(struct usbnet *dev)
-{
-   int retval;
-
-   dbg("genelink_check_connect...");
-
-   // detect whether another side is connected
-   if ((retval = gl_control_write(dev, GENELINK_CONNECT_WRITE, 0)) != 0) {
-   dbg("%s: genelink_check_connect write fail - %X",
-   dev->net->name, retval);
-   return retval;
-   }
-
-   // usb interrupt read to ack another side
-   if ((retval = gl_interrupt_read(dev)) != 0) {
-   dbg("%s: genelink_check_connect read fail - %X",
-   dev->net->name, retval);
-   return retval;
-   }
-
-   dbg("%s: genelink_check_connect read success", dev->net->name);
-   return 0;
-}
-
-// allocate and initialize the private data for genelink
-static int genelink_init(struct usbnet *dev)
-{
-   struct gl_priv *priv;
-
-   // allocate the private data structure
-   if ((priv = kmalloc(sizeof *priv, GFP_KERNEL)) == 0) {
-   dbg("%s: cannot allocate private data per device",
-   dev->net->name);
-   return -ENOMEM;
-   }
-
-   // allocate irq urb
-   if ((priv->irq_urb = usb_alloc_urb(0, GFP_KERNEL)) == 0) {
-   dbg("%s: cannot allocate private irq urb per device",
-   dev->net->name);
-   kfree(priv);
-   return -ENOMEM;
-   }
-
-   // fill irq urb
-   usb_fill_int_urb(priv->irq_urb, dev->udev,
-   usb_rcvintpipe(dev->udev, GENELINK_I

[POWERPC] Update MTD OF documentation

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=173935f3619ae99fef0cea1dbe4de9c83d6c8e72
Commit: 173935f3619ae99fef0cea1dbe4de9c83d6c8e72
Parent: 3f245e2a1eaf603cf9cf4820eb5dd8c5637bc71a
Author: Vitaly Wool <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 19 18:44:25 2006 +0300
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 16:37:48 2006 +1100

[POWERPC] Update MTD OF documentation

This updates the Documentation/powerpc part of the MTD OF
implementation with the new field probe-type. Its support has already
been implemented in MTD part (drivers/mtd/maps/physmap_of.c).

Signed-off-by: Vitaly Wool <[EMAIL PROTECTED]>
Acked-by: Sergei Shtylyov <[EMAIL PROTECTED]>
Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 Documentation/powerpc/booting-without-of.txt |   19 +++
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Documentation/powerpc/booting-without-of.txt 
b/Documentation/powerpc/booting-without-of.txt
index b3bd366..3399427 100644
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
@@ -1703,29 +1703,32 @@ platforms are moved over to use the 
flattened-device-tree model.
 Required properties:
 
  - device_type : has to be "rom"
- - compatible : Should specify what this ROM device is compatible with
-   (i.e. "onenand"). Currently, this is most likely to be "direct-mapped"
-   (which corresponds to the MTD physmap mapping driver).
- - regs : Offset and length of the register set (or memory mapping) for
+ - compatible : Should specify what this flash device is compatible with.
+   Currently, this is most likely to be "direct-mapped" (which
+   corresponds to the MTD physmap mapping driver).
+ - reg : Offset and length of the register set (or memory mapping) for
the device.
+ - bank-width : Width of the flash data bus in bytes. Required
+   for the NOR flashes (compatible == "direct-mapped" and others) ONLY.
 
 Recommended properties :
 
- - bank-width : Width of the flash data bus in bytes. Required
-   for the NOR flashes (compatible == "direct-mapped" and others) ONLY.
  - partitions : Several pairs of 32-bit values where the first value is
partition's offset from the start of the device and the second one is
partition size in bytes with LSB used to signify a read only
-   partititon (so, the parition size should always be an even number).
+   partition (so, the parition size should always be an even number).
  - partition-names : The list of concatenated zero terminated strings
representing the partition names.
+ - probe-type : The type of probe which should be done for the chip
+   (JEDEC vs CFI actually). Valid ONLY for NOR flashes.
 
Example:
 
[EMAIL PROTECTED] {
device_type = "rom";
compatible = "direct-mapped";
-   regs = ;
+   probe-type = "CFI";
+   reg = ;
bank-width = <4>;
partitions = < 00f8
  00f8 00080001>;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

USB: mutexification of usblp

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=8e42266965b9db03a86d2cf55400cd3afb67a114
Commit: 8e42266965b9db03a86d2cf55400cd3afb67a114
Parent: b1cff285ae8d21012ad3717e412b0f50066dc061
Author: Oliver Neukum <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 3 09:46:35 2006 +0100
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 10:13:23 2006 -0800

USB: mutexification of usblp

this patch:
- converts usblp fully to mutex
- makes sleeping interruptible where EINTR can be returned anyway

Signed-off-by: Oliver Neukum <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
 drivers/usb/class/usblp.c |   54 
 1 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c
index 6303970..24ee8be 100644
--- a/drivers/usb/class/usblp.c
+++ b/drivers/usb/class/usblp.c
@@ -130,7 +130,7 @@ MFG:HEWLETT-PACKARD;MDL:DESKJET 
970C;CMD:MLC,PCL,PML;CLASS:PRINTER;DESCRIPTION:H
 
 struct usblp {
struct usb_device   *dev;   /* USB device */
-   struct semaphoresem;/* locks this struct, 
especially "dev" */
+   struct mutexmut;/* locks this struct, 
especially "dev" */
char*writebuf;  /* write 
transfer_buffer */
char*readbuf;   /* read transfer_buffer 
*/
char*statusbuf; /* status 
transfer_buffer */
@@ -465,7 +465,7 @@ static long usblp_ioctl(struct file *file, unsigned int 
cmd, unsigned long arg)
int twoints[2];
int retval = 0;
 
-   down (&usblp->sem);
+   mutex_lock (&usblp->mut);
if (!usblp->present) {
retval = -ENODEV;
goto done;
@@ -644,14 +644,14 @@ static long usblp_ioctl(struct file *file, unsigned int 
cmd, unsigned long arg)
}
 
 done:
-   up (&usblp->sem);
+   mutex_unlock (&usblp->mut);
return retval;
 }
 
 static ssize_t usblp_write(struct file *file, const char __user *buffer, 
size_t count, loff_t *ppos)
 {
struct usblp *usblp = file->private_data;
-   int timeout, rv, err = 0, transfer_length = 0;
+   int timeout, intr, rv, err = 0, transfer_length = 0;
size_t writecount = 0;
 
while (writecount < count) {
@@ -668,14 +668,16 @@ static ssize_t usblp_write(struct file *file, const char 
__user *buffer, size_t
if (rv < 0)
return writecount ? writecount : -EINTR;
}
-   down (&usblp->sem);
+   intr = mutex_lock_interruptible (&usblp->mut);
+   if (intr)
+   return writecount ? writecount : -EINTR;
if (!usblp->present) {
-   up (&usblp->sem);
+   mutex_unlock (&usblp->mut);
return -ENODEV;
}
 
if (usblp->sleeping) {
-   up (&usblp->sem);
+   mutex_unlock (&usblp->mut);
return writecount ? writecount : -ENODEV;
}
 
@@ -687,10 +689,10 @@ static ssize_t usblp_write(struct file *file, const char 
__user *buffer, size_t
err = usblp->writeurb->status;
} else
err = usblp_check_status(usblp, err);
-   up (&usblp->sem);
+   mutex_unlock (&usblp->mut);
 
/* if the fault was due to disconnect, let khubd's
-* call to usblp_disconnect() grab usblp->sem ...
+* call to usblp_disconnect() grab usblp->mut ...
 */
schedule ();
continue;
@@ -702,7 +704,7 @@ static ssize_t usblp_write(struct file *file, const char 
__user *buffer, size_t
 */
writecount += transfer_length;
if (writecount == count) {
-   up(&usblp->sem);
+   mutex_unlock(&usblp->mut);
break;
}
 
@@ -714,7 +716,7 @@ static ssize_t usblp_write(struct file *file, const char 
__user *buffer, size_t
 
if (copy_from_user(usblp->writeurb->transfer_buffer, 
   buffer + writecount, transfer_length)) {
-   up(&usblp->sem);
+   mutex_unlock(&usblp->mut);
return writecount ? writecount : -EFAULT;
}
 
@@ -727,10 +729,10 @@ static ssize_t usblp_write(struct file *file, const char 
__user *buffer, size_t
count = -EIO;
else
  

Add Baltech Reader ID to CP2101 driver

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e05998d50d0bf9de5409a178e2f9869c7d1ea83e
Commit: e05998d50d0bf9de5409a178e2f9869c7d1ea83e
Parent: 8e42266965b9db03a86d2cf55400cd3afb67a114
Author: Johannes Hoelzl <[EMAIL PROTECTED]>
AuthorDate: Sat Dec 2 16:54:27 2006 +0100
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 10:14:25 2006 -0800

Add Baltech Reader ID to CP2101 driver

this patch adds the Baltech Reader ID to the list of USB IDs in the
CP2101 driver.

From: Johannes Hoelzl <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
 drivers/usb/serial/cp2101.c |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c
index 2f9b7ac..7ebaffd 100644
--- a/drivers/usb/serial/cp2101.c
+++ b/drivers/usb/serial/cp2101.c
@@ -69,6 +69,7 @@ static struct usb_device_id id_table [] = {
{ USB_DEVICE(0x10C4, 0x8218) }, /* Lipowsky Industrie Elektronik GmbH, 
HARP-1 */
{ USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
{ USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */
+   { USB_DEVICE(0x13AD, 0x) }, /* Baltech card reader */
{ USB_DEVICE(0x16D6, 0x0001) }, /* Jablotron serial interface */
{ } /* Terminating Entry */
 };
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

USB: Prevent the funsoft serial device from entering raw mode

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c2585d962572744271a7e254d48c747727441936
Commit: c2585d962572744271a7e254d48c747727441936
Parent: e05998d50d0bf9de5409a178e2f9869c7d1ea83e
Author: David Clare <[EMAIL PROTECTED]>
AuthorDate: Fri Dec 1 18:24:38 2006 -0800
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 10:14:25 2006 -0800

USB: Prevent the funsoft serial device from entering raw mode

Added a device specific ioctl function to prevent the disabling of canonical
mode.  EINVAL is returned for any TCSETSF ioctl that doesn't have ICANON 
set.
This patch is for 2.6.17 or later kernels.

When "hwinfo --modem" is executed it opens the funsoft USB serial device and
disables canonical mode.  The device is kept this way until hwininfo has
finished probing any modems on a system.  The funsoft device expects to be
running in canonical mode.  Switching the device to raw mode can cause
incomplete data packets and device timeouts.

Signed-off-by: David Clare <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
 drivers/usb/serial/funsoft.c |   27 +++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/serial/funsoft.c b/drivers/usb/serial/funsoft.c
index 77b9772..d3be921 100644
--- a/drivers/usb/serial/funsoft.c
+++ b/drivers/usb/serial/funsoft.c
@@ -14,6 +14,9 @@
 #include 
 #include 
 #include 
+#include 
+
+static int debug;
 
 static struct usb_device_id id_table [] = {
{ USB_DEVICE(0x1404, 0xcddc) },
@@ -21,6 +24,26 @@ static struct usb_device_id id_table [] = {
 };
 MODULE_DEVICE_TABLE(usb, id_table);
 
+static int funsoft_ioctl(struct usb_serial_port *port, struct file *file,
+unsigned int cmd, unsigned long arg)
+{
+   struct termios t;
+
+   dbg("%s - port %d, cmd 0x%04x", __FUNCTION__, port->number, cmd);
+
+   if (cmd == TCSETSF) {
+   if (user_termios_to_kernel_termios(&t, (void __user *)arg))
+   return -EFAULT;
+
+   dbg("%s - iflag:%x oflag:%x cflag:%x lflag:%x", __FUNCTION__,
+   t.c_iflag, t.c_oflag, t.c_cflag, t.c_lflag);
+
+   if (!(t.c_lflag & ICANON))
+   return -EINVAL;
+   }
+   return -ENOIOCTLCMD;
+}
+
 static struct usb_driver funsoft_driver = {
.name = "funsoft",
.probe =usb_serial_probe,
@@ -39,6 +62,7 @@ static struct usb_serial_driver funsoft_device = {
.num_bulk_in =  NUM_DONT_CARE,
.num_bulk_out = NUM_DONT_CARE,
.num_ports =1,
+   .ioctl =funsoft_ioctl,
 };
 
 static int __init funsoft_init(void)
@@ -63,3 +87,6 @@ static void __exit funsoft_exit(void)
 module_init(funsoft_init);
 module_exit(funsoft_exit);
 MODULE_LICENSE("GPL");
+
+module_param(debug, bool, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(debug, "Debug enabled or not");
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

USB: fix ohci.h over-use warnings

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=abc9404bb0bcfa8677ab5978b2c8b60ab5ef7536
Commit: abc9404bb0bcfa8677ab5978b2c8b60ab5ef7536
Parent: c2585d962572744271a7e254d48c747727441936
Author: Jeff Garzik <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 3 20:53:58 2006 -0500
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 10:14:25 2006 -0800

USB: fix ohci.h over-use warnings

When u132-hcd is built, it includes local header ohci.h, which appears
to have been intended only for use by ohci-hcd.

This throws warnings about functions which are defined and not used.
The warnings thrown are because three small functions are implemented in
the header, but not declared 'inline', a rather strange affair.

Since these functions are small, let's go ahead and define them as
'inline', just like the inline functions surrounding them.  This makes
things more consistent, and kills the warnings.

Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
 drivers/usb/host/ohci.h |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h
index a2f42a2..fd93e7e 100644
--- a/drivers/usb/host/ohci.h
+++ b/drivers/usb/host/ohci.h
@@ -602,7 +602,7 @@ static inline void disable (struct ohci_hcd *ohci)
 #defineFIT (1 << 31)
 #define LSTHRESH   0x628   /* lowspeed bit threshold */
 
-static void periodic_reinit (struct ohci_hcd *ohci)
+static inline void periodic_reinit (struct ohci_hcd *ohci)
 {
u32 fi = ohci->fminterval & 0x03fff;
u32 fit = ohci_readl(ohci, &ohci->regs->fminterval) & FIT;
@@ -626,11 +626,11 @@ static void periodic_reinit (struct ohci_hcd *ohci)
temp = ohci_readl (hc, &hc->regs->roothub.register); \
temp; })
 
-static u32 roothub_a (struct ohci_hcd *hc)
+static inline u32 roothub_a (struct ohci_hcd *hc)
{ return read_roothub (hc, a, 0xfc0fe000); }
 static inline u32 roothub_b (struct ohci_hcd *hc)
{ return ohci_readl (hc, &hc->regs->roothub.b); }
 static inline u32 roothub_status (struct ohci_hcd *hc)
{ return ohci_readl (hc, &hc->regs->roothub.status); }
-static u32 roothub_portstatus (struct ohci_hcd *hc, int i)
+static inline u32 roothub_portstatus (struct ohci_hcd *hc, int i)
{ return read_roothub (hc, portstatus [i], 0xffe0fce0); }
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

usb serial: Eliminate bogus ioctl code

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b1cff285ae8d21012ad3717e412b0f50066dc061
Commit: b1cff285ae8d21012ad3717e412b0f50066dc061
Parent: 337445313ffb7a7e97f408500c7448044d54f921
Author: Alan <[EMAIL PROTECTED]>
AuthorDate: Mon Dec 4 16:43:01 2006 +
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 10:13:23 2006 -0800

usb serial: Eliminate bogus ioctl code

Several drivers have bogus ioctl code that tries unneccessarily to
override the standard processing. In the three cases here the actual code
is not only wrong but also not required as they implement the proper
set_termios method as well.

Remove the junk.

Signed-off-by: Alan Cox <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
 drivers/usb/serial/cypress_m8.c |   15 
 drivers/usb/serial/kl5kusb105.c |   68 ---
 drivers/usb/serial/mos7840.c|6 ---
 3 files changed, 0 insertions(+), 89 deletions(-)

diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index 45cdf9b..6bc1f40 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -962,21 +962,6 @@ static int cypress_ioctl (struct usb_serial_port *port, 
struct file * file, unsi
cypress_set_termios(port, &priv->tmp_termios);
return (0);
break;
-   /* these are called when setting baud rate from gpsd */
-   case TCGETS:
-   if (copy_to_user((void __user *)arg, 
port->tty->termios, sizeof(struct termios))) {
-   return -EFAULT;
-   }
-   return (0);
-   break;
-   case TCSETS:
-   if (copy_from_user(port->tty->termios, (void __user 
*)arg, sizeof(struct termios))) {
-   return -EFAULT;
-   }
-   /* here we need to call cypress_set_termios to invoke 
the new settings */
-   cypress_set_termios(port, &priv->tmp_termios);
-   return (0);
-   break;
/* This code comes from drivers/char/serial.c and ftdi_sio.c */
case TIOCMIWAIT:
while (priv != NULL) {
diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
index 73d755d..5c4b06a 100644
--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@ -87,10 +87,6 @@ static int  klsi_105_write_room  (struct 
usb_serial_port *port);
 static void klsi_105_read_bulk_callback  (struct urb *urb);
 static void klsi_105_set_termios (struct usb_serial_port *port,
  struct ktermios *old);
-static int  klsi_105_ioctl  (struct usb_serial_port *port,
- struct file * file,
- unsigned int cmd,
- unsigned long arg);
 static void klsi_105_throttle   (struct usb_serial_port *port);
 static void klsi_105_unthrottle (struct usb_serial_port *port);
 /*
@@ -140,7 +136,6 @@ static struct usb_serial_driver kl5kusb105d_device = {
.chars_in_buffer =   klsi_105_chars_in_buffer,
.write_room =klsi_105_write_room,
.read_bulk_callback =klsi_105_read_bulk_callback,
-   .ioctl = klsi_105_ioctl,
.set_termios =   klsi_105_set_termios,
/*.break_ctl =   klsi_105_break_ctl,*/
.tiocmget =  klsi_105_tiocmget,
@@ -899,69 +894,6 @@ static int klsi_105_tiocmset (struct usb_serial_port 
*port, struct file *file,
 */
return retval;
 }
-   
-static int klsi_105_ioctl (struct usb_serial_port *port, struct file * file,
-  unsigned int cmd, unsigned long arg)
-{
-   struct klsi_105_private *priv = usb_get_serial_port_data(port);
-   void __user *user_arg = (void __user *)arg;
-   
-   dbg("%scmd=0x%x", __FUNCTION__, cmd);
-
-   /* Based on code from acm.c and others */
-   switch (cmd) {
-   case TIOCMIWAIT:
-   /* wait for any of the 4 modem inputs (DCD,RI,DSR,CTS)*/
-   /* TODO */
-   dbg("%s - TIOCMIWAIT not handled", __FUNCTION__);
-   return -ENOIOCTLCMD;
-   case TIOCGICOUNT:
-   /* return count of modemline transitions */
-   /* TODO */
-   dbg("%s - TIOCGICOUNT not handled", __FUNCTION__);
-   return -ENOIOCTLCMD;
-   case TCGETS:
-   /* return current info to caller */
-   dbg("%s - TCGETS data faked/incomplete", __FUNCTION__);
-
-   if (!access_ok(VERIFY_WRIT

USB: rtl8150 new device id

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5859271ebd6c60d7d9466b485e164c6c614a
Commit: 5859271ebd6c60d7d9466b485e164c6c614a
Parent: abc9404bb0bcfa8677ab5978b2c8b60ab5ef7536
Author: Petko Manolov <[EMAIL PROTECTED]>
AuthorDate: Mon Dec 4 14:27:36 2006 +0200
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 10:14:25 2006 -0800

USB: rtl8150 new device id

This one adds another vendor ID to rtl8150 driver.  Please apply.


Signed-off-by: Petko Manolov <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
 drivers/usb/net/rtl8150.c |6 --
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/net/rtl8150.c b/drivers/usb/net/rtl8150.c
index c54235f..e0eecda 100644
--- a/drivers/usb/net/rtl8150.c
+++ b/drivers/usb/net/rtl8150.c
@@ -124,10 +124,11 @@
 #defineRX_URB_FAIL 3
 
 /* Define these values to match your device */
-#define VENDOR_ID_REALTEK  0x0bda
+#defineVENDOR_ID_REALTEK   0x0bda
 #defineVENDOR_ID_MELCO 0x0411
-#define VENDOR_ID_MICRONET 0x3980
+#defineVENDOR_ID_MICRONET  0x3980
 #defineVENDOR_ID_LONGSHINE 0x07b8
+#defineVENDOR_ID_OQO   0x1557
 #defineVENDOR_ID_ZYXEL 0x0586
 
 #define PRODUCT_ID_RTL8150 0x8150
@@ -144,6 +145,7 @@ static struct usb_device_id rtl8150_table[] = {
{USB_DEVICE(VENDOR_ID_MELCO, PRODUCT_ID_LUAKTX)},
{USB_DEVICE(VENDOR_ID_MICRONET, PRODUCT_ID_SP128AR)},
{USB_DEVICE(VENDOR_ID_LONGSHINE, PRODUCT_ID_LCS8138TX)},
+   {USB_DEVICE(VENDOR_ID_OQO, PRODUCT_ID_RTL8150)},
{USB_DEVICE(VENDOR_ID_ZYXEL, PRODUCT_ID_PRESTIGE)},
{}
 };
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

usb-storage: Ignore the virtual cd-drive of the Huawei E220 USB Modem

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=16c76865df40357027479b6d85f59a07f8d01c8d
Commit: 16c76865df40357027479b6d85f59a07f8d01c8d
Parent: 5859271ebd6c60d7d9466b485e164c6c614a
Author: Johann Wilhelm <[EMAIL PROTECTED]>
AuthorDate: Sat Dec 2 07:16:32 2006 +0100
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 10:14:25 2006 -0800

usb-storage: Ignore the virtual cd-drive of the Huawei E220 USB Modem

This prevents the kernel from detecting the virtual cd-drive with the
Windows drivers.

Signed-off-by: Johann Wilhelm <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
 drivers/usb/storage/unusual_devs.h |9 +
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/storage/unusual_devs.h 
b/drivers/usb/storage/unusual_devs.h
index db8b260..7640bdd 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -1328,6 +1328,15 @@ UNUSUAL_DEV(  0x1210, 0x0003, 0x0100, 0x0100,
US_SC_DEVICE, US_PR_DEVICE, NULL,
US_FL_IGNORE_RESIDUE ),
 
+/* This prevents the kernel from detecting the virtual cd-drive with the
+ * Windows drivers.  <[EMAIL PROTECTED]>
+*/
+UNUSUAL_DEV( 0x12d1, 0x1003, 0x, 0x,
+   "HUAWEI",
+   "E220 USB-UMTS Install",
+   US_SC_DEVICE, US_PR_DEVICE, NULL,
+   US_FL_IGNORE_DEVICE),
+
 /* Reported by Vilius Bilinkevicius http://vger.kernel.org/majordomo-info.html

usb-gsm-driver: Added VendorId and ProductId for Huawei E220 USB Modem

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ab1958905514da3b6c06d61523ebed142a16cc72
Commit: ab1958905514da3b6c06d61523ebed142a16cc72
Parent: 16c76865df40357027479b6d85f59a07f8d01c8d
Author: Johann Wilhelm <[EMAIL PROTECTED]>
AuthorDate: Sat Dec 2 07:25:31 2006 +0100
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 10:14:25 2006 -0800

usb-gsm-driver: Added VendorId and ProductId for Huawei E220 USB Modem

Added VendorId and ProductId for Huawei E220 USB Modem

Signed-off-by: Johann Wilhelm <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
 drivers/usb/serial/option.c |3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 0ae4098..819266b 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -79,6 +79,7 @@ static int  option_send_setup(struct usb_serial_port *port);
 #define OPTION_PRODUCT_COBRA0x6500
 #define OPTION_PRODUCT_COBRA2   0x6600
 #define HUAWEI_PRODUCT_E600 0x1001
+#define HUAWEI_PRODUCT_E220 0x1003
 #define AUDIOVOX_PRODUCT_AIRCARD0x0112
 #define NOVATELWIRELESS_PRODUCT_U7400x1400
 #define ANYDATA_PRODUCT_ID  0x6501
@@ -90,6 +91,7 @@ static struct usb_device_id option_ids[] = {
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA) },
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA2) },
{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) },
+   { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220) },
{ USB_DEVICE(AUDIOVOX_VENDOR_ID, AUDIOVOX_PRODUCT_AIRCARD) },
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID,NOVATELWIRELESS_PRODUCT_U740) },
{ USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ID) },
@@ -103,6 +105,7 @@ static struct usb_device_id option_ids1[] = {
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA) },
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA2) },
{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) },
+   { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220) },
{ USB_DEVICE(AUDIOVOX_VENDOR_ID, AUDIOVOX_PRODUCT_AIRCARD) },
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID,NOVATELWIRELESS_PRODUCT_U740) },
{ USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ID) },
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

USB: fix Wacom Intuos3 4x6 bugs

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=071e0a2aee9c289f50b9329d0c26474ca94f7c7a
Commit: 071e0a2aee9c289f50b9329d0c26474ca94f7c7a
Parent: ab1958905514da3b6c06d61523ebed142a16cc72
Author: Ping Cheng <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 5 17:09:51 2006 -0800
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 10:14:26 2006 -0800

USB: fix Wacom Intuos3 4x6 bugs

Fixes Intuos3 4x6 bugs

Signed-off-by: Ping Cheng <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
 drivers/usb/input/wacom_sys.c |4 ++--
 drivers/usb/input/wacom_wac.c |   26 ++
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/drivers/usb/input/wacom_sys.c b/drivers/usb/input/wacom_sys.c
index e7cc20a..12b4274 100644
--- a/drivers/usb/input/wacom_sys.c
+++ b/drivers/usb/input/wacom_sys.c
@@ -159,13 +159,13 @@ void input_dev_i3s(struct input_dev *input_dev, struct 
wacom_wac *wacom_wac)
 {
input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_FINGER);
input_dev->keybit[LONG(BTN_LEFT)] |= BIT(BTN_0) | BIT(BTN_1) | 
BIT(BTN_2) | BIT(BTN_3);
-   input_set_abs_params(input_dev, ABS_RX, 0, 4097, 0, 0);
+   input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0);
 }
 
 void input_dev_i3(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 {
input_dev->keybit[LONG(BTN_LEFT)] |= BIT(BTN_4) | BIT(BTN_5) | 
BIT(BTN_6) | BIT(BTN_7);
-   input_set_abs_params(input_dev, ABS_RY, 0, 4097, 0, 0);
+   input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0);
 }
 
 void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
diff --git a/drivers/usb/input/wacom_wac.c b/drivers/usb/input/wacom_wac.c
index 92726fe..4142e36 100644
--- a/drivers/usb/input/wacom_wac.c
+++ b/drivers/usb/input/wacom_wac.c
@@ -209,13 +209,15 @@ static int wacom_graphire_irq(struct wacom_wac *wacom, 
void *wcombo)
wacom_report_key(wcombo, BTN_STYLUS, data[1] & 0x02);
wacom_report_key(wcombo, BTN_STYLUS2, data[1] & 0x04);
}
-   }
-
-   if (data[1] & 0x10)
wacom_report_abs(wcombo, ABS_MISC, id); /* report tool id */
+   }
else
wacom_report_abs(wcombo, ABS_MISC, 0); /* reset tool id */
-   wacom_report_key(wcombo, wacom->tool[0], data[1] & 0x10);
+
+   if (data[1] & 0x10)  /* only report prox-in when in area */
+   wacom_report_key(wcombo, wacom->tool[0], 1);
+   if (!(data[1] & 0x90))  /* report prox-out when physically out */
+   wacom_report_key(wcombo, wacom->tool[0], 0);
wacom_input_sync(wcombo);
 
/* send pad data */
@@ -405,7 +407,7 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void 
*wcombo)
if ((wacom->features->type == CINTIQ) && !(data[1] & 0x40))
  return 0;
 
-   if (wacom->features->type >= INTUOS3) {
+   if (wacom->features->type >= INTUOS3S) {
wacom_report_abs(wcombo, ABS_X, (data[2] << 9) | (data[3] << 1) 
| ((data[9] >> 1) & 1));
wacom_report_abs(wcombo, ABS_Y, (data[4] << 9) | (data[5] << 1) 
| (data[9] & 1));
wacom_report_abs(wcombo, ABS_DISTANCE, ((data[9] >> 2) & 0x3f));
@@ -423,7 +425,7 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void 
*wcombo)
 
if (data[1] & 0x02) {
/* Rotation packet */
-   if (wacom->features->type >= INTUOS3) {
+   if (wacom->features->type >= INTUOS3S) {
/* I3 marker pen rotation reported as wheel
 * due to valuator limitation
 */
@@ -547,11 +549,11 @@ static struct wacom_features wacom_features[] = {
{ "Wacom Graphire3 6x8", 8,  16704, 12064,  511, 63, GRAPHIRE },
{ "Wacom Graphire4 4x5", 8,  10208,  7424,  511, 63, WACOM_G4 },
{ "Wacom Graphire4 6x8", 8,  16704, 12064,  511, 63, WACOM_G4 },
-   { "Wacom Volito",8,   5104,  3712,  511,  0, GRAPHIRE },
-   { "Wacom PenStation2",   8,   3250,  2320,  255,  0, GRAPHIRE },
-   { "Wacom Volito2 4x5",   8,   5104,  3712,  511,  0, GRAPHIRE },
-   { "Wacom Volito2 2x3",   8,   3248,  2320,  511,  0, GRAPHIRE },
-   { "Wacom PenPartner2",   8,   3250,  2320,  255,  0, GRAPHIRE },
+   { "Wacom Volito",8,   5104,  3712,  511, 63, GRAPHIRE },
+   { "Wacom PenStation2",   8,   3250,  2320,  255, 63, GRAPHIRE },
+   { "Wacom Volito2 4x5",   8,   5104,  3712,  511, 63, GRAPHIRE },
+   { "Wacom Volito2 2x3",   8,   3248,  2320,  511, 63, GRAPHIRE },
+   { "Wacom PenPartner2",   8,   3250,  2320,  255, 63, GRAPHIRE },
{ "Wacom Intuos 4x5",   10,  12700, 10600, 1023, 63, INTUOS },
{ "Wacom Intuos 6x8",   10,  20320, 16240, 1023, 63, INTUOS },
  

USB AUERSWALD: replace kmalloc+memset with kzalloc

[Linux Kernel Mailing List]

Gitweb: 
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=66eb2e93b99b79bd3d55ecea2098a8369c1ded0d
Commit: 66eb2e93b99b79bd3d55ecea2098a8369c1ded0d
Parent: 071e0a2aee9c289f50b9329d0c26474ca94f7c7a
Author: Burman Yan <[EMAIL PROTECTED]>
AuthorDate: Mon Dec 4 15:22:40 2006 -0800
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Wed Dec 20 10:14:26 2006 -0800

USB AUERSWALD: replace kmalloc+memset with kzalloc

Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
 drivers/usb/misc/auerswald.c |6 ++
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/misc/auerswald.c b/drivers/usb/misc/auerswald.c
index 6c7f3ef..b5332e6 100644
--- a/drivers/usb/misc/auerswald.c
+++ b/drivers/usb/misc/auerswald.c
@@ -1376,7 +1376,7 @@ static int auerchar_open (struct inode *inode, struct 
file *file)
}
 
/* we have access to the device. Now lets allocate memory */
-   ccp = (pauerchar_t) kmalloc(sizeof(auerchar_t), GFP_KERNEL);
+   ccp = kzalloc(sizeof(auerchar_t), GFP_KERNEL);
if (ccp == NULL) {
err ("out of memory");
ret = -ENOMEM;
@@ -1384,7 +1384,6 @@ static int auerchar_open (struct inode *inode, struct 
file *file)
}
 
/* Initialize device descriptor */
-   memset( ccp, 0, sizeof(auerchar_t));
init_MUTEX( &ccp->mutex);
init_MUTEX( &ccp->readmutex);
 auerbuf_init (&ccp->bufctl);
@@ -1912,14 +1911,13 @@ static int auerswald_probe (struct usb_interface *intf,
return -ENODEV;
 
/* allocate memory for our device and initialize it */
-   cp = kmalloc (sizeof(auerswald_t), GFP_KERNEL);
+   cp = kzalloc (sizeof(auerswald_t), GFP_KERNEL);
if (cp == NULL) {
err ("out of memory");
goto pfail;
}
 
/* Initialize device descriptor */
-   memset (cp, 0, sizeof(auerswald_t));
init_MUTEX (&cp->mutex);
cp->usbdev = usbdev;
auerchain_init (&cp->controlchain);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html