Merge Linux 2.6.23

8 files changed, 254 insertions, 70 deletions

diff --git a/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h b/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h
index e043cafa3c42..69b9f8e120e9 100644
--- a/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h
@@ -1,5 +1,6 @@
 #include <linux/serial.h>
 #include <asm/dma.h>
+#include <asm/portmux.h>
 
 #define NR_PORTS                1
 
@@ -92,18 +93,24 @@ struct bfin_serial_res bfin_serial_resource[] = {
         }
 };
 
+#define DRIVER_NAME "bfin-uart"
 
 int nr_ports = NR_PORTS;
 static void bfin_serial_hw_init(struct bfin_serial_port *uart)
 {
 
+#ifdef CONFIG_SERIAL_BFIN_UART0
+        peripheral_request(P_UART0_TX, DRIVER_NAME);
+        peripheral_request(P_UART0_RX, DRIVER_NAME);
+#endif
+
 #ifdef CONFIG_SERIAL_BFIN_CTSRTS
         if (uart->cts_pin >= 0) {
-                gpio_request(uart->cts_pin, NULL);
+                gpio_request(uart->cts_pin, DRIVER_NAME);
                 gpio_direction_input(uart->cts_pin);
         }
         if (uart->rts_pin >= 0) {
-                gpio_request(uart->rts_pin, NULL);
+                gpio_request(uart->rts_pin, DRIVER_NAME);
                 gpio_direction_input(uart->rts_pin);
         }
 #endif
diff --git a/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h b/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h
index 8f5d9c4d8d5b..6fb328f5186a 100644
--- a/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h
@@ -1,5 +1,6 @@
 #include <linux/serial.h>
 #include <asm/dma.h>
+#include <asm/portmux.h>
 
 #define NR_PORTS                2
 
@@ -122,25 +123,29 @@ struct bfin_serial_res bfin_serial_resource[] = {
 
 int nr_ports = ARRAY_SIZE(bfin_serial_resource);
 
+#define DRIVER_NAME "bfin-uart"
+
 static void bfin_serial_hw_init(struct bfin_serial_port *uart)
 {
-        unsigned short val;
-        val = bfin_read16(BFIN_PORT_MUX);
-        val &= ~(PFDE | PFTE);
-        bfin_write16(BFIN_PORT_MUX, val);
 
-        val = bfin_read16(PORTF_FER);
-        val |= 0xF;
-        bfin_write16(PORTF_FER, val);
+#ifdef CONFIG_SERIAL_BFIN_UART0
+        peripheral_request(P_UART0_TX, DRIVER_NAME);
+        peripheral_request(P_UART0_RX, DRIVER_NAME);
+#endif
+
+#ifdef CONFIG_SERIAL_BFIN_UART1
+        peripheral_request(P_UART1_TX, DRIVER_NAME);
+        peripheral_request(P_UART1_RX, DRIVER_NAME);
+#endif
 
 #ifdef CONFIG_SERIAL_BFIN_CTSRTS
         if (uart->cts_pin >= 0) {
-                gpio_request(uart->cts_pin, NULL);
+                gpio_request(uart->cts_pin, DRIVER_NAME);
                 gpio_direction_input(uart->cts_pin);
         }
 
         if (uart->rts_pin >= 0) {
-                gpio_request(uart->rts_pin, NULL);
+                gpio_request(uart->rts_pin, DRIVER_NAME);
                 gpio_direction_output(uart->rts_pin);
         }
 #endif
diff --git a/include/asm-blackfin/mach-bf537/portmux.h b/include/asm-blackfin/mach-bf537/portmux.h
index 23e13c5abc4d..ae6c53b28452 100644
--- a/include/asm-blackfin/mach-bf537/portmux.h
+++ b/include/asm-blackfin/mach-bf537/portmux.h
@@ -106,4 +106,37 @@
 #define P_SPI0_SSEL2    (P_DEFINED | P_IDENT(PORT_PJ11) | P_FUNCT(1))
 #define P_SPI0_SSEL7    (P_DEFINED | P_IDENT(PORT_PJ5) | P_FUNCT(2))
 
-#endif /* _MACH_PORTMUX_H_ */
+#define P_MII0 {\
+        P_MII0_ETxD0, \
+        P_MII0_ETxD1, \
+        P_MII0_ETxD2, \
+        P_MII0_ETxD3, \
+        P_MII0_ETxEN, \
+        P_MII0_TxCLK, \
+        P_MII0_PHYINT, \
+        P_MII0_COL, \
+        P_MII0_ERxD0, \
+        P_MII0_ERxD1, \
+        P_MII0_ERxD2, \
+        P_MII0_ERxD3, \
+        P_MII0_ERxDV, \
+        P_MII0_ERxCLK, \
+        P_MII0_ERxER, \
+        P_MII0_CRS, \
+        P_MDC, \
+        P_MDIO, 0}
+
+
+#define P_RMII0 {\
+        P_MII0_ETxD0, \
+        P_MII0_ETxD1, \
+        P_MII0_ETxEN, \
+        P_MII0_ERxD0, \
+        P_MII0_ERxD1, \
+        P_MII0_ERxER, \
+        P_RMII0_REF_CLK, \
+        P_RMII0_MDINT, \
+        P_RMII0_CRS_DV, \
+        P_MDC, \
+        P_MDIO, 0}
+#endif                                  /* _MACH_PORTMUX_H_ */
diff --git a/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h b/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h
index e043cafa3c42..69b9f8e120e9 100644
--- a/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h
@@ -1,5 +1,6 @@
 #include <linux/serial.h>
 #include <asm/dma.h>
+#include <asm/portmux.h>
 
 #define NR_PORTS                1
 
@@ -92,18 +93,24 @@ struct bfin_serial_res bfin_serial_resource[] = {
         }
 };
 
