20 files changed, 102 insertions, 11 deletions

diff --git a/arch/alpha/include/asm/socket.h b/arch/alpha/include/asm/socket.h
index 06edfefc3373..082355f159e6 100644
--- a/arch/alpha/include/asm/socket.h
+++ b/arch/alpha/include/asm/socket.h
@@ -69,6 +69,9 @@
 
 #define SO_RXQ_OVFL             40
 
+#define SO_WIFI_STATUS          41
+#define SCM_WIFI_STATUS         SO_WIFI_STATUS
+
 /* O_NONBLOCK clashes with the bits used for socket types.  Therefore we
  * have to define SOCK_NONBLOCK to a different value here.
  */
diff --git a/arch/arm/include/asm/socket.h b/arch/arm/include/asm/socket.h
index 90ffd04b8e74..dec6f9afb3cf 100644
--- a/arch/arm/include/asm/socket.h
+++ b/arch/arm/include/asm/socket.h
@@ -62,4 +62,7 @@
 
 #define SO_RXQ_OVFL             40
 
+#define SO_WIFI_STATUS          41
+#define SCM_WIFI_STATUS         SO_WIFI_STATUS
+
 #endif /* _ASM_SOCKET_H */
diff --git a/arch/avr32/include/asm/socket.h b/arch/avr32/include/asm/socket.h
index c8d1fae49476..247b88c760be 100644
--- a/arch/avr32/include/asm/socket.h
+++ b/arch/avr32/include/asm/socket.h
@@ -62,4 +62,7 @@
 
 #define SO_RXQ_OVFL             40
 
+#define SO_WIFI_STATUS          41
+#define SCM_WIFI_STATUS         SO_WIFI_STATUS
+
 #endif /* __ASM_AVR32_SOCKET_H */
diff --git a/arch/cris/include/asm/socket.h b/arch/cris/include/asm/socket.h
index 1a4a61909ca8..e269264df7c4 100644
--- a/arch/cris/include/asm/socket.h
+++ b/arch/cris/include/asm/socket.h
@@ -64,6 +64,9 @@
 
 #define SO_RXQ_OVFL             40
 
+#define SO_WIFI_STATUS          41
+#define SCM_WIFI_STATUS         SO_WIFI_STATUS
+
 #endif /* _ASM_SOCKET_H */
 
 
diff --git a/arch/frv/include/asm/socket.h b/arch/frv/include/asm/socket.h
index a6b26880c1ec..ce80fdadcce5 100644
--- a/arch/frv/include/asm/socket.h
+++ b/arch/frv/include/asm/socket.h
@@ -62,5 +62,8 @@
 
 #define SO_RXQ_OVFL             40
 
+#define SO_WIFI_STATUS          41
+#define SCM_WIFI_STATUS         SO_WIFI_STATUS
+
 #endif /* _ASM_SOCKET_H */
 
diff --git a/arch/h8300/include/asm/socket.h b/arch/h8300/include/asm/socket.h
index 04c0f4596eb5..cf1daab6f27e 100644
--- a/arch/h8300/include/asm/socket.h
+++ b/arch/h8300/include/asm/socket.h
@@ -62,4 +62,7 @@
 
 #define SO_RXQ_OVFL             40
 
+#define SO_WIFI_STATUS          41
+#define SCM_WIFI_STATUS         SO_WIFI_STATUS
+
 #endif /* _ASM_SOCKET_H */
diff --git a/arch/ia64/include/asm/socket.h b/arch/ia64/include/asm/socket.h
index 51427eaa51ba..4b03664e3fb5 100644
--- a/arch/ia64/include/asm/socket.h
+++ b/arch/ia64/include/asm/socket.h
@@ -71,4 +71,7 @@
 
 #define SO_RXQ_OVFL             40
 
+#define SO_WIFI_STATUS          41
+#define SCM_WIFI_STATUS         SO_WIFI_STATUS
+
 #endif /* _ASM_IA64_SOCKET_H */
