Changeset 14464


Ignore:
Timestamp:
2009-02-10T17:55:38+01:00 (8 years ago)
Author:
mb
Message:

Deprecate the old SPI-GPIO driver.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/kernel/modules/other.mk

    r14419 r14464  
    691691$(eval $(call KernelPackage,spi-bitbang)) 
    692692 
    693 define KernelPackage/spi-gpio 
    694   SUBMENU:=$(OTHER_MENU) 
    695   TITLE:=GPIO based bitbanging SPI controller 
     693define KernelPackage/spi-gpio-old 
     694  SUBMENU:=$(OTHER_MENU) 
     695  TITLE:=Old GPIO based bitbanging SPI controller (DEPRECATED) 
    696696  DEPENDS:=@GPIO_SUPPORT +kmod-spi-bitbang 
    697   KCONFIG:=CONFIG_SPI_GPIO 
    698   FILES:=$(LINUX_DIR)/drivers/spi/spi_gpio.$(LINUX_KMOD_SUFFIX) 
    699   AUTOLOAD:=$(call AutoLoad,92,spi_gpio) 
    700 endef 
    701  
    702 define KernelPackage/spi-gpio/description 
     697  KCONFIG:=CONFIG_SPI_GPIO_OLD 
     698  FILES:=$(LINUX_DIR)/drivers/spi/spi_gpio_old.$(LINUX_KMOD_SUFFIX) 
     699  AUTOLOAD:=$(call AutoLoad,92,spi_gpio_old) 
     700endef 
     701 
     702define KernelPackage/spi-gpio-old/description 
    703703 This package contains the GPIO based bitbanging SPI controller driver 
    704704endef 
    705705 
    706 $(eval $(call KernelPackage,spi-gpio)) 
     706$(eval $(call KernelPackage,spi-gpio-old)) 
    707707 
    708708define KernelPackage/spi-dev 
  • trunk/package/mmc_over_gpio/Makefile

    r13273 r14464  
    1616define KernelPackage/mmc-over-gpio 
    1717  SUBMENU:=Other modules 
    18   DEPENDS:=@GPIO_SUPPORT +kmod-mmc-spi +kmod-spi-gpio 
     18  DEPENDS:=@GPIO_SUPPORT +kmod-mmc-spi +kmod-spi-gpio-old 
    1919  KCONFIG:=CONFIG_GPIOMMC CONFIG_CONFIGFS_FS=y 
    2020  TITLE:=MMC/SD card over GPIO support 
  • trunk/package/wrt55agv2-spidevs/Makefile

    r10853 r14464  
    1717  SUBMENU:=Other modules 
    1818  TITLE:=WRT55AG v2 SPI devices support 
    19   DEPENDS:=@LINUX_2_6 @TARGET_atheros +kmod-spi-gpio +kmod-spi-ks8995 
     19  DEPENDS:=@LINUX_2_6 @TARGET_atheros +kmod-spi-gpio-old +kmod-spi-ks8995 
    2020  FILES:=$(PKG_BUILD_DIR)/wrt55agv2_spidevs.$(LINUX_KMOD_SUFFIX) 
    2121endef 
  • trunk/package/wrt55agv2-spidevs/src/wrt55agv2_spidevs.c

    r10853 r14464  
    1313 
    1414#include <linux/platform_device.h> 
    15 #include <linux/spi/spi_gpio.h> 
     15#include <linux/spi/spi_gpio_old.h> 
    1616 
    1717#define DRV_NAME        "wrt55agv2-spidevs" 
  • trunk/target/linux/generic-2.6/patches-2.6.28/921-gpio_spi_driver.patch

    r13654 r14464  
    1 --- /dev/null 
    2 +++ b/include/linux/spi/spi_gpio.h 
     1THIS CODE IS DEPRECATED. 
     2 
     3Please use the new mainline SPI-GPIO driver, as of 2.6.29. 
     4 
     5--mb 
     6 
     7 
     8 
     9Index: linux-2.6.28.2/include/linux/spi/spi_gpio_old.h 
     10=================================================================== 
     11--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     12+++ linux-2.6.28.2/include/linux/spi/spi_gpio_old.h     2009-02-10 17:14:33.000000000 +0100 
    313@@ -0,0 +1,73 @@ 
    414+/* 
     
    7585+ 
    7686+#endif /* _LINUX_SPI_SPI_GPIO */ 
    77 --- /dev/null 
    78 +++ b/drivers/spi/spi_gpio.c 
     87Index: linux-2.6.28.2/drivers/spi/spi_gpio_old.c 
     88=================================================================== 
     89--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     90+++ linux-2.6.28.2/drivers/spi/spi_gpio_old.c   2009-02-10 17:15:01.000000000 +0100 
    7991@@ -0,0 +1,251 @@ 
    8092+/* 
     
    104116+#include <linux/spi/spi.h> 
    105117+#include <linux/spi/spi_bitbang.h> 
    106 +#include <linux/spi/spi_gpio.h> 
     118+#include <linux/spi/spi_gpio_old.h> 
    107119+#include <linux/gpio.h> 
    108120+#include <asm/atomic.h> 
     
    329341+MODULE_DESCRIPTION("Platform independent GPIO bitbanging SPI driver"); 
    330342+MODULE_LICENSE("GPL v2"); 
    331 --- a/drivers/spi/Kconfig 
    332 +++ b/drivers/spi/Kconfig 
    333 @@ -100,6 +100,19 @@ config SPI_BUTTERFLY 
     343Index: linux-2.6.28.2/drivers/spi/Kconfig 
     344=================================================================== 
     345--- linux-2.6.28.2.orig/drivers/spi/Kconfig     2009-02-10 17:13:57.000000000 +0100 
     346+++ linux-2.6.28.2/drivers/spi/Kconfig  2009-02-10 17:14:33.000000000 +0100 
     347@@ -100,6 +100,15 @@ config SPI_BUTTERFLY 
    334348          inexpensive battery powered microcontroller evaluation board. 
    335349          This same cable can be used to flash new firmware. 
    336350  
    337 +config SPI_GPIO 
    338 +       tristate "GPIO API based bitbanging SPI controller" 
     351+config SPI_GPIO_OLD 
     352+       tristate "Old GPIO API based bitbanging SPI controller (DEPRECATED)" 
    339353+       depends on SPI_MASTER && GENERIC_GPIO 
    340354+       select SPI_BITBANG 
    341355+       help 
    342 +         This is a platform driver that can be used for bitbanging 
    343 +         an SPI bus over GPIO pins. 
    344 +         Select this if you have any SPI device that is connected via 
    345 +         GPIO pins. 
    346 +         The module will be called spi_gpio. 
     356+         This code is deprecated. Please use the new mainline SPI-GPIO driver. 
    347357+ 
    348358+         If unsure, say N. 
     
    351361        tristate "Freescale iMX SPI controller" 
    352362        depends on ARCH_IMX && EXPERIMENTAL 
    353 --- a/drivers/spi/Makefile 
    354 +++ b/drivers/spi/Makefile 
     363Index: linux-2.6.28.2/drivers/spi/Makefile 
     364=================================================================== 
     365--- linux-2.6.28.2.orig/drivers/spi/Makefile    2009-02-10 17:13:57.000000000 +0100 
     366+++ linux-2.6.28.2/drivers/spi/Makefile 2009-02-10 17:14:33.000000000 +0100 
    355367@@ -16,6 +16,7 @@ obj-$(CONFIG_SPI_BFIN)                        += spi_bfin5xx. 
    356368 obj-$(CONFIG_SPI_BITBANG)              += spi_bitbang.o 
    357369 obj-$(CONFIG_SPI_AU1550)               += au1550_spi.o 
    358370 obj-$(CONFIG_SPI_BUTTERFLY)            += spi_butterfly.o 
    359 +obj-$(CONFIG_SPI_GPIO)                 += spi_gpio.o 
     371+obj-$(CONFIG_SPI_GPIO_OLD)             += spi_gpio_old.o 
    360372 obj-$(CONFIG_SPI_IMX)                  += spi_imx.o 
    361373 obj-$(CONFIG_SPI_LM70_LLP)             += spi_lm70llp.o 
    362374 obj-$(CONFIG_SPI_PXA2XX)               += pxa2xx_spi.o 
    363 --- a/MAINTAINERS 
    364 +++ b/MAINTAINERS 
    365 @@ -4027,6 +4027,11 @@ M:       jbglaw@lug-owl.de 
    366  L:     linux-kernel@vger.kernel.org 
    367  S:     Maintained 
    368   
    369 +SPI GPIO MASTER DRIVER 
    370 +P:     Michael Buesch 
    371 +M:     mb@bu3sch.de 
    372 +S:     Maintained 
    373 + 
    374  STABLE BRANCH 
    375  P:     Greg Kroah-Hartman 
    376  M:     greg@kroah.com 
  • trunk/target/linux/generic-2.6/patches-2.6.28/922-gpiommc.patch

    r13654 r14464  
    1 --- /dev/null 
    2 +++ b/drivers/mmc/host/gpiommc.c 
     1Index: linux-2.6.28.2/drivers/mmc/host/gpiommc.c 
     2=================================================================== 
     3--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     4+++ linux-2.6.28.2/drivers/mmc/host/gpiommc.c   2009-02-10 17:16:16.000000000 +0100 
    35@@ -0,0 +1,608 @@ 
    46+/* 
     
    1618+#include <linux/list.h> 
    1719+#include <linux/mutex.h> 
    18 +#include <linux/spi/spi_gpio.h> 
     20+#include <linux/spi/spi_gpio_old.h> 
    1921+#include <linux/configfs.h> 
    2022+#include <linux/gpio.h> 
     
    610612+} 
    611613+module_exit(gpiommc_modexit); 
    612 --- a/drivers/mmc/host/Kconfig 
    613 +++ b/drivers/mmc/host/Kconfig 
     614Index: linux-2.6.28.2/drivers/mmc/host/Kconfig 
     615=================================================================== 
     616--- linux-2.6.28.2.orig/drivers/mmc/host/Kconfig        2009-02-10 17:16:15.000000000 +0100 
     617+++ linux-2.6.28.2/drivers/mmc/host/Kconfig     2009-02-10 17:16:16.000000000 +0100 
    614618@@ -192,3 +192,28 @@ config MMC_TMIO 
    615619        help 
     
    641645+         This option automatically enables configfs support for gpiommc 
    642646+         if configfs is available. 
    643 --- a/drivers/mmc/host/Makefile 
    644 +++ b/drivers/mmc/host/Makefile 
     647Index: linux-2.6.28.2/drivers/mmc/host/Makefile 
     648=================================================================== 
     649--- linux-2.6.28.2.orig/drivers/mmc/host/Makefile       2009-02-10 17:16:15.000000000 +0100 
     650+++ linux-2.6.28.2/drivers/mmc/host/Makefile    2009-02-10 17:16:16.000000000 +0100 
    645651@@ -22,4 +22,5 @@ obj-$(CONFIG_MMC_SPI)         += mmc_spi.o 
    646652 obj-$(CONFIG_MMC_S3C)          += s3cmci.o 
     
    649655+obj-$(CONFIG_GPIOMMC)          += gpiommc.o 
    650656  
    651 --- /dev/null 
    652 +++ b/include/linux/mmc/gpiommc.h 
     657Index: linux-2.6.28.2/include/linux/mmc/gpiommc.h 
     658=================================================================== 
     659--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     660+++ linux-2.6.28.2/include/linux/mmc/gpiommc.h  2009-02-10 17:16:16.000000000 +0100 
    653661@@ -0,0 +1,71 @@ 
    654662+/* 
     
    723731+ 
    724732+#endif /* LINUX_GPIOMMC_H_ */ 
    725 --- /dev/null 
    726 +++ b/Documentation/gpiommc.txt 
     733Index: linux-2.6.28.2/Documentation/gpiommc.txt 
     734=================================================================== 
     735--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     736+++ linux-2.6.28.2/Documentation/gpiommc.txt    2009-02-10 17:16:16.000000000 +0100 
    727737@@ -0,0 +1,97 @@ 
    728738+GPIOMMC - Driver for an MMC/SD card on a bitbanging GPIO SPI bus 
     
    823833+There's no need to first unregister the device before removing it. That will 
    824834+be done automatically. 
    825 --- a/MAINTAINERS 
    826 +++ b/MAINTAINERS 
     835Index: linux-2.6.28.2/MAINTAINERS 
     836=================================================================== 
     837--- linux-2.6.28.2.orig/MAINTAINERS     2009-02-10 17:16:15.000000000 +0100 
     838+++ linux-2.6.28.2/MAINTAINERS  2009-02-10 17:16:16.000000000 +0100 
    827839@@ -1911,6 +1911,11 @@ W:       http://moinejf.free.fr 
    828840 L:     video4linux-list@redhat.com 
Note: See TracChangeset for help on using the changeset viewer.