+#define DRIVER_NAME "bfin-uart"
 
 int nr_ports = NR_PORTS;
 static void bfin_serial_hw_init(struct bfin_serial_port *uart)
 {
 
+#ifdef CONFIG_SERIAL_BFIN_UART0
+        peripheral_request(P_UART0_TX, DRIVER_NAME);
+        peripheral_request(P_UART0_RX, DRIVER_NAME);
+#endif
+
 #ifdef CONFIG_SERIAL_BFIN_CTSRTS
         if (uart->cts_pin >= 0) {
-                gpio_request(uart->cts_pin, NULL);
+                gpio_request(uart->cts_pin, DRIVER_NAME);
                 gpio_direction_input(uart->cts_pin);
         }
         if (uart->rts_pin >= 0) {
-                gpio_request(uart->rts_pin, NULL);
+                gpio_request(uart->rts_pin, DRIVER_NAME);
                 gpio_direction_input(uart->rts_pin);
         }
 #endif
diff --git a/include/asm-blackfin/mach-bf561/cdefBF561.h b/include/asm-blackfin/mach-bf561/cdefBF561.h
index 6e87ab269ffe..73d4d65249cd 100644
--- a/include/asm-blackfin/mach-bf561/cdefBF561.h
+++ b/include/asm-blackfin/mach-bf561/cdefBF561.h
@@ -83,9 +83,9 @@ static __inline__ void bfin_write_VR_CTL(unsigned int val)
 
 /* For MMR's that are reserved on Core B, set up defines to better integrate with other ports */
 #define bfin_read_SWRST()                    bfin_read_SICA_SWRST()
-#define bfin_write_SWRST()                   bfin_write_SICA_SWRST()
+#define bfin_write_SWRST(val)                bfin_write_SICA_SWRST(val)
 #define bfin_read_SYSCR()                    bfin_read_SICA_SYSCR()
-#define bfin_write_SYSCR()                   bfin_write_SICA_SYSCR()
+#define bfin_write_SYSCR(val)                bfin_write_SICA_SYSCR(val)
 
 /* System Reset and Interrupt Controller registers for core A (0xFFC0 0100-0xFFC0 01FF) */
 #define bfin_read_SICA_SWRST()               bfin_read16(SICA_SWRST)
diff --git a/include/asm-blackfin/portmux.h b/include/asm-blackfin/portmux.h
index 9d3681e42111..0d3f650d2d99 100644
--- a/include/asm-blackfin/portmux.h
+++ b/include/asm-blackfin/portmux.h
@@ -14,6 +14,12 @@
 #define P_MAYSHARE      0x2000
 #define P_DONTCARE      0x1000
 
+
+int peripheral_request(unsigned short per, const char *label);
+void peripheral_free(unsigned short per);
+int peripheral_request_list(unsigned short per[], const char *label);
+void peripheral_free_list(unsigned short per[]);
+
 #include <asm/gpio.h>
 #include <asm/mach/portmux.h>
 
@@ -145,6 +151,22 @@
 #define P_SPI2_SSEL3 P_UNDEF
 #endif
 
+#ifndef P_SPI2_SSEL4
+#define P_SPI2_SSEL4 P_UNDEF
+#endif
+
+#ifndef P_SPI2_SSEL5
+#define P_SPI2_SSEL5 P_UNDEF
+#endif
+
+#ifndef P_SPI2_SSEL6
+#define P_SPI2_SSEL6 P_UNDEF
+#endif
+
+#ifndef P_SPI2_SSEL7
+#define P_SPI2_SSEL7 P_UNDEF
+#endif
+
 #ifndef P_SPI2_SCK
 #define P_SPI2_SCK P_UNDEF
 #endif
@@ -513,6 +535,22 @@
 #define P_SPI0_SSEL3 P_UNDEF
 #endif
 
+#ifndef P_SPI0_SSEL4
+#define P_SPI0_SSEL4 P_UNDEF
+#endif
+
+#ifndef P_SPI0_SSEL5
+#define P_SPI0_SSEL5 P_UNDEF
+#endif
+
+#ifndef P_SPI0_SSEL6
+#define P_SPI0_SSEL6 P_UNDEF
+#endif
+
+#ifndef P_SPI0_SSEL7
+#define P_SPI0_SSEL7 P_UNDEF
+#endif
+
 #ifndef P_UART0_TX
 #define P_UART0_TX P_UNDEF
 #endif
@@ -741,6 +779,23 @@
 #define P_SPI1_SSEL3 P_UNDEF
 #endif
 
+
+#ifndef P_SPI1_SSEL4
+#define P_SPI1_SSEL4 P_UNDEF
+#endif
+
+#ifndef P_SPI1_SSEL5
+#define P_SPI1_SSEL5 P_UNDEF
+#endif
+
+#ifndef P_SPI1_SSEL6
+#define P_SPI1_SSEL6 P_UNDEF
+#endif
+
+#ifndef P_SPI1_SSEL7
+#define P_SPI1_SSEL7 P_UNDEF
+#endif
+
 #ifndef P_SPI1_SCK
 #define P_SPI1_SCK P_UNDEF
 #endif
diff --git a/include/asm-blackfin/string.h b/include/asm-blackfin/string.h
index 6f1eb7d6d3cb..e8ada91ab002 100644
--- a/include/asm-blackfin/string.h
+++ b/include/asm-blackfin/string.h
@@ -9,13 +9,16 @@ extern inline char *strcpy(char *dest, const char *src)
         char *xdest = dest;
         char temp = 0;
 
-        __asm__ __volatile__
-            ("1:\t%2 = B [%1++] (Z);\n\t"
-             "B [%0++] = %2;\n\t"
-             "CC = %2;\n\t"
-        "if cc jump 1b (bp);\n"
-        : "+&a" (dest), "+&a" (src), "=&d" (temp)
-             ::"memory", "CC");
+        __asm__ __volatile__ (
+                "1:"
+                "%2 = B [%1++] (Z);"
+                "B [%0++] = %2;"
+                "CC = %2;"
+                "if cc jump 1b (bp);"
+                : "+&a" (dest), "+&a" (src), "=&d" (temp)
+                :
+                : "memory", "CC");
+
         return xdest;
 }
 