diff --git a/arch/m32r/include/asm/socket.h b/arch/m32r/include/asm/socket.h
index 469787c30098..e8b8c5bb053c 100644
--- a/arch/m32r/include/asm/socket.h
+++ b/arch/m32r/include/asm/socket.h
@@ -62,4 +62,7 @@
 
 #define SO_RXQ_OVFL             40
 
+#define SO_WIFI_STATUS          41
+#define SCM_WIFI_STATUS         SO_WIFI_STATUS
+
 #endif /* _ASM_M32R_SOCKET_H */
diff --git a/arch/m68k/include/asm/socket.h b/arch/m68k/include/asm/socket.h
index 9bf49c87d954..d4708ce466e0 100644
--- a/arch/m68k/include/asm/socket.h
+++ b/arch/m68k/include/asm/socket.h
@@ -62,4 +62,7 @@
 
 #define SO_RXQ_OVFL             40
 
+#define SO_WIFI_STATUS          41
+#define SCM_WIFI_STATUS         SO_WIFI_STATUS
+
 #endif /* _ASM_SOCKET_H */
diff --git a/arch/mips/include/asm/ip32/mace.h b/arch/mips/include/asm/ip32/mace.h
index d08d7c672139..c523123df380 100644
--- a/arch/mips/include/asm/ip32/mace.h
+++ b/arch/mips/include/asm/ip32/mace.h
@@ -95,7 +95,7 @@ struct mace_video {
  * Ethernet interface
  */
 struct mace_ethernet {
-        volatile unsigned long mac_ctrl;
+        volatile u64 mac_ctrl;
         volatile unsigned long int_stat;
         volatile unsigned long dma_ctrl;
         volatile unsigned long timer;
diff --git a/arch/mips/include/asm/socket.h b/arch/mips/include/asm/socket.h
index 9de5190f2487..ad5c0a7a02a7 100644
--- a/arch/mips/include/asm/socket.h
+++ b/arch/mips/include/asm/socket.h
@@ -82,6 +82,9 @@ To add: #define SO_REUSEPORT 0x0200	/* Allow local address and port reuse.  */
 
 #define SO_RXQ_OVFL             40
 
+#define SO_WIFI_STATUS          41
+#define SCM_WIFI_STATUS         SO_WIFI_STATUS
+
 #ifdef __KERNEL__
 
 /** sock_type - Socket types
diff --git a/arch/mn10300/include/asm/socket.h b/arch/mn10300/include/asm/socket.h
index 4e60c4281288..876356d78522 100644
--- a/arch/mn10300/include/asm/socket.h
+++ b/arch/mn10300/include/asm/socket.h
@@ -62,4 +62,7 @@
 
 #define SO_RXQ_OVFL             40
 
+#define SO_WIFI_STATUS          41
+#define SCM_WIFI_STATUS         SO_WIFI_STATUS
+
 #endif /* _ASM_SOCKET_H */
diff --git a/arch/parisc/include/asm/socket.h b/arch/parisc/include/asm/socket.h
index 225b7d6a1a0a..d28c51b61067 100644
--- a/arch/parisc/include/asm/socket.h
+++ b/arch/parisc/include/asm/socket.h
@@ -61,6 +61,9 @@
 
 #define SO_RXQ_OVFL             0x4021
 
+#define SO_WIFI_STATUS          0x4022
+#define SCM_WIFI_STATUS         SO_WIFI_STATUS
+
 /* O_NONBLOCK clashes with the bits used for socket types.  Therefore we
  * have to define SOCK_NONBLOCK to a different value here.
  */
diff --git a/arch/powerpc/boot/dts/tqm8548-bigflash.dts b/arch/powerpc/boot/dts/tqm8548-bigflash.dts
index 9452c3c05114..d918752b1200 100644
--- a/arch/powerpc/boot/dts/tqm8548-bigflash.dts
+++ b/arch/powerpc/boot/dts/tqm8548-bigflash.dts
@@ -352,7 +352,7 @@
                 ranges = <
                         0 0x0 0xfc000000 0x04000000     // NOR FLASH bank 1
                         1 0x0 0xf8000000 0x08000000     // NOR FLASH bank 0
-                        2 0x0 0xa3000000 0x00008000     // CAN (2 x i82527)
+                        2 0x0 0xa3000000 0x00008000     // CAN (2 x CC770)
                         3 0x0 0xa3010000 0x00008000     // NAND FLASH
 
                 >;
@@ -393,18 +393,27 @@
                 };
 
                 /* Note: CAN support needs be enabled in U-Boot */
-                can0@2,0 {
-                        compatible = "intel,82527"; // Bosch CC770
+                can@2,0 {
+                        compatible = "bosch,cc770"; // Bosch CC770
                         reg = <2 0x0 0x100>;
                         interrupts = <4 1>;
                         interrupt-parent = <&mpic>;
+                        bosch,external-clock-frequency = <16000000>;
+                        bosch,disconnect-rx1-input;
+                        bosch,disconnect-tx1-output;
+                        bosch,iso-low-speed-mux;
+                        bosch,clock-out-frequency = <16000000>;
                 };
 
-                can1@2,100 {
-                        compatible = "intel,82527"; // Bosch CC770
+                can@2,100 {
+                        compatible = "bosch,cc770"; // Bosch CC770
                         reg = <2 0x100 0x100>;
                         interrupts = <4 1>;
                         interrupt-parent = <&mpic>;
+                        bosch,external-clock-frequency = <16000000>;
+                        bosch,disconnect-rx1-input;
+                        bosch,disconnect-tx1-output;
+                        bosch,iso-low-speed-mux;
                 };
 
                 /* Note: NAND support needs to be enabled in U-Boot */
diff --git a/arch/powerpc/boot/dts/tqm8548.dts b/arch/powerpc/boot/dts/tqm8548.dts
index 619776f72c90..988d887c97fc 100644
--- a/arch/powerpc/boot/dts/tqm8548.dts
+++ b/arch/powerpc/boot/dts/tqm8548.dts
@@ -352,7 +352,7 @@
                 ranges = <
                         0 0x0 0xfc000000 0x04000000     // NOR FLASH bank 1
                         1 0x0 0xf8000000 0x08000000     // NOR FLASH bank 0
-                        2 0x0 0xe3000000 0x00008000     // CAN (2 x i82527)
+                        2 0x0 0xe3000000 0x00008000     // CAN (2 x CC770)
                         3 0x0 0xe3010000 0x00008000     // NAND FLASH
 
                 >;
@@ -393,18 +393,27 @@
                 };
 
                 /* Note: CAN support needs be enabled in U-Boot */
-                can0@2,0 {
-                        compatible = "intel,82527"; // Bosch CC770
+                can@2,0 {
+                        compatible = "bosch,cc770"; // Bosch CC770
                         reg = <2 0x0 0x100>;
                         interrupts = <4 1>;
                         interrupt-parent = <&mpic>;
+                        bosch,external-clock-frequency = <16000000>;
+                        bosch,disconnect-rx1-input;
+                        bosch,disconnect-tx1-output;
+                        bosch,iso-low-speed-mux;
+                        bosch,clock-out-frequency = <16000000>;
                 };
 
-                can1@2,100 {
-                        compatible = "intel,82527"; // Bosch CC770
+                can@2,100 {
+                        compatible = "bosch,cc770"; // Bosch CC770
                         reg = <2 0x100 0x100>;
                         interrupts = <4 1>;
                         interrupt-parent = <&mpic>;
+                        bosch,external-clock-frequency = <16000000>;
+                        bosch,disconnect-rx1-input;
+                        bosch,disconnect-tx1-output;
+                        bosch,iso-low-speed-mux;
                 };
 
                 /* Note: NAND support needs to be enabled in U-Boot */
diff --git a/arch/powerpc/boot/dts/tqm8xx.dts b/arch/powerpc/boot/dts/tqm8xx.dts
index f6da7ec49a8e..c3dba2518d8c 100644
--- a/arch/powerpc/boot/dts/tqm8xx.dts
+++ b/arch/powerpc/boot/dts/tqm8xx.dts
@@ -57,6 +57,7 @@
 
                 ranges = <
                         0x0 0x0 0x40000000 0x800000
+                        0x3 0x0 0xc0000000 0x200
                 >;
 
                 flash@0,0 {
@@ -67,6 +68,30 @@
                         bank-width = <4>;
                         device-width = <2>;
                 };
+
+                /* Note: CAN support needs be enabled in U-Boot */
+                can@3,0 {
+                        compatible = "intc,82527";
+                        reg = <3 0x0 0x80>;
+                        interrupts = <8 1>;
+                        interrupt-parent = <&PIC>;
+                        bosch,external-clock-frequency = <16000000>;
+                        bosch,disconnect-rx1-input;
+                        bosch,disconnect-tx1-output;
+                        bosch,iso-low-speed-mux;
+                        bosch,clock-out-frequency = <16000000>;
+                };
+
+                can@3,100 {
+                        compatible = "intc,82527";
+                        reg = <3 0x100 0x80>;
+                        interrupts = <8 1>;
+                        interrupt-parent = <&PIC>;
+                        bosch,external-clock-frequency = <16000000>;
+                        bosch,disconnect-rx1-input;
+                        bosch,disconnect-tx1-output;
+                        bosch,iso-low-speed-mux;
+                };
         };
 
         soc@fff00000 {
diff --git a/arch/powerpc/include/asm/socket.h b/arch/powerpc/include/asm/socket.h
index 866f7606da68..2fc2af8fbf59 100644
--- a/arch/powerpc/include/asm/socket.h
+++ b/arch/powerpc/include/asm/socket.h
@@ -69,4 +69,7 @@
 
 #define SO_RXQ_OVFL             40
 
+#define SO_WIFI_STATUS          41
+#define SCM_WIFI_STATUS         SO_WIFI_STATUS
+
 #endif  /* _ASM_POWERPC_SOCKET_H */
diff --git a/arch/s390/include/asm/socket.h b/arch/s390/include/asm/socket.h
index fdff1e995c73..67b5c1b14b51 100644
--- a/arch/s390/include/asm/socket.h
+++ b/arch/s390/include/asm/socket.h
@@ -70,4 +70,7 @@
 
 #define SO_RXQ_OVFL             40
 
+#define SO_WIFI_STATUS          41
+#define SCM_WIFI_STATUS         SO_WIFI_STATUS
+
 #endif /* _ASM_SOCKET_H */
diff --git a/arch/sparc/include/asm/socket.h b/arch/sparc/include/asm/socket.h
index 9d3fefcff2f5..8af1b64168b3 100644
--- a/arch/sparc/include/asm/socket.h
+++ b/arch/sparc/include/asm/socket.h
@@ -58,6 +58,9 @@
 
 #define SO_RXQ_OVFL             0x0024
 
+#define SO_WIFI_STATUS          0x0025
+#define SCM_WIFI_STATUS         SO_WIFI_STATUS
+
 /* Security levels - as per NRL IPv6 - don't actually do anything */
 #define SO_SECURITY_AUTHENTICATION              0x5001
 #define SO_SECURITY_ENCRYPTION_TRANSPORT        0x5002
diff --git a/arch/xtensa/include/asm/socket.h b/arch/xtensa/include/asm/socket.h
index cbdf2ffaacff..bb06968be227 100644
--- a/arch/xtensa/include/asm/socket.h
+++ b/arch/xtensa/include/asm/socket.h
@@ -73,4 +73,7 @@
 
 #define SO_RXQ_OVFL             40
 
+#define SO_WIFI_STATUS          41
+#define SCM_WIFI_STATUS         SO_WIFI_STATUS
+
 #endif  /* _XTENSA_SOCKET_H */