diff options
| author | Luka Perkov <luka@openwrt.org> | 2012-06-05 00:43:56 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2012-06-05 00:43:56 +0000 |
| commit | 605012ad5d540dabd2d3f843e1e2a8d61241c724 (patch) | |
| tree | 9ab0bfddc9761a24bb62249be9c98af6c3636c2b /target/linux/kirkwood/patches | |
| parent | dc9e7207396bdb7cab49a6f58c1f7c8a28139a53 (diff) | |
| download | upstream-605012ad5d540dabd2d3f843e1e2a8d61241c724.tar.gz upstream-605012ad5d540dabd2d3f843e1e2a8d61241c724.tar.bz2 upstream-605012ad5d540dabd2d3f843e1e2a8d61241c724.zip | |
kirkwood: reorganize target
SVN-Revision: 32053
Diffstat (limited to 'target/linux/kirkwood/patches')
| -rw-r--r-- | target/linux/kirkwood/patches/000-boards.patch | 38 | ||||
| -rw-r--r-- | target/linux/kirkwood/patches/001-partition_map.patch | 11 | ||||
| -rw-r--r-- | target/linux/kirkwood/patches/002-mvsdio_delay.patch | 32 |
3 files changed, 81 insertions, 0 deletions
diff --git a/target/linux/kirkwood/patches/000-boards.patch b/target/linux/kirkwood/patches/000-boards.patch new file mode 100644 index 0000000000..4fe376e9bc --- /dev/null +++ b/target/linux/kirkwood/patches/000-boards.patch @@ -0,0 +1,38 @@ +--- a/arch/arm/mach-kirkwood/Makefile ++++ b/arch/arm/mach-kirkwood/Makefile +@@ -18,5 +18,8 @@ obj-$(CONFIG_MACH_D2NET_V2) += d2net_v2 + obj-$(CONFIG_MACH_NET2BIG_V2) += netxbig_v2-setup.o lacie_v2-common.o + obj-$(CONFIG_MACH_NET5BIG_V2) += netxbig_v2-setup.o lacie_v2-common.o + obj-$(CONFIG_MACH_T5325) += t5325-setup.o ++obj-$(CONFIG_MACH_ICONNECT) += iconnect-setup.o ++obj-$(CONFIG_MACH_NAS6210) += nas6210-setup.o ++obj-$(CONFIG_MACH_NSA310) += nsa-310-setup.o + + obj-$(CONFIG_CPU_IDLE) += cpuidle.o +--- a/arch/arm/mach-kirkwood/Kconfig ++++ b/arch/arm/mach-kirkwood/Kconfig +@@ -130,6 +130,24 @@ config MACH_T5325 + Say 'Y' here if you want your kernel to support the + HP t5325 Thin Client. + ++config MACH_ICONNECT ++ bool "Iomega iConnect Wireless" ++ help ++ Say 'Y' here if you want your kernel to support the ++ Iomega iConnect Wireless. ++ ++config MACH_NAS6210 ++ bool "RaidSonic ICY BOX IB-NAS6210" ++ help ++ Say 'Y' here if you want your kernel to support the ++ RaidSonic ICY BOX IB-NAS6210 device. ++ ++config MACH_NSA310 ++ bool "ZyXEL NSA-310" ++ help ++ Say 'Y' here if you want your kernel to support the ++ ZyXEL NSA-310 board. ++ + endmenu + + endif diff --git a/target/linux/kirkwood/patches/001-partition_map.patch b/target/linux/kirkwood/patches/001-partition_map.patch new file mode 100644 index 0000000000..0f94adc343 --- /dev/null +++ b/target/linux/kirkwood/patches/001-partition_map.patch @@ -0,0 +1,11 @@ +--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c ++++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c +@@ -33,7 +33,7 @@ static struct mtd_partition sheevaplug_n + .offset = MTDPART_OFS_NXTBLK, + .size = SZ_4M + }, { +- .name = "root", ++ .name = "rootfs", + .offset = MTDPART_OFS_NXTBLK, + .size = MTDPART_SIZ_FULL + }, diff --git a/target/linux/kirkwood/patches/002-mvsdio_delay.patch b/target/linux/kirkwood/patches/002-mvsdio_delay.patch new file mode 100644 index 0000000000..46e2a5646c --- /dev/null +++ b/target/linux/kirkwood/patches/002-mvsdio_delay.patch @@ -0,0 +1,32 @@ +--- a/drivers/mmc/core/sd.c ++++ b/drivers/mmc/core/sd.c +@@ -389,6 +389,15 @@ int mmc_sd_switch_hs(struct mmc_card *ca + return -ENOMEM; + } + ++ /* ++ * Some SDHC cards, notably those with a Sandisk SD controller ++ * (also found in Kingston products) need a bit of slack ++ * before successfully handling the SWITCH command. So far, ++ * cards identifying themselves as "SD04G" and "SD08G" are ++ * affected ++ */ ++ udelay(1000); ++ + err = mmc_sd_switch(card, 1, 0, 1, status); + if (err) + goto out; +--- a/drivers/mmc/core/core.c ++++ b/drivers/mmc/core/core.c +@@ -529,9 +529,9 @@ void mmc_set_data_timeout(struct mmc_dat + * The limit is really 250 ms, but that is + * insufficient for some crappy cards. + */ +- limit_us = 300000; ++ limit_us = 500000; + else +- limit_us = 100000; ++ limit_us = 200000; + + /* + * SDHC cards always use these fixed values. |