@@ -28,37 +31,56 @@ extern inline char *strncpy(char *dest, const char *src, size_t n)
         if (n == 0)
                 return xdest;
 
-        __asm__ __volatile__
-            ("1:\t%3 = B [%1++] (Z);\n\t"
-             "B [%0++] = %3;\n\t"
-             "CC = %3;\n\t"
-             "if ! cc jump 2f;\n\t"
-             "%2 += -1;\n\t"
-             "CC = %2 == 0;\n\t"
-             "if ! cc jump 1b (bp);\n"
-        "2:\n"
-        : "+&a" (dest), "+&a" (src), "+&da" (n), "=&d" (temp)
-             ::"memory", "CC");
+        __asm__ __volatile__ (
+                "1:"
+                "%3 = B [%1++] (Z);"
+                "B [%0++] = %3;"
+                "CC = %3;"
+                "if ! cc jump 2f;"
+                "%2 += -1;"
+                "CC = %2 == 0;"
+                "if ! cc jump 1b (bp);"
+                "jump 4f;"
+                "2:"
+                /* if src is shorter than n, we need to null pad bytes now */
+                "%3 = 0;"
+                "3:"
+                "%2 += -1;"
+                "CC = %2 == 0;"
+                "if cc jump 4f;"
+                "B [%0++] = %3;"
+                "jump 3b;"
+                "4:"
+                : "+&a" (dest), "+&a" (src), "+&da" (n), "=&d" (temp)
+                :
+                : "memory", "CC");
+
         return xdest;
 }
 
 #define __HAVE_ARCH_STRCMP
 extern inline int strcmp(const char *cs, const char *ct)
 {
-        char __res1, __res2;
-
-        __asm__
-       ("1:\t%2 = B[%0++] (Z);\n\t" /* get *cs */
-                "%3 = B[%1++] (Z);\n\t" /* get *ct */
-                "CC = %2 == %3;\n\t"    /* compare a byte */
-                "if ! cc jump 2f;\n\t"  /* not equal, break out */
-                "CC = %2;\n\t"  /* at end of cs? */
-                "if cc jump 1b (bp);\n\t"       /* no, keep going */
-                "jump.s 3f;\n"  /* strings are equal */
-                "2:\t%2 = %2 - %3;\n"   /* *cs - *ct */
-        "3:\n"
-        : "+&a" (cs), "+&a" (ct), "=&d" (__res1), "=&d" (__res2)
-      : :       "CC");
+        /* need to use int's here so the char's in the assembly don't get
+         * sign extended incorrectly when we don't want them to be
+         */
+        int __res1, __res2;
+
+        __asm__ __volatile__ (
+                "1:"
+                "%2 = B[%0++] (Z);"      /* get *cs */
+                "%3 = B[%1++] (Z);"      /* get *ct */
+                "CC = %2 == %3;"         /* compare a byte */
+                "if ! cc jump 2f;"       /* not equal, break out */
+                "CC = %2;"               /* at end of cs? */
+                "if cc jump 1b (bp);"    /* no, keep going */
+                "jump.s 3f;"             /* strings are equal */
+                "2:"
+                "%2 = %2 - %3;"          /* *cs - *ct */
+                "3:"
+                : "+&a" (cs), "+&a" (ct), "=&d" (__res1), "=&d" (__res2)
+                :
+                : "memory", "CC");
 
         return __res1;
 }
