Merge branch 'upstream-fixes'

5 files changed, 45 insertions, 7 deletions

diff --git a/include/asm-arm/semaphore.h b/include/asm-arm/semaphore.h
index 71ca7d412687..d5dc624f452a 100644
--- a/include/asm-arm/semaphore.h
+++ b/include/asm-arm/semaphore.h
@@ -47,11 +47,6 @@ static inline void init_MUTEX_LOCKED(struct semaphore *sem)
         sema_init(sem, 0);
 }
 
-static inline int sema_count(struct semaphore *sem)
-{
-        return atomic_read(&sem->count);
-}
-
 /*
  * special register calling convention
  */
diff --git a/include/asm-arm/spinlock.h b/include/asm-arm/spinlock.h
index 6ed4f916b166..43ad4e55878c 100644
--- a/include/asm-arm/spinlock.h
+++ b/include/asm-arm/spinlock.h
@@ -30,6 +30,9 @@ static inline void __raw_spin_lock(raw_spinlock_t *lock)
         __asm__ __volatile__(
 "1:     ldrex   %0, [%1]\n"
 "       teq     %0, #0\n"
+#ifdef CONFIG_CPU_32v6K
+"       wfene\n"
+#endif
 "       strexeq %0, %2, [%1]\n"
 "       teqeq   %0, #0\n"
 "       bne     1b"
@@ -65,7 +68,11 @@ static inline void __raw_spin_unlock(raw_spinlock_t *lock)
         smp_mb();
 
         __asm__ __volatile__(
-"       str     %1, [%0]"
+"       str     %1, [%0]\n"
+#ifdef CONFIG_CPU_32v6K
+"       mcr     p15, 0, %1, c7, c10, 4\n" /* DSB */
+"       sev"
+#endif
         :
         : "r" (&lock->lock), "r" (0)
         : "cc");
@@ -87,6 +94,9 @@ static inline void __raw_write_lock(raw_rwlock_t *rw)
         __asm__ __volatile__(
 "1:     ldrex   %0, [%1]\n"
 "       teq     %0, #0\n"
+#ifdef CONFIG_CPU_32v6K
+"       wfene\n"
+#endif
 "       strexeq %0, %2, [%1]\n"
 "       teq     %0, #0\n"
 "       bne     1b"
@@ -122,7 +132,11 @@ static inline void __raw_write_unlock(raw_rwlock_t *rw)
         smp_mb();
 
         __asm__ __volatile__(
-        "str    %1, [%0]"
+        "str    %1, [%0]\n"
+#ifdef CONFIG_CPU_32v6K
+"       mcr     p15, 0, %1, c7, c10, 4\n" /* DSB */
+"       sev\n"
+#endif
         :
         : "r" (&rw->lock), "r" (0)
         : "cc");
@@ -148,6 +162,9 @@ static inline void __raw_read_lock(raw_rwlock_t *rw)
 "1:     ldrex   %0, [%2]\n"
 "       adds    %0, %0, #1\n"
 "       strexpl %1, %0, [%2]\n"
+#ifdef CONFIG_CPU_32v6K
+"       wfemi\n"
+#endif
 "       rsbpls  %0, %1, #0\n"
 "       bmi     1b"
         : "=&r" (tmp), "=&r" (tmp2)
@@ -169,6 +186,11 @@ static inline void __raw_read_unlock(raw_rwlock_t *rw)
 "       strex   %1, %0, [%2]\n"
 "       teq     %1, #0\n"
 "       bne     1b"
+#ifdef CONFIG_CPU_32v6K
+"\n     cmp     %0, #0\n"
+"       mcreq   p15, 0, %0, c7, c10, 4\n"
+"       seveq"
+#endif
         : "=&r" (tmp), "=&r" (tmp2)
         : "r" (&rw->lock)
         : "cc");
diff --git a/include/asm-mips/mach-qemu/timex.h b/include/asm-mips/mach-qemu/timex.h
new file mode 100644
index 000000000000..cd543693fb0a
--- /dev/null
+++ b/include/asm-mips/mach-qemu/timex.h
@@ -0,0 +1,16 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2005 Daniel Jacobowitz
+ */
+#ifndef __ASM_MACH_QEMU_TIMEX_H
+#define __ASM_MACH_QEMU_TIMEX_H
+
+/*
+ * We use a simulated i8254 PIC...
+ */
+#define CLOCK_TICK_RATE         1193182
+
+#endif /* __ASM_MACH_QEMU_TIMEX_H */
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index 1543daaa9c5e..ef3b5632e63a 100644
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -108,6 +108,7 @@
 #define I2C_DRIVERID_SAA7127    72      /* saa7124 video encoder        */
 #define I2C_DRIVERID_SAA711X    73      /* saa711x video encoders       */
 #define I2C_DRIVERID_AKITAIOEXP 74      /* IO Expander on Sharp SL-C1000 */
+#define I2C_DRIVERID_I2C_IR     75      /* I2C InfraRed on Video boards */
 
 #define I2C_DRIVERID_EXP0       0xF0    /* experimental use id's        */
 #define I2C_DRIVERID_EXP1       0xF1
diff --git a/include/media/tveeprom.h b/include/media/tveeprom.h
index e2035c7da094..e9fc1a785497 100644
--- a/include/media/tveeprom.h
+++ b/include/media/tveeprom.h
@@ -4,12 +4,15 @@
 struct tveeprom {
         u32 has_radio;
         u32 has_ir;     /* 0: no IR, 1: IR present, 2: unknown */
+        u32 has_MAC_address; /* 0: no MAC, 1: MAC present, 2: unknown */
 
         u32 tuner_type;
         u32 tuner_formats;
+        u32 tuner_hauppauge_model;
 
         u32 tuner2_type;
         u32 tuner2_formats;
+        u32 tuner2_hauppauge_model;
 
         u32 digitizer;
         u32 digitizer_formats;
@@ -21,6 +24,7 @@ struct tveeprom {
         u32 revision;
         u32 serial_number;
         char rev_str[5];
+        u8 MAC_address[6];
 };
 
 void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,