aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/xburst
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2010-10-04 07:42:32 +0000
committerLars-Peter Clausen <lars@metafoo.de>2010-10-04 07:42:32 +0000
commit83d6a3601914362a23286864a12e3ed6b37368f5 (patch)
tree95844a9f6352079210671b7f02f1455cdba0eade /target/linux/xburst
parent0fda5f750739ac512b6522575ab3fd6b257af387 (diff)
downloadupstream-83d6a3601914362a23286864a12e3ed6b37368f5.tar.gz
upstream-83d6a3601914362a23286864a12e3ed6b37368f5.tar.bz2
upstream-83d6a3601914362a23286864a12e3ed6b37368f5.zip
update 2.6.35.x to 2.6.35.7
SVN-Revision: 23213
Diffstat (limited to 'target/linux/xburst')
-rw-r--r--target/linux/xburst/Makefile2
-rw-r--r--target/linux/xburst/patches-2.6.35/054-mmc.patch19
2 files changed, 4 insertions, 17 deletions
diff --git a/target/linux/xburst/Makefile b/target/linux/xburst/Makefile
index 3bb255f13c..d732bf5c02 100644
--- a/target/linux/xburst/Makefile
+++ b/target/linux/xburst/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Ingenic XBurst
FEATURES:=jffs2 targz ubifs audio
SUBTARGETS:=qi_lb60 n516 n526 id800wt
-LINUX_VERSION:=2.6.35.4
+LINUX_VERSION:=2.6.35.7
DEVICE_TYPE=other
diff --git a/target/linux/xburst/patches-2.6.35/054-mmc.patch b/target/linux/xburst/patches-2.6.35/054-mmc.patch
index 74ab97308f..1a07655869 100644
--- a/target/linux/xburst/patches-2.6.35/054-mmc.patch
+++ b/target/linux/xburst/patches-2.6.35/054-mmc.patch
@@ -21,9 +21,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
create mode 100644 arch/mips/include/asm/mach-jz4740/jz4740_mmc.h
create mode 100644 drivers/mmc/host/jz4740_mmc.c
-diff --git a/arch/mips/include/asm/mach-jz4740/jz4740_mmc.h b/arch/mips/include/asm/mach-jz4740/jz4740_mmc.h
-new file mode 100644
-index 0000000..8543f43
--- /dev/null
+++ b/arch/mips/include/asm/mach-jz4740/jz4740_mmc.h
@@ -0,0 +1,15 @@
@@ -42,11 +39,9 @@ index 0000000..8543f43
+};
+
+#endif
-diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
-index f06d06e..d25e22c 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
-@@ -432,3 +432,12 @@ config MMC_SH_MMCIF
+@@ -457,3 +457,12 @@ config MMC_SH_MMCIF
This selects the MMC Host Interface controler (MMCIF).
This driver supports MMCIF in sh7724/sh7757/sh7372.
@@ -59,21 +54,16 @@ index f06d06e..d25e22c 100644
+ SoCs.
+ If you have a board based on such a SoC and with a SD/MMC slot,
+ say Y or M here.
-diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
-index e30c2ee..f4e53c9 100644
--- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
-@@ -36,6 +36,7 @@ obj-$(CONFIG_MMC_CB710) += cb710-mmc.o
- obj-$(CONFIG_MMC_VIA_SDMMC) += via-sdmmc.o
+@@ -37,6 +37,7 @@ obj-$(CONFIG_MMC_VIA_SDMMC) += via-sdmmc
+ obj-$(CONFIG_GPIOMMC) += gpiommc.o
obj-$(CONFIG_SDH_BFIN) += bfin_sdh.o
obj-$(CONFIG_MMC_SH_MMCIF) += sh_mmcif.o
+obj-$(CONFIG_MMC_JZ4740) += jz4740_mmc.o
obj-$(CONFIG_MMC_SDHCI_OF) += sdhci-of.o
sdhci-of-y := sdhci-of-core.o
-diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c
-new file mode 100644
-index 0000000..ad4f987
--- /dev/null
+++ b/drivers/mmc/host/jz4740_mmc.c
@@ -0,0 +1,1029 @@
@@ -1106,6 +1096,3 @@ index 0000000..ad4f987
+MODULE_DESCRIPTION("JZ4740 SD/MMC controller driver");
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
---
-1.5.6.5
-