@@ -66,26 +88,35 @@ extern inline int strcmp(const char *cs, const char *ct)
 #define __HAVE_ARCH_STRNCMP
 extern inline int strncmp(const char *cs, const char *ct, size_t count)
 {
-        char __res1, __res2;
+        /* need to use int's here so the char's in the assembly don't get
+         * sign extended incorrectly when we don't want them to be
+         */
+        int __res1, __res2;
 
         if (!count)
                 return 0;
-        __asm__
-       ("1:\t%3 = B[%0++] (Z);\n\t"        /* get *cs */
-                "%4 = B[%1++] (Z);\n\t" /* get *ct */
-                "CC = %3 == %4;\n\t"    /* compare a byte */
-                "if ! cc jump 3f;\n\t"  /* not equal, break out */
-                "CC = %3;\n\t"  /* at end of cs? */
-                "if ! cc jump 4f;\n\t"  /* yes, all done */
-                "%2 += -1;\n\t" /* no, adjust count */
-        "CC = %2 == 0;\n\t"
-        "if ! cc jump 1b;\n"                 /* more to do, keep going */
-                "2:\t%3 = 0;\n\t"       /* strings are equal */
-        "jump.s    4f;\n"
-        "3:\t%3 = %3 - %4;\n"          /* *cs - *ct */
-        "4:"
-        : "+&a" (cs), "+&a" (ct), "+&da" (count), "=&d" (__res1), "=&d" (__res2)
-      : :       "CC");
+
+        __asm__ __volatile__ (
+                "1:"
+                "%3 = B[%0++] (Z);"      /* get *cs */
+                "%4 = B[%1++] (Z);"      /* get *ct */
+                "CC = %3 == %4;"         /* compare a byte */
+                "if ! cc jump 3f;"       /* not equal, break out */
+                "CC = %3;"               /* at end of cs? */
+                "if ! cc jump 4f;"       /* yes, all done */
+                "%2 += -1;"              /* no, adjust count */
+                "CC = %2 == 0;"
+                "if ! cc jump 1b;"       /* more to do, keep going */
+                "2:"
+                "%3 = 0;"                /* strings are equal */
+                "jump.s 4f;"
+                "3:"
+                "%3 = %3 - %4;"          /* *cs - *ct */
+                "4:"
+                : "+&a" (cs), "+&a" (ct), "+&da" (count), "=&d" (__res1), "=&d" (__res2)
+                :
+                : "memory", "CC");
+
         return __res1;
 }
 
