r3527 - developers/sameo/patches/ar6k-atheros
sameo at sita.openmoko.org
sameo at sita.openmoko.org
Wed Nov 28 16:49:32 CET 2007
Author: sameo
Date: 2007-11-28 16:49:25 +0100 (Wed, 28 Nov 2007)
New Revision: 3527
Added:
developers/sameo/patches/ar6k-atheros/mach-gta02_wifi.patch
Removed:
developers/sameo/patches/ar6k-atheros/s3c2440_wlan_gpio_cfg.patch
Modified:
developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack.patch
developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack_ar6000_wlan.patch
developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack_functions.patch
developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack_shcd.patch
developers/sameo/patches/ar6k-atheros/s3c24xx_hcd_atheros.patch
developers/sameo/patches/ar6k-atheros/series
Log:
ar6k-atheros: Platform device hooks.
We now get a platform device from the gta02 machine file.
We use it for IO region and IRQ allocation, also for DMA buffer
allocation.
Modified: developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack.patch
===================================================================
--- developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack.patch 2007-11-28 12:47:04 UTC (rev 3526)
+++ developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack.patch 2007-11-28 15:49:25 UTC (rev 3527)
@@ -60,7 +60,7 @@
Index: linux-2.6.22/include/linux/sdio/_sdio_defs.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/linux/sdio/_sdio_defs.h 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/include/linux/sdio/_sdio_defs.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,632 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: _sdio_defs.h
@@ -697,7 +697,7 @@
Index: linux-2.6.22/include/linux/sdio/ctsystem.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/linux/sdio/ctsystem.h 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/include/linux/sdio/ctsystem.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,110 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: cpsystem.h
@@ -812,7 +812,7 @@
Index: linux-2.6.22/include/linux/sdio/ctsystem_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/linux/sdio/ctsystem_linux.h 2007-11-27 16:10:05.000000000 +0100
++++ linux-2.6.22/include/linux/sdio/ctsystem_linux.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,959 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: ctsystem_linux.h
@@ -1776,7 +1776,7 @@
Index: linux-2.6.22/include/linux/sdio/mmc_defs.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/linux/sdio/mmc_defs.h 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/include/linux/sdio/mmc_defs.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,99 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: mmc_defs.h
@@ -1880,7 +1880,7 @@
Index: linux-2.6.22/include/linux/sdio/sdio_busdriver.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/linux/sdio/sdio_busdriver.h 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/include/linux/sdio/sdio_busdriver.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,1431 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_busdriver.h
@@ -3315,8 +3315,8 @@
+#endif /* __SDIO_BUSDRIVER_H___ */
Index: linux-2.6.22/drivers/Kconfig
===================================================================
---- linux-2.6.22.orig/drivers/Kconfig 2007-11-08 15:42:31.000000000 +0100
-+++ linux-2.6.22/drivers/Kconfig 2007-11-08 15:47:58.000000000 +0100
+--- linux-2.6.22.orig/drivers/Kconfig 2007-11-27 17:13:46.000000000 +0100
++++ linux-2.6.22/drivers/Kconfig 2007-11-27 17:16:52.000000000 +0100
@@ -68,6 +68,8 @@
source "drivers/usb/Kconfig"
@@ -3329,7 +3329,7 @@
Index: linux-2.6.22/drivers/sdio/Kconfig
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/Kconfig 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/Kconfig 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,18 @@
+#
+# SDIO driver and host controller support
@@ -3352,7 +3352,7 @@
Index: linux-2.6.22/drivers/sdio/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/Makefile 2007-11-12 13:44:29.000000000 +0100
++++ linux-2.6.22/drivers/sdio/Makefile 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,6 @@
+#Makefile for SDIO stack
+obj-$(CONFIG_SDIO) += lib/
@@ -3363,7 +3363,7 @@
Index: linux-2.6.22/drivers/sdio/lib/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/lib/Makefile 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/lib/Makefile 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,6 @@
+#
+# SDIO stack library Makefile
@@ -3374,7 +3374,7 @@
Index: linux-2.6.22/drivers/sdio/lib/sdio_lib_c.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/lib/sdio_lib_c.c 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/lib/sdio_lib_c.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,903 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_lib_c.c
@@ -4282,7 +4282,7 @@
Index: linux-2.6.22/drivers/sdio/lib/sdio_lib_os.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/lib/sdio_lib_os.c 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/lib/sdio_lib_os.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,254 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_function_os.c
@@ -4541,7 +4541,7 @@
Index: linux-2.6.22/drivers/sdio/busdriver/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/busdriver/Makefile 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/busdriver/Makefile 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,7 @@
+#
+# SDIO stack bus drivers
@@ -4553,7 +4553,7 @@
Index: linux-2.6.22/drivers/sdio/busdriver/_busdriver.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/busdriver/_busdriver.h 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/busdriver/_busdriver.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,462 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: _busdriver.h
@@ -5020,7 +5020,7 @@
Index: linux-2.6.22/drivers/sdio/busdriver/sdio_bus.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/busdriver/sdio_bus.c 2007-11-15 20:04:19.000000000 +0100
++++ linux-2.6.22/drivers/sdio/busdriver/sdio_bus.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,2119 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_bus.c
@@ -7144,7 +7144,7 @@
Index: linux-2.6.22/drivers/sdio/busdriver/sdio_bus_events.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/busdriver/sdio_bus_events.c 2007-11-27 16:45:11.000000000 +0100
++++ linux-2.6.22/drivers/sdio/busdriver/sdio_bus_events.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,1073 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_bus_events.c
@@ -8222,7 +8222,7 @@
Index: linux-2.6.22/drivers/sdio/busdriver/sdio_bus_misc.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/busdriver/sdio_bus_misc.c 2007-11-27 16:08:23.000000000 +0100
++++ linux-2.6.22/drivers/sdio/busdriver/sdio_bus_misc.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,3192 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_bus_misc.c
@@ -11419,7 +11419,7 @@
Index: linux-2.6.22/drivers/sdio/busdriver/sdio_bus_os.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/busdriver/sdio_bus_os.c 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/busdriver/sdio_bus_os.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,807 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_bus_os.c
@@ -12231,7 +12231,7 @@
Index: linux-2.6.22/drivers/sdio/busdriver/sdio_function.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/busdriver/sdio_function.c 2007-11-08 17:15:26.000000000 +0100
++++ linux-2.6.22/drivers/sdio/busdriver/sdio_function.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,713 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_function.c
@@ -12949,7 +12949,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/Kconfig
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/Kconfig 2007-11-27 17:11:11.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/Kconfig 2007-11-28 16:37:29.000000000 +0100
@@ -0,0 +1,56 @@
+#
+#
@@ -13010,7 +13010,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/Makefile 2007-11-27 17:11:11.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/Makefile 2007-11-28 16:37:29.000000000 +0100
@@ -0,0 +1,8 @@
+# SDIO stack host controller Makefile
+obj-$(CONFIG_SDIO_STDHCD) += stdhost/
@@ -13023,7 +13023,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pci_ellen/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pci_ellen/Makefile 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pci_ellen/Makefile 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,7 @@
+#
+# SDIO pci_ellen host controller makefile
@@ -13035,7 +13035,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pci_ellen/sdio_hcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pci_ellen/sdio_hcd.c 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pci_ellen/sdio_hcd.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,1238 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd.c
@@ -14278,7 +14278,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pci_ellen/sdio_hcd_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pci_ellen/sdio_hcd_linux.h 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pci_ellen/sdio_hcd_linux.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,185 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_linux.h
@@ -14468,7 +14468,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pci_ellen/sdio_hcd_os.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pci_ellen/sdio_hcd_os.c 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pci_ellen/sdio_hcd_os.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,781 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_os.c
@@ -15254,7 +15254,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pci_ellen/sdio_pciellen_hcd.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pci_ellen/sdio_pciellen_hcd.h 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pci_ellen/sdio_pciellen_hcd.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,253 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_pciellen_hcd.h
@@ -15512,7 +15512,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/mx21/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/mx21/Makefile 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/mx21/Makefile 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,7 @@
+#
+# SDIO mx21 host controller makefile
@@ -15524,7 +15524,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/mx21/sdio_mx21.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/mx21/sdio_mx21.c 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/mx21/sdio_mx21.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,1286 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_mx21c
@@ -16815,7 +16815,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/mx21/sdio_mx21.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/mx21/sdio_mx21.h 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/mx21/sdio_mx21.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,210 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_mx21.h
@@ -17030,7 +17030,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/mx21/sdio_mx21_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/mx21/sdio_mx21_linux.h 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/mx21/sdio_mx21_linux.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,105 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_mx21_linux.h
@@ -17140,7 +17140,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/mx21/sdio_mx21_os.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/mx21/sdio_mx21_os.c 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/mx21/sdio_mx21_os.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,435 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_os.c
@@ -17580,7 +17580,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/omap/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/omap/Makefile 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/omap/Makefile 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,3 @@
+# SDIO omap host controller makefile
+sdio_omap_hcd-objs := sdio_hcd_os.o sdio_hcd_os_2_6.o
@@ -17588,7 +17588,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/omap/sdio_hcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/omap/sdio_hcd.c 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/omap/sdio_hcd.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,1337 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd.c
@@ -18930,7 +18930,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/omap/sdio_hcd_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/omap/sdio_hcd_linux.h 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/omap/sdio_hcd_linux.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,165 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_linux.h
@@ -19100,7 +19100,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/omap/sdio_hcd_os_2_6.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/omap/sdio_hcd_os_2_6.c 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/omap/sdio_hcd_os_2_6.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,574 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_os_2_6.c
@@ -19679,7 +19679,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/omap/sdio_omap_hcd.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/omap/sdio_omap_hcd.h 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/omap/sdio_omap_hcd.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,372 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_pmap_hcd.h
@@ -20056,7 +20056,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/omap_2420/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/omap_2420/Makefile 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/omap_2420/Makefile 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,3 @@
+# SDIO omap host controller makefile
+obj-m += sdio_omap_hcd.o
@@ -20064,7 +20064,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_hcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_hcd.c 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_hcd.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,1363 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd.c
@@ -21432,7 +21432,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_hcd_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_hcd_linux.h 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_hcd_linux.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,147 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_linux.h
@@ -21584,7 +21584,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_hcd_os.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_hcd_os.c 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_hcd_os.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,608 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_os.c
@@ -22197,7 +22197,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_hcd_os_2_6.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_hcd_os_2_6.c 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_hcd_os_2_6.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,731 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_os_2_6.c
@@ -22933,7 +22933,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_omap_hcd.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_omap_hcd.h 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_omap_hcd.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,370 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_pmap_hcd.h
@@ -23308,7 +23308,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pxa255/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pxa255/Makefile 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pxa255/Makefile 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,5 @@
+#
+# SDIO pxa255 host controller
@@ -23318,7 +23318,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pxa255/sdio_hcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pxa255/sdio_hcd.c 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pxa255/sdio_hcd.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,914 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd.c
@@ -24237,7 +24237,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pxa255/sdio_hcd_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pxa255/sdio_hcd_linux.h 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pxa255/sdio_hcd_linux.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,136 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_linux.h
@@ -24378,7 +24378,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pxa255/sdio_hcd_os.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pxa255/sdio_hcd_os.c 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pxa255/sdio_hcd_os.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,589 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_os.c
@@ -24972,7 +24972,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pxa255/sdio_pxa255hcd.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pxa255/sdio_pxa255hcd.h 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pxa255/sdio_pxa255hcd.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,227 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_pxa255hcd.h
@@ -25204,7 +25204,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pxa270/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pxa270/Makefile 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pxa270/Makefile 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,5 @@
+#
+# SDIO pxa270 host controller
@@ -25214,7 +25214,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pxa270/sdio_hcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pxa270/sdio_hcd.c 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pxa270/sdio_hcd.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,1087 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd.c
@@ -26306,7 +26306,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pxa270/sdio_hcd_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pxa270/sdio_hcd_linux.h 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pxa270/sdio_hcd_linux.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,150 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_linux.h
@@ -26461,7 +26461,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pxa270/sdio_hcd_os.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pxa270/sdio_hcd_os.c 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pxa270/sdio_hcd_os.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,1084 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_os.c
@@ -27550,7 +27550,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pxa270/sdio_pxa270hcd.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pxa270/sdio_pxa270hcd.h 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pxa270/sdio_pxa270hcd.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,273 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_pxa270hcd.h
@@ -27827,8 +27827,8 @@
+#endif /* __SDIO_PXA255HCD_H___ */
Index: linux-2.6.22/drivers/Makefile
===================================================================
---- linux-2.6.22.orig/drivers/Makefile 2007-11-08 15:42:31.000000000 +0100
-+++ linux-2.6.22/drivers/Makefile 2007-11-08 15:47:58.000000000 +0100
+--- linux-2.6.22.orig/drivers/Makefile 2007-11-27 17:13:46.000000000 +0100
++++ linux-2.6.22/drivers/Makefile 2007-11-27 17:16:52.000000000 +0100
@@ -71,6 +71,7 @@
obj-$(CONFIG_EISA) += eisa/
obj-$(CONFIG_CPU_FREQ) += cpufreq/
@@ -27840,7 +27840,7 @@
Index: linux-2.6.22/include/linux/sdio/sdlist.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/linux/sdio/sdlist.h 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/include/linux/sdio/sdlist.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,137 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdlist.h
@@ -27982,7 +27982,7 @@
Index: linux-2.6.22/include/linux/sdio/sdio_hcd_defs.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/linux/sdio/sdio_hcd_defs.h 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/include/linux/sdio/sdio_hcd_defs.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,215 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_defs.h
@@ -28202,7 +28202,7 @@
Index: linux-2.6.22/include/linux/sdio/sdio_lib.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/linux/sdio/sdio_lib.h 2007-11-08 15:47:58.000000000 +0100
++++ linux-2.6.22/include/linux/sdio/sdio_lib.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,262 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_lib.h
@@ -28468,8 +28468,8 @@
+#endif /* __SDIO_LIB_H___*/
Index: linux-2.6.22/arch/arm/Kconfig
===================================================================
---- linux-2.6.22.orig/arch/arm/Kconfig 2007-11-08 15:42:31.000000000 +0100
-+++ linux-2.6.22/arch/arm/Kconfig 2007-11-08 15:47:58.000000000 +0100
+--- linux-2.6.22.orig/arch/arm/Kconfig 2007-11-27 17:13:46.000000000 +0100
++++ linux-2.6.22/arch/arm/Kconfig 2007-11-27 17:16:52.000000000 +0100
@@ -971,6 +971,8 @@
source "drivers/pnp/Kconfig"
Modified: developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack_ar6000_wlan.patch
===================================================================
--- developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack_ar6000_wlan.patch 2007-11-28 12:47:04 UTC (rev 3526)
+++ developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack_ar6000_wlan.patch 2007-11-28 15:49:25 UTC (rev 3527)
@@ -4,7 +4,7 @@
drivers/pnp/driver.c | 2
drivers/sdio/function/wlan/Makefile | 4
drivers/sdio/function/wlan/ar6000/Makefile | 29
- drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c | 5856 ++++++++++
+ drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c | 5850 ++++++++++
drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h | 133
drivers/sdio/function/wlan/ar6000/bmi/Makefile | 1
drivers/sdio/function/wlan/ar6000/bmi/bmi.c | 473
@@ -59,12 +59,12 @@
drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c | 169
drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c | 56
drivers/sdio/function/wlan/ar6000/wmi/wmi.c | 2879 ++++
- 60 files changed, 23223 insertions(+), 7 deletions(-)
+ 60 files changed, 23217 insertions(+), 7 deletions(-)
Index: linux-2.6.22/drivers/sdio/function/wlan/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/Makefile 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/Makefile 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,4 @@
+#
+# SDIO wlan ar600 card function driver
@@ -73,7 +73,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/Makefile 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/Makefile 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,29 @@
+#
+# AR6K Kernel Module makefile.
@@ -107,7 +107,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/bmi.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/bmi.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/bmi.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -188,7 +188,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -326,7 +326,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/ar6000_api.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/ar6000_api.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/ar6000_api.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -415,7 +415,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/athdrv.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/athdrv.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/athdrv.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,598 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -1018,7 +1018,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/athtypes.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/athtypes.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/athtypes.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2003-2006 Atheros Communications, Inc.
@@ -1066,7 +1066,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/ieee80211.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/ieee80211.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/ieee80211.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,333 @@
+/*-
+ * Copyright (c) 2001 Atsushi Onoe
@@ -1404,7 +1404,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -1529,7 +1529,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2001 Atsushi Onoe
@@ -1608,7 +1608,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/osapi_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/osapi_linux.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/osapi_linux.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,167 @@
+/*
+ * Copyright 2003-2006 Atheros Communications, Inc.
@@ -1780,7 +1780,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wmi_host.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wmi_host.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wmi_host.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -1860,7 +1860,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -1896,7 +1896,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/hif.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/hif.c 2007-11-19 19:31:15.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/hif.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,664 @@
+/*
+ * Copyright (c) 2004-2005 Atheros Communications Inc.
@@ -2565,7 +2565,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc.c 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,433 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -3003,7 +3003,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_events.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_events.c 2007-11-27 16:36:53.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_events.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,1056 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -4064,7 +4064,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h 2007-11-27 02:06:36.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,464 @@
+/*
+ * Copyright (c) 2004-2005 Atheros Communications Inc.
@@ -4533,7 +4533,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c 2007-11-27 16:37:23.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,211 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -4749,7 +4749,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_send.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_send.c 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_send.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,395 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -5149,7 +5149,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_utils.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_utils.c 2007-11-26 19:49:16.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_utils.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,375 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -5529,7 +5529,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/dset_api.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/dset_api.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/dset_api.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2005-2006 Atheros Communications, Inc.
@@ -5583,7 +5583,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/gpio_api.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/gpio_api.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/gpio_api.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2005-2006 Atheros Communications, Inc.
@@ -5652,7 +5652,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hif.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hif.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hif.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,207 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -5864,7 +5864,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/host_version.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/host_version.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/host_version.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -5917,7 +5917,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/htc.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/htc.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/htc.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2006 Atheros Communications, Inc.
@@ -6042,7 +6042,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/osapi.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/osapi.h 2007-11-26 18:43:37.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/osapi.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2003-2006 Atheros Communications, Inc.
@@ -6110,7 +6110,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/queue.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/queue.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/queue.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,552 @@
+/*
+ * Copyright (c) 1991, 1993
@@ -6667,7 +6667,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wlan_api.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wlan_api.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wlan_api.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -6762,7 +6762,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wmi_api.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wmi_api.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wmi_api.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -6940,7 +6940,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,285 @@
+/*
+ * Copyright (c) 2001 Atsushi Onoe
@@ -7230,7 +7230,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -7291,7 +7291,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/wmi/wmi.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/wmi/wmi.c 2007-11-26 21:09:46.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/wmi/wmi.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,2879 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -10175,8 +10175,8 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c 2007-11-26 21:18:07.000000000 +0100
-@@ -0,0 +1,5856 @@
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c 2007-11-28 16:25:23.000000000 +0100
+@@ -0,0 +1,5850 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
+ *
@@ -10521,12 +10521,6 @@
+ for (i = 0; i < sizeof(WMI_CONNECT_CMD); i++)
+ *(((char *)&connect) + i) = i;
+
-+ printk("################### size: %d\n ###################\n", sizeof(WMI_CONNECT_CMD));
-+
-+ printk("network_type: %d\n", connect.networkType);
-+ printk("ssid length: %d\n", connect.ssidLength);
-+ printk("channel: %d\n", connect.channel);
-+
+ if (probed) {
+ return -ENODEV;
+ }
@@ -16036,7 +16030,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/bmi/bmi.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/bmi/bmi.c 2007-11-27 16:12:21.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/bmi/bmi.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,473 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -16514,14 +16508,14 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/Makefile 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/Makefile 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,2 @@
+obj-$(CONFIG_SDIO_AR6000_WLAN) += hif.o
+
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/Makefile 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/Makefile 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,11 @@
+#
+# hif for compact flash
@@ -16537,7 +16531,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/ar6000_cs.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/ar6000_cs.c 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/ar6000_cs.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,1001 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -17543,7 +17537,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/ar6000_cs.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/ar6000_cs.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/ar6000_cs.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -17658,7 +17652,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/ar6000_cs_internal.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/ar6000_cs_internal.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/ar6000_cs_internal.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -17725,7 +17719,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/hif.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/hif.c 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/hif.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,390 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -18120,7 +18114,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/hif_internal.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/hif_internal.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/hif_internal.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -18203,13 +18197,13 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/bmi/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/bmi/Makefile 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/bmi/Makefile 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1 @@
+obj-$(CONFIG_SDIO_AR6000_WLAN) += bmi.o
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -18299,7 +18293,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/Makefile 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/Makefile 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,5 @@
+#
+# SDIO ar6000 wlan htc function driver
@@ -18309,14 +18303,14 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/wlan/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/wlan/Makefile 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/wlan/Makefile 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,2 @@
+obj-$(CONFIG_SDIO_AR6000_WLAN) += wlan_node.o wlan_recv_beacon.o wlan_utils.o
+
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2001 Atsushi Onoe
@@ -18490,7 +18484,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hw/mbox_reg.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hw/mbox_reg.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hw/mbox_reg.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,550 @@
+/*
+ * Copyright 2006 Atheros Communications, Inc.
@@ -19045,7 +19039,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hw/mc_reg.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hw/mc_reg.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hw/mc_reg.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,1129 @@
+/*
+ * Copyright 2006 Atheros Communications, Inc.
@@ -20179,7 +20173,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hw/rtc_reg.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hw/rtc_reg.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hw/rtc_reg.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,1204 @@
+/*
+ * Copyright 2006 Atheros Communications, Inc.
@@ -21388,7 +21382,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/athdefs.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/athdefs.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/athdefs.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,82 @@
+
+#ifndef __ATHDEFS_H__
@@ -21475,7 +21469,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hw/mbox_host_reg.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hw/mbox_host_reg.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hw/mbox_host_reg.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,416 @@
+/*
+ * Copyright 2006 Atheros Communications, Inc.
@@ -21896,7 +21890,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/AR6000_bmi.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/AR6000_bmi.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/AR6000_bmi.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2006 Atheros Communications, Inc.
@@ -22037,7 +22031,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/AR6000_version.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/AR6000_version.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/AR6000_version.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2006 Atheros Communications, Inc.
@@ -22088,7 +22082,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/AR6000_gpio.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/AR6000_gpio.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/AR6000_gpio.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2005-2006 Atheros Communications, Inc.
@@ -22132,7 +22126,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/app/dset.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/app/dset.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/app/dset.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,77 @@
+#ifndef _DSET_H_
+#define _DSET_H_
@@ -22214,7 +22208,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wmi.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wmi.h 2007-11-27 15:54:36.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wmi.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,1150 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -23369,7 +23363,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wmix.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wmix.h 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wmix.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 2004-2005 Atheros Communications Inc.
@@ -23570,8 +23564,8 @@
+#endif /* _WMIX_H_ */
Index: linux-2.6.22/drivers/pnp/core.c
===================================================================
---- linux-2.6.22.orig/drivers/pnp/core.c 2007-11-12 13:47:30.000000000 +0100
-+++ linux-2.6.22/drivers/pnp/core.c 2007-11-12 13:47:34.000000000 +0100
+--- linux-2.6.22.orig/drivers/pnp/core.c 2007-11-27 17:12:52.000000000 +0100
++++ linux-2.6.22/drivers/pnp/core.c 2007-11-27 17:16:52.000000000 +0100
@@ -169,14 +169,12 @@
*
* this function will free all mem used by dev
@@ -23599,8 +23593,8 @@
-#endif /* 0 */
Index: linux-2.6.22/drivers/pnp/driver.c
===================================================================
---- linux-2.6.22.orig/drivers/pnp/driver.c 2007-11-12 13:47:30.000000000 +0100
-+++ linux-2.6.22/drivers/pnp/driver.c 2007-11-12 13:47:34.000000000 +0100
+--- linux-2.6.22.orig/drivers/pnp/driver.c 2007-11-27 17:12:52.000000000 +0100
++++ linux-2.6.22/drivers/pnp/driver.c 2007-11-27 17:16:52.000000000 +0100
@@ -243,8 +243,6 @@
EXPORT_SYMBOL(pnp_register_driver);
@@ -23612,8 +23606,8 @@
EXPORT_SYMBOL(pnp_device_detach);
Index: linux-2.6.22/drivers/pnp/Kconfig
===================================================================
---- linux-2.6.22.orig/drivers/pnp/Kconfig 2007-11-12 13:47:30.000000000 +0100
-+++ linux-2.6.22/drivers/pnp/Kconfig 2007-11-12 13:47:34.000000000 +0100
+--- linux-2.6.22.orig/drivers/pnp/Kconfig 2007-11-27 17:12:52.000000000 +0100
++++ linux-2.6.22/drivers/pnp/Kconfig 2007-11-27 17:16:52.000000000 +0100
@@ -7,7 +7,7 @@
config PNP
Modified: developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack_functions.patch
===================================================================
--- developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack_functions.patch 2007-11-28 12:47:04 UTC (rev 3526)
+++ developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack_functions.patch 2007-11-28 15:49:25 UTC (rev 3527)
@@ -21,7 +21,7 @@
Index: linux-2.6.22/drivers/sdio/function/gps/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/gps/Makefile 2007-11-08 17:29:43.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/gps/Makefile 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,5 @@
+#
+# SDIO GPS function driver
@@ -31,7 +31,7 @@
Index: linux-2.6.22/drivers/sdio/function/gps/gps.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/gps/gps.c 2007-11-08 17:29:43.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/gps/gps.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,392 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: gps.c
@@ -428,7 +428,7 @@
Index: linux-2.6.22/drivers/sdio/function/gps/gps.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/gps/gps.h 2007-11-08 17:29:43.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/gps/gps.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,194 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: gps.h
@@ -627,7 +627,7 @@
Index: linux-2.6.22/drivers/sdio/function/gps/gps_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/gps/gps_linux.h 2007-11-08 17:29:43.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/gps/gps_linux.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,63 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: gps_linux.h
@@ -695,7 +695,7 @@
Index: linux-2.6.22/drivers/sdio/function/gps/gps_os.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/gps/gps_os.c 2007-11-08 17:29:43.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/gps/gps_os.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,633 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: gps_os.c
@@ -1333,7 +1333,7 @@
Index: linux-2.6.22/drivers/sdio/function/bluetooth/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/bluetooth/Makefile 2007-11-08 17:29:43.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/bluetooth/Makefile 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,5 @@
+#
+# SDIO bluetooth functiondriver
@@ -1343,7 +1343,7 @@
Index: linux-2.6.22/drivers/sdio/function/bluetooth/sdio_bt.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/bluetooth/sdio_bt.c 2007-11-08 17:29:43.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/bluetooth/sdio_bt.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,769 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_bt.c
@@ -2117,7 +2117,7 @@
Index: linux-2.6.22/drivers/sdio/function/bluetooth/sdio_bt.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/bluetooth/sdio_bt.h 2007-11-08 17:29:43.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/bluetooth/sdio_bt.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,176 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_bt.h
@@ -2298,7 +2298,7 @@
Index: linux-2.6.22/drivers/sdio/function/bluetooth/sdio_bt_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/bluetooth/sdio_bt_linux.h 2007-11-08 17:29:43.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/bluetooth/sdio_bt_linux.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,70 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_bt_linux.h
@@ -2373,7 +2373,7 @@
Index: linux-2.6.22/drivers/sdio/function/bluetooth/sdio_bt_os.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/bluetooth/sdio_bt_os.c 2007-11-08 17:29:43.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/bluetooth/sdio_bt_os.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,584 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_bt_os.c
@@ -2962,7 +2962,7 @@
Index: linux-2.6.22/drivers/sdio/function/memory/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/memory/Makefile 2007-11-08 17:29:43.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/memory/Makefile 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,5 @@
+#
+# SDIO memory card function driver
@@ -2972,7 +2972,7 @@
Index: linux-2.6.22/drivers/sdio/function/memory/sdio_memory.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/memory/sdio_memory.c 2007-11-08 17:29:43.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/memory/sdio_memory.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,926 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_memory.c
@@ -3903,7 +3903,7 @@
Index: linux-2.6.22/drivers/sdio/function/memory/sdio_memory.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/memory/sdio_memory.h 2007-11-08 17:29:43.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/memory/sdio_memory.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,98 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: function.h
@@ -4006,7 +4006,7 @@
Index: linux-2.6.22/drivers/sdio/function/memory/sdio_memory_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/memory/sdio_memory_linux.h 2007-11-08 17:29:43.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/memory/sdio_memory_linux.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,80 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_memory_linux.h
@@ -4091,7 +4091,7 @@
Index: linux-2.6.22/drivers/sdio/function/memory/sdio_memory_os.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/memory/sdio_memory_os.c 2007-11-08 17:29:43.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/memory/sdio_memory_os.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,1036 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_memory_os.c
@@ -5132,7 +5132,7 @@
Index: linux-2.6.22/drivers/sdio/function/Kconfig
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/Kconfig 2007-11-08 17:29:43.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/Kconfig 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,32 @@
+
+menu "SDIO function drivers"
@@ -5169,7 +5169,7 @@
Index: linux-2.6.22/drivers/sdio/function/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/Makefile 2007-11-08 17:29:43.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/Makefile 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,7 @@
+#
+# SDIO function drivers Makefile
Modified: developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack_shcd.patch
===================================================================
--- developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack_shcd.patch 2007-11-28 12:47:04 UTC (rev 3526)
+++ developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack_shcd.patch 2007-11-28 15:49:25 UTC (rev 3527)
@@ -12,7 +12,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pci_std/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pci_std/Makefile 2007-11-08 17:29:43.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pci_std/Makefile 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,4 @@
+obj-m += sdio_pcistd_hcd.o
+
@@ -21,7 +21,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pci_std/sdio_hcd_os.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pci_std/sdio_hcd_os.c 2007-11-08 17:29:43.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pci_std/sdio_hcd_os.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,569 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_os.c
@@ -595,7 +595,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/stdhost/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/stdhost/Makefile 2007-11-08 17:29:43.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/stdhost/Makefile 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,7 @@
+#
+# SDIO standard host controller makefile
@@ -607,7 +607,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd.c 2007-11-08 17:29:43.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,1663 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_std_hcd.c
@@ -2275,7 +2275,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd.h 2007-11-08 17:29:43.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,330 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_std_hcd.h
@@ -2610,7 +2610,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd_linux.h 2007-11-08 17:29:43.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd_linux.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,132 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_std_hcd_linux.h
@@ -2747,7 +2747,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd_linux_lib.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd_linux_lib.h 2007-11-08 17:29:43.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd_linux_lib.h 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,79 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_std_hcd_linux_lib.h
@@ -2831,7 +2831,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd_os.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd_os.c 2007-11-08 17:29:43.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd_os.c 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,826 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_std_hcd_os.c
Copied: developers/sameo/patches/ar6k-atheros/mach-gta02_wifi.patch (from rev 3526, developers/sameo/patches/ar6k-atheros/s3c2440_wlan_gpio_cfg.patch)
===================================================================
--- developers/sameo/patches/ar6k-atheros/s3c2440_wlan_gpio_cfg.patch 2007-11-28 12:47:04 UTC (rev 3526)
+++ developers/sameo/patches/ar6k-atheros/mach-gta02_wifi.patch 2007-11-28 15:49:25 UTC (rev 3527)
@@ -0,0 +1,84 @@
+---
+ arch/arm/mach-s3c2440/mach-gta02.c | 45 +++++++++++++++++++++++++++++++++----
+ 1 file changed, 41 insertions(+), 4 deletions(-)
+
+Index: linux-2.6.22/arch/arm/mach-s3c2440/mach-gta02.c
+===================================================================
+--- linux-2.6.22.orig/arch/arm/mach-s3c2440/mach-gta02.c 2007-11-27 17:11:54.000000000 +0100
++++ linux-2.6.22/arch/arm/mach-s3c2440/mach-gta02.c 2007-11-28 16:16:37.000000000 +0100
+@@ -305,12 +305,36 @@
+ },
+ };
+
++static struct resource gta02_sdio_resources[] = {
++ [0] = {
++ .flags = IORESOURCE_IRQ,
++ .start = IRQ_SDI,
++ .end = IRQ_SDI,
++ },
++ [1] = {
++ .flags = IORESOURCE_MEM,
++ .start = S3C2410_PA_SDI,
++ .end = S3C2410_PA_SDI + S3C24XX_SZ_SDI - 1,
++ }
++};
++
++
++static struct platform_device gta02_sdio_dev = {
++ .name = "s3c24xx-sdio",
++ .id = -1,
++ .dev = {
++ .coherent_dma_mask = 0xffffffff,
++ },
++ .resource = gta02_sdio_resources,
++ .num_resources = ARRAY_SIZE(gta02_sdio_resources),
++};
++
+ static struct platform_device *gta02_devices[] __initdata = {
+ &s3c_device_usb,
+ &s3c_device_wdt,
+ &s3c_device_i2c,
+ &s3c_device_iis,
+- // &s3c_device_sdi, /* FIXME: temporary disable to avoid s3cmci bind */
++// &s3c_device_sdi, /* FIXME: temporary disable to avoid s3cmci bind */
+ &s3c_device_usbgadget,
+ &s3c_device_nand,
+ &s3c_device_ts,
+@@ -651,14 +675,25 @@
+ set_s3c2410ts_info(>a02_ts_cfg);
+
+ /* FIXME: hardcoded WLAN module power-up */
+- s3c2410_gpio_setpin(GTA02_CHIP_PWD, 0);
++ s3c2410_gpio_cfgpin(GTA02_CHIP_PWD, S3C2410_GPIO_OUTPUT);
++
++ /* Power is down */
++ s3c2410_gpio_setpin(GTA02_CHIP_PWD, 1);
++ mdelay(100);
++
+ switch (system_rev) {
+ case GTA02v1_SYSTEM_REV:
++ s3c2410_gpio_setpin(GTA02_CHIP_PWD, 0);
+ break;
+ default:
++ s3c2410_gpio_cfgpin(GTA02_GPIO_nWLAN_RESET, S3C2410_GPIO_OUTPUT);
++ /* Chip is in reset state */
+ s3c2410_gpio_setpin(GTA02_GPIO_nWLAN_RESET, 0);
+- udelay(2000);
+- udelay(2000);
++ mdelay(100);
++ /* Power is up */
++ s3c2410_gpio_setpin(GTA02_CHIP_PWD, 0);
++ mdelay(100);
++ /* Chip is out of reset */
+ s3c2410_gpio_setpin(GTA02_GPIO_nWLAN_RESET, 1);
+ break;
+ }
+@@ -674,6 +709,8 @@
+ mangle_glamo_res_by_system_rev();
+ platform_device_register(>a02_glamo_dev);
+
++ platform_device_register(>a02_sdio_dev);
++
+ platform_add_devices(gta02_devices, ARRAY_SIZE(gta02_devices));
+
+ s3c2410_pm_init();
Deleted: developers/sameo/patches/ar6k-atheros/s3c2440_wlan_gpio_cfg.patch
===================================================================
--- developers/sameo/patches/ar6k-atheros/s3c2440_wlan_gpio_cfg.patch 2007-11-28 12:47:04 UTC (rev 3526)
+++ developers/sameo/patches/ar6k-atheros/s3c2440_wlan_gpio_cfg.patch 2007-11-28 15:49:25 UTC (rev 3527)
@@ -1,37 +0,0 @@
----
- arch/arm/mach-s3c2440/mach-gta02.c | 17 ++++++++++++++---
- 1 file changed, 14 insertions(+), 3 deletions(-)
-
-Index: linux-2.6.22/arch/arm/mach-s3c2440/mach-gta02.c
-===================================================================
---- linux-2.6.22.orig/arch/arm/mach-s3c2440/mach-gta02.c 2007-11-12 13:47:27.000000000 +0100
-+++ linux-2.6.22/arch/arm/mach-s3c2440/mach-gta02.c 2007-11-15 17:24:07.000000000 +0100
-@@ -651,14 +651,25 @@
- set_s3c2410ts_info(>a02_ts_cfg);
-
- /* FIXME: hardcoded WLAN module power-up */
-- s3c2410_gpio_setpin(GTA02_CHIP_PWD, 0);
-+ s3c2410_gpio_cfgpin(GTA02_CHIP_PWD, S3C2410_GPIO_OUTPUT);
-+
-+ /* Power is down */
-+ s3c2410_gpio_setpin(GTA02_CHIP_PWD, 1);
-+ mdelay(100);
-+
- switch (system_rev) {
- case GTA02v1_SYSTEM_REV:
-+ s3c2410_gpio_setpin(GTA02_CHIP_PWD, 0);
- break;
- default:
-+ s3c2410_gpio_cfgpin(GTA02_GPIO_nWLAN_RESET, S3C2410_GPIO_OUTPUT);
-+ /* Chip is in reset state */
- s3c2410_gpio_setpin(GTA02_GPIO_nWLAN_RESET, 0);
-- udelay(2000);
-- udelay(2000);
-+ mdelay(100);
-+ /* Power is up */
-+ s3c2410_gpio_setpin(GTA02_CHIP_PWD, 0);
-+ mdelay(100);
-+ /* Chip is out of reset */
- s3c2410_gpio_setpin(GTA02_GPIO_nWLAN_RESET, 1);
- break;
- }
Modified: developers/sameo/patches/ar6k-atheros/s3c24xx_hcd_atheros.patch
===================================================================
--- developers/sameo/patches/ar6k-atheros/s3c24xx_hcd_atheros.patch 2007-11-28 12:47:04 UTC (rev 3526)
+++ developers/sameo/patches/ar6k-atheros/s3c24xx_hcd_atheros.patch 2007-11-28 15:49:25 UTC (rev 3527)
@@ -2,14 +2,14 @@
drivers/sdio/hcd/Kconfig | 8
drivers/sdio/hcd/Makefile | 1
drivers/sdio/hcd/s3c24xx/Makefile | 2
- drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c | 1107 +++++++++++++++++++++++++++++++++
- drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h | 50 +
- 5 files changed, 1168 insertions(+)
+ drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c | 1122 +++++++++++++++++++++++++++++++++
+ drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h | 59 +
+ 5 files changed, 1192 insertions(+)
Index: linux-2.6.22/drivers/sdio/hcd/Kconfig
===================================================================
---- linux-2.6.22.orig/drivers/sdio/hcd/Kconfig 2007-11-12 13:47:26.000000000 +0100
-+++ linux-2.6.22/drivers/sdio/hcd/Kconfig 2007-11-12 13:47:34.000000000 +0100
+--- linux-2.6.22.orig/drivers/sdio/hcd/Kconfig 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/Kconfig 2007-11-27 17:16:52.000000000 +0100
@@ -46,6 +46,14 @@
help
good luck.
@@ -27,8 +27,8 @@
depends on SPI
Index: linux-2.6.22/drivers/sdio/hcd/Makefile
===================================================================
---- linux-2.6.22.orig/drivers/sdio/hcd/Makefile 2007-11-12 13:47:26.000000000 +0100
-+++ linux-2.6.22/drivers/sdio/hcd/Makefile 2007-11-12 13:47:34.000000000 +0100
+--- linux-2.6.22.orig/drivers/sdio/hcd/Makefile 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/Makefile 2007-11-27 17:16:52.000000000 +0100
@@ -6,3 +6,4 @@
obj-$(CONFIG_ARCH_OMAP24XX) += omap_2420/
obj-$(CONFIG_PXA27x) += pxa270/
@@ -37,15 +37,15 @@
Index: linux-2.6.22/drivers/sdio/hcd/s3c24xx/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/s3c24xx/Makefile 2007-11-12 13:47:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/s3c24xx/Makefile 2007-11-27 17:16:52.000000000 +0100
@@ -0,0 +1,2 @@
+obj-$(CONFIG_PLAT_S3C24XX) += sdio_s3c24xx_hcd.o
+sdio_s3c24xx_hcd-objs := s3c24xx_hcd.o
Index: linux-2.6.22/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c 2007-11-27 16:48:57.000000000 +0100
-@@ -0,0 +1,1107 @@
++++ linux-2.6.22/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c 2007-11-28 16:34:22.000000000 +0100
+@@ -0,0 +1,1122 @@
+/*
+ * s3c24xx_hcd.c - Samsung S3C MCI driver
+ *
@@ -58,7 +58,9 @@
+#include <linux/kernel.h>
+#include <linux/interrupt.h>
+#include <linux/list.h>
++#include <linux/dma-mapping.h>
+#include <linux/errno.h>
++#include <linux/platform_device.h>
+#include <linux/device.h>
+#include <linux/clk.h>
+#include <linux/fs.h>
@@ -73,6 +75,8 @@
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/uaccess.h>
++#include <asm/dma.h>
++#include <asm/dma-mapping.h>
+
+#include <asm/arch/regs-sdi.h>
+#include <asm/arch/regs-gpio.h>
@@ -86,12 +90,12 @@
+
+#define RESSIZE(ressource) (((ressource)->end - (ressource)->start)+1)
+
-+static struct resource s3c24xx_hcd_mem = {
-+ .start = S3C2410_PA_SDI,
-+ .end = S3C2410_PA_SDI + S3C24XX_SZ_SDI - 1,
-+ .flags = IORESOURCE_MEM,
++static struct s3c2410_dma_client s3c24xx_hcd_dma_client = {
++ .name = "s3c24xx_hcd",
+};
+
++extern struct platform_device s3c_device_sdi;
++
+static void s3c24xx_dump_regs(struct s3c24xx_hcd_context * context)
+{
+ u32 con, pre, cmdarg, cmdcon, cmdsta, r0, r1, r2, r3, timer, bsize;
@@ -132,21 +136,6 @@
+ printk("SDIIntMsk: 0x%08x\n", imask);
+}
+
-+static void s3c24xx_dump_fifo(struct s3c24xx_hcd_context * context, int iter)
-+{
-+ int i;
-+
-+ printk("Data FIFO dumping: \n");
-+ for (i = 0; i < iter; i++) {
-+ printk("\t[0]: 0x%08x", readl(context->base + S3C2440_SDIDATA));
-+ printk(" [1]: 0x%08x ", readl(context->base + S3C2440_SDIDATA + 4));
-+ printk(" [2]: 0x%08x ", readl(context->base + S3C2440_SDIDATA + 8));
-+ printk(" [3]: 0x%08x ", readl(context->base + S3C2440_SDIDATA + 0xc));
-+ }
-+ printk("\n");
-+
-+}
-+
+static inline void s3c24xx_hcd_clear_imask(struct s3c24xx_hcd_context * context)
+{
+ if (context->int_sdio)
@@ -568,14 +557,6 @@
+ SDIO_HandleHcdEvent(&context->hcd, EVENT_HCD_TRANSFER_DONE);
+}
+
-+
-+static irqreturn_t s3c24xx_hcd_cd_irq(int irq, void *dev_id)
-+{
-+ printk("######## %s() ############\n", __FUNCTION__);
-+
-+ return IRQ_HANDLED;
-+}
-+
+static irqreturn_t s3c24xx_hcd_irq(int irq, void *dev_id)
+{
+ u32 cmdsta, dsta;
@@ -942,34 +923,11 @@
+ return status;
+}
+
-+static int s3c24xx_hcd_initialize(struct s3c24xx_hcd_context * context)
++static int s3c24xx_hcd_hw_init(struct s3c24xx_hcd_context * context)
+{
+ SDIO_STATUS status = SDIO_STATUS_SUCCESS;
+ u32 con, datacon;
+
-+ /* Set multiplexing */
-+ s3c2410_gpio_cfgpin(S3C2410_GPE5, S3C2410_GPE5_SDCLK);
-+ s3c2410_gpio_cfgpin(S3C2410_GPE6, S3C2410_GPE6_SDCMD);
-+ s3c2410_gpio_cfgpin(S3C2410_GPE7, S3C2410_GPE7_SDDAT0);
-+ s3c2410_gpio_cfgpin(S3C2410_GPE8, S3C2410_GPE8_SDDAT1);
-+ s3c2410_gpio_cfgpin(S3C2410_GPE9, S3C2410_GPE9_SDDAT2);
-+ s3c2410_gpio_cfgpin(S3C2410_GPE10, S3C2410_GPE10_SDDAT3);
-+
-+ con = readl(context->base + S3C2410_SDICON);
-+ con |= S3C2410_SDICON_RWAITEN | S3C2410_SDICON_SDIOIRQ;
-+ writel(con, context->base + S3C2410_SDICON);
-+
-+ datacon = readl(context->base + S3C2410_SDIDCON);
-+ datacon |= S3C2410_SDIDCON_WIDEBUS;
-+ writel(datacon, context->base + S3C2410_SDIDCON);
-+
-+ return SDIOErrorToOSError(status);
-+}
-+
-+static int s3c24xx_hcd_hw_init(struct s3c24xx_hcd_context * context)
-+{
-+ SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+
+ printk("######## %s() ############\n", __FUNCTION__);
+
+ /* Clock */
@@ -1025,12 +983,44 @@
+ goto out_unmap_mem_region;
+ }
+
++ context->io_buffer_size = 4 * 4024;
++ context->io_buffer = dma_alloc_coherent(&context->pdev->dev,
++ context->io_buffer_size,
++ &context->io_buffer_dma,
++ GFP_KERNEL);
+
++ if (context->io_buffer == NULL) {
++ DBG_PRINT(SDDBG_ERROR, ("failed to allocate DMA buffer\n"));
++ status = -ENOMEM;
++ goto out_free_irq;
++
++ }
++
++
++ /* Set multiplexing */
++ s3c2410_gpio_cfgpin(S3C2410_GPE5, S3C2410_GPE5_SDCLK);
++ s3c2410_gpio_cfgpin(S3C2410_GPE6, S3C2410_GPE6_SDCMD);
++ s3c2410_gpio_cfgpin(S3C2410_GPE7, S3C2410_GPE7_SDDAT0);
++ s3c2410_gpio_cfgpin(S3C2410_GPE8, S3C2410_GPE8_SDDAT1);
++ s3c2410_gpio_cfgpin(S3C2410_GPE9, S3C2410_GPE9_SDDAT2);
++ s3c2410_gpio_cfgpin(S3C2410_GPE10, S3C2410_GPE10_SDDAT3);
++
++ con = readl(context->base + S3C2410_SDICON);
++ con |= S3C2410_SDICON_RWAITEN | S3C2410_SDICON_SDIOIRQ;
++ writel(con, context->base + S3C2410_SDICON);
++
++ datacon = readl(context->base + S3C2410_SDIDCON);
++ datacon |= S3C2410_SDIDCON_WIDEBUS;
++ writel(datacon, context->base + S3C2410_SDIDCON);
++
+ printk("S3c24xx SDIO: IRQ:%d Detect IRQ: %d base at 0x%p PCLK@%ld kHz\n",
+ context->io_irq, context->cd_irq, context->base, context->device.max_clock_rate/1000);
+
+ return SDIOErrorToOSError(status);
+
++ out_free_irq:
++ free_irq(context->io_irq, context);
++
+ out_unmap_mem_region:
+ iounmap(context->base);
+
@@ -1051,36 +1041,16 @@
+ release_mem_region(context->mem->start, RESSIZE(context->mem));
+}
+
-+static int s3c24xx_hcd_probe(struct pnp_dev *pBusDevice, const struct pnp_device_id *pId)
++static int s3c24xx_hcd_pnp_probe(struct pnp_dev *pBusDevice, const struct pnp_device_id *pId)
+{
+ SDIO_STATUS status = SDIO_STATUS_SUCCESS;
+
-+ printk("######## %s() ############\n", __FUNCTION__);
-+
-+ hcd_context.io_irq = IRQ_SDI;
-+ hcd_context.mem = &s3c24xx_hcd_mem;
-+
-+ spin_lock_init(&hcd_context.lock);
-+
-+ INIT_WORK (&hcd_context.pio_work, s3c24xx_hcd_pio_work);
-+
-+ hcd_context.int_sdio = 0;
-+ hcd_context.int_sdio_reported = 0;
-+ hcd_context.int_sdio_pending = 0;
-+
+ status = s3c24xx_hcd_hw_init(&hcd_context);
+ if (SDIO_IS_ERROR(status)) {
+ DBG_PRINT(SDDBG_ERROR, ("HW Init failed\n"));
+ return SDIOErrorToOSError(status);
+ }
+
-+ status = s3c24xx_hcd_initialize(&hcd_context);
-+ if (SDIO_IS_ERROR(status)) {
-+ DBG_PRINT(SDDBG_ERROR, ("HCD Initialisation failed\n"));
-+ s3c24xx_hcd_hw_cleanup(&hcd_context);
-+ return SDIOErrorToOSError(status);
-+ }
-+
+ status = SDIO_RegisterHostController(&hcd_context.hcd);
+ if (SDIO_IS_ERROR(status)) {
+ DBG_PRINT(SDDBG_ERROR, ("Host registration failed\n"));
@@ -1094,7 +1064,7 @@
+ return 0;
+}
+
-+static void s3c24xx_hcd_remove(struct pnp_dev *pBusDevice)
++static void s3c24xx_hcd_pnp_remove(struct pnp_dev *pBusDevice)
+{
+}
+
@@ -1118,46 +1088,91 @@
+ .hcd.pConfigure = s3c24xx_hcd_config,
+ .device.pnp_device.name = "sdio_s3c24xx_hcd",
+ .device.pnp_driver.name = "sdio_s3c24xx_hcd",
-+ .device.pnp_driver.probe = s3c24xx_hcd_probe,
-+ .device.pnp_driver.remove = s3c24xx_hcd_remove,
++ .device.pnp_driver.probe = s3c24xx_hcd_pnp_probe,
++ .device.pnp_driver.remove = s3c24xx_hcd_pnp_remove,
+};
+
-+
-+static int __init s3c24xx_hcd_init(void)
++static int s3c24xx_hcd_probe(struct platform_device * pdev)
+{
+ SDIO_STATUS status = SDIO_STATUS_SUCCESS;
+
+ printk("S3c2440 SDIO Host controller\n");
+
-+ REL_PRINT(SDDBG_TRACE, ("SDIO S3C24xx started\n"));
++ hcd_context.pdev = pdev;
+
++ hcd_context.mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++ if (hcd_context.mem == NULL) {
++ DBG_PRINT(SDDBG_ERROR, ("No memory region\n"));
++ status = SDIO_STATUS_NO_RESOURCES;
++ goto out;
++ }
++
++ hcd_context.io_irq = platform_get_irq(pdev, 0);
++ if (hcd_context.io_irq == 0) {
++ DBG_PRINT(SDDBG_ERROR, ("No memory region\n"));
++ status = SDIO_STATUS_NO_RESOURCES;
++ goto out;
++ }
++
++ hcd_context.int_sdio = 0;
++ hcd_context.int_sdio_reported = 0;
++ hcd_context.int_sdio_pending = 0;
++
++ spin_lock_init(&hcd_context.lock);
++
++ INIT_WORK(&hcd_context.pio_work, s3c24xx_hcd_pio_work);
++
+ status = SDIO_BusAddOSDevice(&hcd_context.device.dma,
+ &hcd_context.device.pnp_driver,
+ &hcd_context.device.pnp_device);
+
++ out:
++
+ return SDIOErrorToOSError(status);
+}
+
+/*
+ * module cleanup
+*/
-+static void __exit s3c24xx_hcd_cleanup(void) {
++static int s3c24xx_hcd_remove(struct platform_device * pdev) {
+ printk("S3C2440 SDIO host controller unloaded\n");
+ SDIO_BusRemoveOSDevice(&hcd_context.device.pnp_driver, &hcd_context.device.pnp_device);
++
++ return 0;
+}
+
++static struct platform_driver s3c24xx_hcd_sdio =
++{
++ .driver.name = "s3c24xx-sdio",
++ .probe = s3c24xx_hcd_probe,
++ .remove = s3c24xx_hcd_remove,
++};
+
++
++static int __init s3c24xx_hcd_init(void)
++{
++ platform_driver_register(&s3c24xx_hcd_sdio);
++
++ return 0;
++}
++
++static void __exit s3c24xx_hcd_exit(void)
++{
++ platform_driver_unregister(&s3c24xx_hcd_sdio);
++}
++
++
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION(DESCRIPTION);
+MODULE_AUTHOR(AUTHOR);
+
+module_init(s3c24xx_hcd_init);
-+module_exit(s3c24xx_hcd_cleanup);
++module_exit(s3c24xx_hcd_exit);
Index: linux-2.6.22/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h 2007-11-22 22:01:57.000000000 +0100
-@@ -0,0 +1,50 @@
++++ linux-2.6.22/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h 2007-11-28 16:05:12.000000000 +0100
+@@ -0,0 +1,59 @@
+#ifndef __SDIO_S3C24XX_HCD_H___
+#define __SDIO_S3C24XX_HCD_H___
+
@@ -1183,6 +1198,7 @@
+ PTEXT description; /* human readable device decsription */
+ SDHCD hcd; /* HCD description for bus driver */
+ struct s3c24xx_hcd_device device; /* the single device's info */
++ struct platform_device *pdev;
+ struct resource *mem;
+ void __iomem *base;
+ UINT32 io_irq;
@@ -1193,12 +1209,20 @@
+ BOOL irq_masked;
+ UINT32 bus_width;
+ UINT32 data_size; /* Word, half word, or byte */
++
++ void *io_buffer; /* Kernel address */
++ dma_addr_t io_buffer_dma; /* Bus address */
++ UINT32 io_buffer_size;
++
+ UINT32 int_mask;
+ UINT32 int_sdio; /* Do we have SDIO interrupt on ? */
+ UINT32 int_sdio_reported;
+ UINT32 int_sdio_pending;
++
+ UINT32 complete;
++
+ spinlock_t lock;
++
+ struct work_struct pio_work;
+};
+
Modified: developers/sameo/patches/ar6k-atheros/series
===================================================================
--- developers/sameo/patches/ar6k-atheros/series 2007-11-28 12:47:04 UTC (rev 3526)
+++ developers/sameo/patches/ar6k-atheros/series 2007-11-28 15:49:25 UTC (rev 3527)
@@ -1,3 +1,6 @@
+patch-2.6.22.5.bz2 -p1
+fix-EVIOCGRAB-semantics-2.6.22.5.patch -p1
+fix-gta01-flowcontrol2-2.6.22.5.patch -p1
common_atheros_sdiostack.patch
common_atheros_sdiostack_functions.patch
common_atheros_sdiostack_shcd.patch
@@ -3,4 +6,4 @@
common_atheros_sdiostack_ar6000_wlan.patch
pnp_fixes_2.6.22.5.patch
-s3c2440_wlan_gpio_cfg.patch
+mach-gta02_wifi.patch
s3c24xx_hcd_atheros.patch
More information about the commitlog
mailing list
