aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2014-07-05 23:36:05 +0000
committerHauke Mehrtens <hauke@openwrt.org>2014-07-05 23:36:05 +0000
commite75942137969833c0deed6bbc02cc86108b4e602 (patch)
treef80316620edf6c5ae154e08b90975be013b634e9
parent3880f66db9c67d82d10fba02408265a8c207a1cd (diff)
downloadupstream-e75942137969833c0deed6bbc02cc86108b4e602.tar.gz
upstream-e75942137969833c0deed6bbc02cc86108b4e602.tar.bz2
upstream-e75942137969833c0deed6bbc02cc86108b4e602.zip
cns21xx: make patch apply again
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41522 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/cns21xx/patches-3.10/100-cns21xx-core.patch2
-rw-r--r--target/linux/cns21xx/patches-3.10/103-cns21xx-usb-ohci-support.patch6
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/cns21xx/patches-3.10/100-cns21xx-core.patch b/target/linux/cns21xx/patches-3.10/100-cns21xx-core.patch
index 72002457d7..e127c50c70 100644
--- a/target/linux/cns21xx/patches-3.10/100-cns21xx-core.patch
+++ b/target/linux/cns21xx/patches-3.10/100-cns21xx-core.patch
@@ -1485,7 +1485,7 @@
+}
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
-@@ -904,6 +904,7 @@ config ARM_L1_CACHE_SHIFT_6
+@@ -903,6 +903,7 @@ config ARM_L1_CACHE_SHIFT_6
config ARM_L1_CACHE_SHIFT
int
default 6 if ARM_L1_CACHE_SHIFT_6
diff --git a/target/linux/cns21xx/patches-3.10/103-cns21xx-usb-ohci-support.patch b/target/linux/cns21xx/patches-3.10/103-cns21xx-usb-ohci-support.patch
index db4fecac8c..ee81610ac8 100644
--- a/target/linux/cns21xx/patches-3.10/103-cns21xx-usb-ohci-support.patch
+++ b/target/linux/cns21xx/patches-3.10/103-cns21xx-usb-ohci-support.patch
@@ -245,14 +245,14 @@
+MODULE_ALIAS("platform:" DRIVER_NAME);
--- a/drivers/usb/host/ohci.h
+++ b/drivers/usb/host/ohci.h
-@@ -405,6 +405,7 @@ struct ohci_hcd {
- #define OHCI_QUIRK_HUB_POWER 0x100 /* distrust firmware power/oc setup */
+@@ -406,6 +406,7 @@ struct ohci_hcd {
#define OHCI_QUIRK_AMD_PLL 0x200 /* AMD PLL quirk*/
#define OHCI_QUIRK_AMD_PREFETCH 0x400 /* pre-fetch for ISO transfer */
+ #define OHCI_QUIRK_GLOBAL_SUSPEND 0x800 /* must suspend ports */
+#define OHCI_QUIRK_INIT_FMINTERVAL 0x1000 /* fminterval must be initialized */
+
// there are also chip quirks/bugs in init logic
- struct work_struct nec_work; /* Worker for NEC quirk */
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -374,6 +374,7 @@ config ARCH_CNS21XX