Changeset 13617


Ignore:
Timestamp:
2008-12-12T22:08:49+01:00 (9 years ago)
Author:
mb
Message:

moko: Fix patch so it applies properly. This fixes kernel boot due to other patches in the stack that weren't applied due to the failure.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/target/linux/s3c24xx/patches-2.6.26/0000-reverse-openwrt-patches-921-922-923.patch

    r13609 r13617  
    1 diff -ruN linux-2.6.26.orig/Documentation/gpiommc.txt linux-2.6.26/Documentation/gpiommc.txt 
    2 --- linux-2.6.26.orig/Documentation/gpiommc.txt 2008-10-24 21:04:46.000000000 +0200 
    3 +++ linux-2.6.26/Documentation/gpiommc.txt      1970-01-01 01:00:00.000000000 +0100 
     1Index: linux-2.6.26/Documentation/gpiommc.txt 
     2=================================================================== 
     3--- linux-2.6.26.orig/Documentation/gpiommc.txt 2008-12-12 21:55:07.000000000 +0100 
     4+++ /dev/null   1970-01-01 00:00:00.000000000 +0000 
    45@@ -1,97 +0,0 @@ 
    56-GPIOMMC - Driver for an MMC/SD card on a bitbanging GPIO SPI bus 
    … …  
    100101-There's no need to first unregister the device before removing it. That will 
    101102-be done automatically. 
    102 diff -ruN linux-2.6.26.orig/drivers/mmc/host/gpiommc.c linux-2.6.26/drivers/mmc/host/gpiommc.c 
    103 --- linux-2.6.26.orig/drivers/mmc/host/gpiommc.c        2008-10-24 21:04:46.000000000 +0200 
    104 +++ linux-2.6.26/drivers/mmc/host/gpiommc.c     1970-01-01 01:00:00.000000000 +0100 
    105 @@ -1,619 +0,0 @@ 
     103Index: linux-2.6.26/drivers/mmc/host/gpiommc.c 
     104=================================================================== 
     105--- linux-2.6.26.orig/drivers/mmc/host/gpiommc.c        2008-12-12 21:55:07.000000000 +0100 
     106+++ /dev/null   1970-01-01 00:00:00.000000000 +0000 
     107@@ -1,624 +0,0 @@ 
    106108-/* 
    107109- * Driver an MMC/SD card on a bitbanging GPIO SPI bus. 
    … …  
    114116- */ 
    115117- 
    116 -#include <linux/mmc/gpiommc.h> 
    117118-#include <linux/platform_device.h> 
    118119-#include <linux/list.h> 
    119120-#include <linux/mutex.h> 
     121-#include <linux/mmc/gpiommc.h> 
     122-#include <linux/mmc/host.h> 
    120123-#include <linux/spi/spi_gpio.h> 
     124-#include <linux/spi/mmc_spi.h> 
    121125-#include <linux/configfs.h> 
    122126-#include <linux/gpio.h> 
    … …  
    131135-       struct platform_device *spi_pdev; 
    132136-       struct spi_board_info boardinfo; 
     137-       struct mmc_spi_platform_data mmc_spi_data; 
    133138-}; 
    134139- 
    … …  
    152157-       bi->bus_num = master->bus_num; 
    153158-       bi->mode = pdata->mode; 
     159-       bi->platform_data = &d->mmc_spi_data; 
    154160- 
    155161-       return 0; 
    … …  
    181187-               goto error; 
    182188-       d->pdev = pdev; 
     189-       d->mmc_spi_data.ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34; 
    183190- 
    184191-       /* Create the SPI-GPIO device */ 
    … …  
    723730-} 
    724731-module_exit(gpiommc_modexit); 
    725 diff -ruN linux-2.6.26.orig/drivers/mmc/host/Kconfig linux-2.6.26/drivers/mmc/host/Kconfig 
    726 --- linux-2.6.26.orig/drivers/mmc/host/Kconfig  2008-10-24 21:04:46.000000000 +0200 
    727 +++ linux-2.6.26/drivers/mmc/host/Kconfig       2008-10-24 21:03:47.000000000 +0200 
    728 @@ -130,27 +130,3 @@ 
     732Index: linux-2.6.26/drivers/mmc/host/Kconfig 
     733=================================================================== 
     734--- linux-2.6.26.orig/drivers/mmc/host/Kconfig  2008-12-12 21:55:07.000000000 +0100 
     735+++ linux-2.6.26/drivers/mmc/host/Kconfig       2008-12-12 21:55:25.000000000 +0100 
     736@@ -130,27 +130,3 @@ config MMC_SPI 
    729737  
    730738          If unsure, or if your system has no SPI master driver, say N. 
    … …  
    754762-         This option automatically enables configfs support for gpiommc 
    755763-         if configfs is available. 
    756 diff -ruN linux-2.6.26.orig/drivers/mmc/host/Makefile linux-2.6.26/drivers/mmc/host/Makefile 
    757 --- linux-2.6.26.orig/drivers/mmc/host/Makefile 2008-10-24 21:04:46.000000000 +0200 
    758 +++ linux-2.6.26/drivers/mmc/host/Makefile      2008-10-24 21:03:47.000000000 +0200 
    759 @@ -17,4 +17,4 @@ 
     764Index: linux-2.6.26/drivers/mmc/host/Makefile 
     765=================================================================== 
     766--- linux-2.6.26.orig/drivers/mmc/host/Makefile 2008-12-12 21:55:07.000000000 +0100 
     767+++ linux-2.6.26/drivers/mmc/host/Makefile      2008-12-12 21:55:25.000000000 +0100 
     768@@ -17,4 +17,4 @@ obj-$(CONFIG_MMC_OMAP)                += omap.o 
    760769 obj-$(CONFIG_MMC_AT91)         += at91_mci.o 
    761770 obj-$(CONFIG_MMC_TIFM_SD)      += tifm_sd.o 
    … …  
    763772-obj-$(CONFIG_GPIOMMC)          += gpiommc.o 
    764773+ 
    765 diff -ruN linux-2.6.26.orig/drivers/spi/Kconfig linux-2.6.26/drivers/spi/Kconfig 
    766 --- linux-2.6.26.orig/drivers/spi/Kconfig       2008-10-24 21:04:46.000000000 +0200 
    767 +++ linux-2.6.26/drivers/spi/Kconfig    2008-10-24 21:03:47.000000000 +0200 
    768 @@ -100,19 +100,6 @@ 
     774Index: linux-2.6.26/drivers/spi/Kconfig 
     775=================================================================== 
     776--- linux-2.6.26.orig/drivers/spi/Kconfig       2008-12-12 21:55:07.000000000 +0100 
     777+++ linux-2.6.26/drivers/spi/Kconfig    2008-12-12 21:55:25.000000000 +0100 
     778@@ -100,19 +100,6 @@ config SPI_BUTTERFLY 
    769779          inexpensive battery powered microcontroller evaluation board. 
    770780          This same cable can be used to flash new firmware. 
    … …  
    786796        tristate "Freescale iMX SPI controller" 
    787797        depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL 
    788 diff -ruN linux-2.6.26.orig/drivers/spi/Makefile linux-2.6.26/drivers/spi/Makefile 
    789 --- linux-2.6.26.orig/drivers/spi/Makefile      2008-10-24 21:04:46.000000000 +0200 
    790 +++ linux-2.6.26/drivers/spi/Makefile   2008-10-24 21:03:47.000000000 +0200 
    791 @@ -16,7 +16,6 @@ 
     798Index: linux-2.6.26/drivers/spi/Makefile 
     799=================================================================== 
     800--- linux-2.6.26.orig/drivers/spi/Makefile      2008-12-12 21:55:07.000000000 +0100 
     801+++ linux-2.6.26/drivers/spi/Makefile   2008-12-12 21:55:25.000000000 +0100 
     802@@ -16,7 +16,6 @@ obj-$(CONFIG_SPI_BFIN)                        += spi_bfin5xx. 
    792803 obj-$(CONFIG_SPI_BITBANG)              += spi_bitbang.o 
    793804 obj-$(CONFIG_SPI_AU1550)               += au1550_spi.o 
    … …  
    797808 obj-$(CONFIG_SPI_LM70_LLP)             += spi_lm70llp.o 
    798809 obj-$(CONFIG_SPI_PXA2XX)               += pxa2xx_spi.o 
    799 diff -ruN linux-2.6.26.orig/drivers/spi/spi_gpio.c linux-2.6.26/drivers/spi/spi_gpio.c 
    800 --- linux-2.6.26.orig/drivers/spi/spi_gpio.c    2008-10-24 21:04:46.000000000 +0200 
    801 +++ linux-2.6.26/drivers/spi/spi_gpio.c 1970-01-01 01:00:00.000000000 +0100 
     810Index: linux-2.6.26/drivers/spi/spi_gpio.c 
     811=================================================================== 
     812--- linux-2.6.26.orig/drivers/spi/spi_gpio.c    2008-12-12 21:55:07.000000000 +0100 
     813+++ /dev/null   1970-01-01 00:00:00.000000000 +0000 
    802814@@ -1,251 +0,0 @@ 
    803815-/* 
    … …  
    10521064-MODULE_DESCRIPTION("Platform independent GPIO bitbanging SPI driver"); 
    10531065-MODULE_LICENSE("GPL v2"); 
    1054 diff -ruN linux-2.6.26.orig/include/linux/mmc/gpiommc.h linux-2.6.26/include/linux/mmc/gpiommc.h 
    1055 --- linux-2.6.26.orig/include/linux/mmc/gpiommc.h       2008-10-24 21:04:46.000000000 +0200 
    1056 +++ linux-2.6.26/include/linux/mmc/gpiommc.h    1970-01-01 01:00:00.000000000 +0100 
     1066Index: linux-2.6.26/include/linux/mmc/gpiommc.h 
     1067=================================================================== 
     1068--- linux-2.6.26.orig/include/linux/mmc/gpiommc.h       2008-12-12 21:55:07.000000000 +0100 
     1069+++ /dev/null   1970-01-01 00:00:00.000000000 +0000 
    10571070@@ -1,71 +0,0 @@ 
    10581071-/* 
    … …  
    11271140- 
    11281141-#endif /* LINUX_GPIOMMC_H_ */ 
    1129 diff -ruN linux-2.6.26.orig/include/linux/spi/spi_gpio.h linux-2.6.26/include/linux/spi/spi_gpio.h 
    1130 --- linux-2.6.26.orig/include/linux/spi/spi_gpio.h      2008-10-24 21:04:46.000000000 +0200 
    1131 +++ linux-2.6.26/include/linux/spi/spi_gpio.h   1970-01-01 01:00:00.000000000 +0100 
     1142Index: linux-2.6.26/include/linux/spi/spi_gpio.h 
     1143=================================================================== 
     1144--- linux-2.6.26.orig/include/linux/spi/spi_gpio.h      2008-12-12 21:55:07.000000000 +0100 
     1145+++ /dev/null   1970-01-01 00:00:00.000000000 +0000 
    11321146@@ -1,73 +0,0 @@ 
    11331147-/* 
    … …  
    12041218- 
    12051219-#endif /* _LINUX_SPI_SPI_GPIO */ 
    1206 diff -ruN linux-2.6.26.orig/MAINTAINERS linux-2.6.26/MAINTAINERS 
    1207 --- linux-2.6.26.orig/MAINTAINERS       2008-10-24 21:04:46.000000000 +0200 
    1208 +++ linux-2.6.26/MAINTAINERS    2008-10-24 21:04:02.000000000 +0200 
    1209 @@ -1818,11 +1818,6 @@ 
     1220Index: linux-2.6.26/MAINTAINERS 
     1221=================================================================== 
     1222--- linux-2.6.26.orig/MAINTAINERS       2008-12-12 21:55:07.000000000 +0100 
     1223+++ linux-2.6.26/MAINTAINERS    2008-12-12 21:55:25.000000000 +0100 
     1224@@ -1818,11 +1818,6 @@ L:       gigaset307x-common@lists.sourceforge. 
    12101225 W:     http://gigaset307x.sourceforge.net/ 
    12111226 S:     Maintained 
    … …  
    12191234 P:     Mark M. Hoffman 
    12201235 M:     mhoffman@lightlink.com 
    1221 @@ -3800,11 +3795,6 @@ 
     1236@@ -3800,11 +3795,6 @@ L:       cbe-oss-dev@ozlabs.org 
    12221237 W:     http://www.ibm.com/developerworks/power/cell/ 
    12231238 S:     Supported 
Note: See TracChangeset for help on using the changeset viewer.