From: Hauke Mehrtens Date: Sat, 5 Jul 2014 23:36:05 +0000 (+0000) Subject: cns21xx: make patch apply again X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ce3fb94567876784ff0ac262f2aecf3433166962;p=openwrt%2Fstaging%2Flinusw.git cns21xx: make patch apply again Signed-off-by: Hauke Mehrtens SVN-Revision: 41522 --- 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