r4627 - developers/werner/wlan-spi/patches
werner at docs.openmoko.org
werner at docs.openmoko.org
Thu Sep 4 10:17:30 CEST 2008
Author: werner
Date: 2008-09-04 10:17:28 +0200 (Thu, 04 Sep 2008)
New Revision: 4627
Modified:
developers/werner/wlan-spi/patches/config-ar6k-mmc-spi-bitbang.patch
developers/werner/wlan-spi/patches/gta02-mmc-spi-bitbang.patch
Log:
gta02-mmc-spi-bitbang.patch: disable s3c_device_spi_acc or all hell breaks
loose
gta02-mmc-spi-bitbang.patch: move defconfig-gta02 changes over to
config-ar6k-mmc-spi-bitbang.patch (and make more sweeping changes)
Modified: developers/werner/wlan-spi/patches/config-ar6k-mmc-spi-bitbang.patch
===================================================================
--- developers/werner/wlan-spi/patches/config-ar6k-mmc-spi-bitbang.patch 2008-09-04 06:56:08 UTC (rev 4626)
+++ developers/werner/wlan-spi/patches/config-ar6k-mmc-spi-bitbang.patch 2008-09-04 08:17:28 UTC (rev 4627)
@@ -1,23 +1,28 @@
config-ar6k-mmc-spi-bitbang.patch
Convenience patch to switch the GTA02 defconfig to use MMC-SPI for
-the AR6000 driver.
+the AR6000 driver. Also contains a bunch of other changes that
+need to be separated.
Index: korig/defconfig-gta02
===================================================================
---- korig.orig/defconfig-gta02 2008-09-04 03:35:43.000000000 -0300
-+++ korig/defconfig-gta02 2008-09-04 03:35:50.000000000 -0300
+--- korig.orig/defconfig-gta02 2008-09-04 05:07:03.000000000 -0300
++++ korig/defconfig-gta02 2008-09-04 05:07:35.000000000 -0300
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.24
-# Mon Feb 25 07:03:56 2008
-+# Thu Sep 4 03:29:51 2008
++# Thu Sep 4 05:04:11 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-@@ -207,6 +207,7 @@
- CONFIG_MACH_HXD8=y
+@@ -204,9 +204,10 @@
+ CONFIG_ARCH_S3C2440=y
+ # CONFIG_MACH_NEXCODER_2440 is not set
+ CONFIG_SMDK2440_CPU2440=y
+-CONFIG_MACH_HXD8=y
++# CONFIG_MACH_HXD8 is not set
CONFIG_MACH_NEO1973_GTA02=y
# CONFIG_NEO1973_GTA02_2440 is not set
+CONFIG_AR6K_SPI_S3C24XX_GPIO=y
@@ -46,33 +51,92 @@
# CONFIG_PHYLIB is not set
CONFIG_NET_ETHERNET=y
CONFIG_MII=y
-@@ -1136,6 +1129,7 @@
- CONFIG_SND=m
- CONFIG_SND_TIMER=m
- CONFIG_SND_PCM=m
-+CONFIG_SND_RAWMIDI=m
- # CONFIG_SND_SEQUENCER is not set
- CONFIG_SND_OSSEMUL=y
- CONFIG_SND_MIXER_OSS=m
-@@ -1176,6 +1170,7 @@
- CONFIG_SND_S3C24XX_SOC=m
- CONFIG_SND_S3C24XX_SOC_I2S=m
- CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
-+# CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753_DEBUG is not set
- CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m
+@@ -866,7 +859,7 @@
+ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
+ # CONFIG_INPUT_JOYDEV is not set
+ CONFIG_INPUT_EVDEV=y
+-# CONFIG_INPUT_EVBUG is not set
++CONFIG_INPUT_EVBUG=m
#
-@@ -1380,19 +1375,13 @@
+ # Input Device Drivers
+@@ -1128,65 +1121,7 @@
+ #
+ # Sound
+ #
+-CONFIG_SOUND=y
+-
+-#
+-# Advanced Linux Sound Architecture
+-#
+-CONFIG_SND=m
+-CONFIG_SND_TIMER=m
+-CONFIG_SND_PCM=m
+-# CONFIG_SND_SEQUENCER is not set
+-CONFIG_SND_OSSEMUL=y
+-CONFIG_SND_MIXER_OSS=m
+-CONFIG_SND_PCM_OSS=m
+-CONFIG_SND_PCM_OSS_PLUGINS=y
+-# CONFIG_SND_DYNAMIC_MINORS is not set
+-CONFIG_SND_SUPPORT_OLD_API=y
+-CONFIG_SND_VERBOSE_PROCFS=y
+-# CONFIG_SND_VERBOSE_PRINTK is not set
+-# CONFIG_SND_DEBUG is not set
+-
+-#
+-# Generic devices
+-#
+-# CONFIG_SND_DUMMY is not set
+-# CONFIG_SND_MTPAV is not set
+-# CONFIG_SND_SERIAL_U16550 is not set
+-# CONFIG_SND_MPU401 is not set
+-
+-#
+-# ALSA ARM devices
+-#
+-
+-#
+-# SPI devices
+-#
+-
+-#
+-# USB devices
+-#
+-# CONFIG_SND_USB_AUDIO is not set
+-# CONFIG_SND_USB_CAIAQ is not set
+-
+-#
+-# System on Chip audio support
+-#
+-CONFIG_SND_SOC=m
+-CONFIG_SND_S3C24XX_SOC=m
+-CONFIG_SND_S3C24XX_SOC_I2S=m
+-CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
+-CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m
+-
+-#
+-# SoC Audio support for SuperH
+-#
+-CONFIG_SND_SOC_WM8753=m
+-
+-#
+-# Open Sound System
+-#
+-# CONFIG_SOUND_PRIME is not set
++# CONFIG_SOUND is not set
+ CONFIG_HID_SUPPORT=y
+ CONFIG_HID=y
+ # CONFIG_HID_DEBUG is not set
+@@ -1379,20 +1314,13 @@
+ # CONFIG_USB_GADGET_DUMMY_HCD is not set
# CONFIG_USB_GADGET_DUALSPEED is not set
# CONFIG_USB_ZERO is not set
- CONFIG_USB_ETH=m
+-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=m
-+CONFIG_USB_ETH_RNDIS=y
- CONFIG_USB_GADGETFS=m
- CONFIG_USB_FILE_STORAGE=m
-+# CONFIG_USB_FILE_STORAGE_TEST is not set
- CONFIG_USB_G_SERIAL=m
- CONFIG_USB_MIDI_GADGET=m
+-CONFIG_USB_GADGETFS=m
+-CONFIG_USB_FILE_STORAGE=m
+-CONFIG_USB_G_SERIAL=m
+-CONFIG_USB_MIDI_GADGET=m
-
-#
-# SDIO support
@@ -81,11 +145,17 @@
-CONFIG_SDIO_S3C24XX=y
-CONFIG_SDIO_S3C24XX_DMA=y
-CONFIG_SDIO_AR6000_WLAN=y
++CONFIG_USB_ETH=y
++CONFIG_USB_ETH_RNDIS=y
++# CONFIG_USB_GADGETFS is not set
++# CONFIG_USB_FILE_STORAGE is not set
++# CONFIG_USB_G_SERIAL is not set
++# CONFIG_USB_MIDI_GADGET is not set
+CONFIG_AR6000_WLAN=y
CONFIG_MMC=y
# CONFIG_MMC_DEBUG is not set
CONFIG_MMC_UNSAFE_RESUME=y
-@@ -1407,7 +1396,7 @@
+@@ -1407,7 +1335,7 @@
#
# MMC/SD Host Controller Drivers
#
@@ -94,15 +164,25 @@
CONFIG_MMC_S3C=y
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
-@@ -1510,6 +1499,7 @@
+@@ -1480,7 +1408,7 @@
+ #
+ # File systems
+ #
+-CONFIG_EXT2_FS=y
++CONFIG_EXT2_FS=m
+ # CONFIG_EXT2_FS_XATTR is not set
+ # CONFIG_EXT2_FS_XIP is not set
+ CONFIG_EXT3_FS=y
+@@ -1509,7 +1437,7 @@
+ CONFIG_ISO9660_FS=m
CONFIG_JOLIET=y
# CONFIG_ZISOFS is not set
- CONFIG_UDF_FS=m
-+CONFIG_UDF_NLS=y
+-CONFIG_UDF_FS=m
++# CONFIG_UDF_FS is not set
#
# DOS/FAT/NT Filesystems
-@@ -1542,16 +1532,6 @@
+@@ -1542,16 +1470,6 @@
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
@@ -119,7 +199,7 @@
CONFIG_JFFS2_FS=y
CONFIG_JFFS2_FS_DEBUG=0
CONFIG_JFFS2_FS_WRITEBUFFER=y
-@@ -1751,9 +1731,9 @@
+@@ -1751,9 +1669,9 @@
CONFIG_BITREVERSE=y
CONFIG_CRC_CCITT=m
CONFIG_CRC16=m
Modified: developers/werner/wlan-spi/patches/gta02-mmc-spi-bitbang.patch
===================================================================
--- developers/werner/wlan-spi/patches/gta02-mmc-spi-bitbang.patch 2008-09-04 06:56:08 UTC (rev 4626)
+++ developers/werner/wlan-spi/patches/gta02-mmc-spi-bitbang.patch 2008-09-04 08:17:28 UTC (rev 4627)
@@ -6,12 +6,15 @@
This configuration should work with all GTA02 models. No rework
required.
+Note that this patch disables the acceleration sensors, because they
+also use the SPI GPIO driver. This needs a bit more integration.
+
Not-Yet-Signed-off-by: Werner Almesberger <werner at openmoko.org>
Index: korig/arch/arm/mach-s3c2440/Kconfig
===================================================================
---- korig.orig/arch/arm/mach-s3c2440/Kconfig 2008-09-04 03:30:55.000000000 -0300
-+++ korig/arch/arm/mach-s3c2440/Kconfig 2008-09-04 03:32:29.000000000 -0300
+--- korig.orig/arch/arm/mach-s3c2440/Kconfig 2008-09-04 05:07:56.000000000 -0300
++++ korig/arch/arm/mach-s3c2440/Kconfig 2008-09-04 05:08:00.000000000 -0300
@@ -98,6 +98,20 @@
Say Y here if you are using an early hardware revision
of the FIC/Openmoko Neo1973 GTA02 GSM Phone.
@@ -35,8 +38,8 @@
#source "arch/arm/mach-s3c2440/camera/Kconfig"
Index: korig/arch/arm/mach-s3c2440/mach-gta02.c
===================================================================
---- korig.orig/arch/arm/mach-s3c2440/mach-gta02.c 2008-09-04 03:30:55.000000000 -0300
-+++ korig/arch/arm/mach-s3c2440/mach-gta02.c 2008-09-04 03:31:20.000000000 -0300
+--- korig.orig/arch/arm/mach-s3c2440/mach-gta02.c 2008-09-04 05:08:00.000000000 -0300
++++ korig/arch/arm/mach-s3c2440/mach-gta02.c 2008-09-04 05:09:03.000000000 -0300
@@ -37,6 +37,7 @@
#include <linux/spi/spi.h>
#include <linux/spi/glamo.h>
@@ -131,144 +134,18 @@
static struct resource gta02_led_resources[] = {
{
.name = "gta02-power:orange",
-@@ -1603,6 +1683,12 @@
+@@ -1603,7 +1683,13 @@
mangle_glamo_res_by_system_rev();
platform_device_register(>a02_glamo_dev);
+- platform_device_register(&s3c_device_spi_acc);
+#ifdef CONFIG_AR6K_SPI_S3C24XX_GPIO
+ s3c2410_gpio_setpin(S3C2410_GPE10, 1);
+ s3c2410_gpio_cfgpin(S3C2410_GPE10, S3C2410_GPIO_OUTPUT);
+ platform_device_register(>a02_spi_wlan);
+#endif /* CONFIG_AR6K_SPI_S3C24XX_GPIO */
+
- platform_device_register(&s3c_device_spi_acc);
++// platform_device_register(&s3c_device_spi_acc);
platform_device_register(>a02_button_dev);
platform_device_register(>a02_pm_gsm_dev);
-Index: korig/defconfig-gta02
-===================================================================
---- korig.orig/defconfig-gta02 2008-09-04 03:30:55.000000000 -0300
-+++ korig/defconfig-gta02 2008-09-04 03:31:20.000000000 -0300
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.24
--# Mon Feb 25 07:03:56 2008
-+# Thu Sep 4 03:29:51 2008
- #
- CONFIG_ARM=y
- CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-@@ -207,6 +207,7 @@
- CONFIG_MACH_HXD8=y
- CONFIG_MACH_NEO1973_GTA02=y
- # CONFIG_NEO1973_GTA02_2440 is not set
-+CONFIG_AR6K_SPI_S3C24XX_GPIO=y
- CONFIG_CPU_S3C2442=y
-
- #
-@@ -710,13 +711,6 @@
- #
- # CONFIG_MTD_UBI is not set
- # CONFIG_PARPORT is not set
--CONFIG_PNP=y
--CONFIG_PNP_DEBUG=y
--
--#
--# Protocols
--#
--# CONFIG_PNPACPI is not set
- CONFIG_BLK_DEV=y
- # CONFIG_BLK_DEV_COW_COMMON is not set
- CONFIG_BLK_DEV_LOOP=m
-@@ -784,7 +778,6 @@
- # CONFIG_EQUALIZER is not set
- CONFIG_TUN=m
- # CONFIG_VETH is not set
--# CONFIG_NET_SB1000 is not set
- # CONFIG_PHYLIB is not set
- CONFIG_NET_ETHERNET=y
- CONFIG_MII=y
-@@ -1136,6 +1129,7 @@
- CONFIG_SND=m
- CONFIG_SND_TIMER=m
- CONFIG_SND_PCM=m
-+CONFIG_SND_RAWMIDI=m
- # CONFIG_SND_SEQUENCER is not set
- CONFIG_SND_OSSEMUL=y
- CONFIG_SND_MIXER_OSS=m
-@@ -1176,6 +1170,7 @@
- CONFIG_SND_S3C24XX_SOC=m
- CONFIG_SND_S3C24XX_SOC_I2S=m
- CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
-+# CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753_DEBUG is not set
- CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m
-
- #
-@@ -1380,19 +1375,13 @@
- # CONFIG_USB_GADGET_DUALSPEED is not set
- # CONFIG_USB_ZERO is not set
- CONFIG_USB_ETH=m
--CONFIG_USB_ETH_RNDIS=m
-+CONFIG_USB_ETH_RNDIS=y
- CONFIG_USB_GADGETFS=m
- CONFIG_USB_FILE_STORAGE=m
-+# CONFIG_USB_FILE_STORAGE_TEST is not set
- CONFIG_USB_G_SERIAL=m
- CONFIG_USB_MIDI_GADGET=m
--
--#
--# SDIO support
--#
--CONFIG_SDIO=y
--CONFIG_SDIO_S3C24XX=y
--CONFIG_SDIO_S3C24XX_DMA=y
--CONFIG_SDIO_AR6000_WLAN=y
-+CONFIG_AR6000_WLAN=y
- CONFIG_MMC=y
- # CONFIG_MMC_DEBUG is not set
- CONFIG_MMC_UNSAFE_RESUME=y
-@@ -1407,7 +1396,7 @@
- #
- # MMC/SD Host Controller Drivers
- #
--# CONFIG_MMC_SPI is not set
-+CONFIG_MMC_SPI=y
- CONFIG_MMC_S3C=y
- CONFIG_NEW_LEDS=y
- CONFIG_LEDS_CLASS=y
-@@ -1510,6 +1499,7 @@
- CONFIG_JOLIET=y
- # CONFIG_ZISOFS is not set
- CONFIG_UDF_FS=m
-+CONFIG_UDF_NLS=y
-
- #
- # DOS/FAT/NT Filesystems
-@@ -1542,16 +1532,6 @@
- # CONFIG_BEFS_FS is not set
- # CONFIG_BFS_FS is not set
- # CONFIG_EFS_FS is not set
--CONFIG_YAFFS_FS=y
--CONFIG_YAFFS_YAFFS1=y
--CONFIG_YAFFS_9BYTE_TAGS=y
--CONFIG_YAFFS_YAFFS2=y
--CONFIG_YAFFS_AUTO_YAFFS2=y
--# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
--CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=10
--# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
--# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
--CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
- CONFIG_JFFS2_FS=y
- CONFIG_JFFS2_FS_DEBUG=0
- CONFIG_JFFS2_FS_WRITEBUFFER=y
-@@ -1751,9 +1731,9 @@
- CONFIG_BITREVERSE=y
- CONFIG_CRC_CCITT=m
- CONFIG_CRC16=m
--# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC_ITU_T=y
- CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
-+CONFIG_CRC7=y
- CONFIG_LIBCRC32C=m
- CONFIG_ZLIB_INFLATE=y
- CONFIG_ZLIB_DEFLATE=y
+ platform_device_register(>a02_pm_usbhost_dev);
More information about the commitlog
mailing list