diff --git a/include/asm-blackfin/unistd.h b/include/asm-blackfin/unistd.h
index 0df9f2d322a3..07ffe8b718c5 100644
--- a/include/asm-blackfin/unistd.h
+++ b/include/asm-blackfin/unistd.h
@@ -3,6 +3,7 @@
 /*
  * This file contains the system call numbers.
  */
+#define __NR_restart_syscall      0
 #define __NR_exit                 1
 #define __NR_fork                 2
 #define __NR_read                 3
@@ -165,13 +166,13 @@
 #define __NR_sched_get_priority_min     160
 #define __NR_sched_rr_get_interval      161
 #define __NR_nanosleep          162
-                                /* 163 __NR_mremap */
+#define __NR_mremap             163
 #define __NR_setresuid          164
 #define __NR_getresuid          165
                                 /* 166 __NR_vm86 */
                                 /* 167 __NR_query_module */
                                 /* 168 __NR_poll */
-                                /* 169 __NR_nfsservctl */
+#define __NR_nfsservctl         169
 #define __NR_setresgid          170
 #define __NR_getresgid          171
 #define __NR_prctl              172
@@ -227,7 +228,7 @@
                                 /* 222 reserved for TUX */
                                 /* 223 reserved for TUX */
 #define __NR_gettid             224
-                                /* 225 __NR_readahead */
+#define __NR_readahead          225
 #define __NR_setxattr           226
 #define __NR_lsetxattr          227
 #define __NR_fsetxattr          228
@@ -287,7 +288,7 @@
 #define __NR_mq_timedreceive    (__NR_mq_open+3)
 #define __NR_mq_notify          (__NR_mq_open+4)
 #define __NR_mq_getsetattr      (__NR_mq_open+5)
-                                /* 284 __NR_sys_kexec_load */
+#define __NR_kexec_load         284
 #define __NR_waitid             285
 #define __NR_add_key            286
 #define __NR_request_key        287
@@ -352,9 +353,54 @@
 #define __NR_shmdt              340
 #define __NR_shmget             341
 
-#define __NR_syscall            342
+#define __NR_splice             342
+#define __NR_sync_file_range    343
+#define __NR_tee                344
+#define __NR_vmsplice           345
+
+#define __NR_epoll_pwait        346
+#define __NR_utimensat          347
+#define __NR_signalfd           348
+#define __NR_timerfd            349
+#define __NR_eventfd            350
+#define __NR_pread64            351
+#define __NR_pwrite64           352
+#define __NR_fadvise64          353
+#define __NR_set_robust_list    354
+#define __NR_get_robust_list    355
+#define __NR_fallocate          356
+
+#define __NR_syscall            357
 #define NR_syscalls             __NR_syscall
 
+/* Old optional stuff no one actually uses */
+#define __IGNORE_sysfs
+#define __IGNORE_uselib
+
+/* Implement the newer interfaces */
+#define __IGNORE_mmap
+#define __IGNORE_poll
+#define __IGNORE_select
+#define __IGNORE_utime
+
+/* Not relevant on no-mmu */
+#define __IGNORE_swapon
+#define __IGNORE_swapoff
+#define __IGNORE_msync
+#define __IGNORE_mlock
+#define __IGNORE_munlock
+#define __IGNORE_mlockall
+#define __IGNORE_munlockall
+#define __IGNORE_mincore
+#define __IGNORE_madvise
+#define __IGNORE_remap_file_pages
+#define __IGNORE_mbind
+#define __IGNORE_get_mempolicy
+#define __IGNORE_set_mempolicy
+#define __IGNORE_migrate_pages
+#define __IGNORE_move_pages
+#define __IGNORE_getcpu
+
 #ifdef __KERNEL__
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_STAT64