Resneptacle/openwrt-cghmn-mt300n
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kernel: update 3.10 to 3.10.2

Browse Source 
Also refresh 3.10 patches.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 37502
This commit is contained in:
Gabor Juhos 2013-07-22 15:31:13 +00:00
parent 6a5b4ec7dc
commit ef944dcb85
100 changed files with 714 additions and 1289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-version.mk
View File

@ -17,8 +17,8 @@ endif
ifeq ($(LINUX_VERSION),3.9.11) ifeq ($(LINUX_VERSION),3.9.11)
LINUX_KERNEL_MD5SUM:=edbf88eb7f7d34dbd5d3887726790755 LINUX_KERNEL_MD5SUM:=edbf88eb7f7d34dbd5d3887726790755
endif endif
ifeq ($(LINUX_VERSION),3.10.1) ifeq ($(LINUX_VERSION),3.10.2)
LINUX_KERNEL_MD5SUM:=4c8ed240943c8750a89cc307637bd74d LINUX_KERNEL_MD5SUM:=06d6bf3218c8f37d6320473b93382fe2
endif endif
# disable the md5sum check for unknown kernel versions # disable the md5sum check for unknown kernel versions

2
target/linux/ar71xx/Makefile
View File

@ -13,7 +13,7 @@ FEATURES:=squashfs targz mips16
CFLAGS:=-Os -pipe -mips32r2 -mtune=34kc -fno-caller-saves -mno-branch-likely CFLAGS:=-Os -pipe -mips32r2 -mtune=34kc -fno-caller-saves -mno-branch-likely
SUBTARGETS:=generic nand SUBTARGETS:=generic nand
LINUX_VERSION:=3.10.1 LINUX_VERSION:=3.10.2
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

2
target/linux/ar71xx/patches-3.10/430-drivers-link-spi-before-mtd.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/Makefile --- a/drivers/Makefile
+++ b/drivers/Makefile +++ b/drivers/Makefile
@@ -63,8 +63,8 @@ obj-$(CONFIG_IDE) += ide/ @@ -62,8 +62,8 @@ obj-$(CONFIG_IDE) += ide/
obj-$(CONFIG_SCSI) += scsi/ obj-$(CONFIG_SCSI) += scsi/
obj-$(CONFIG_ATA) += ata/ obj-$(CONFIG_ATA) += ata/
obj-$(CONFIG_TARGET_CORE) += target/ obj-$(CONFIG_TARGET_CORE) += target/

2
target/linux/bcm53xx/Makefile
View File

@ -12,7 +12,7 @@ BOARDNAME:=Broadcom BCM47xx/53xx with ARM CPU
FEATURES:=squashfs usb pci pcie gpio FEATURES:=squashfs usb pci pcie gpio
MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de> MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de>
LINUX_VERSION:=3.10.1 LINUX_VERSION:=3.10.2
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

2
target/linux/bcm53xx/patches-3.10/0011-bcma-make-it-possible-to-select-SoC-support-without-.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
--- a/drivers/bcma/Kconfig --- a/drivers/bcma/Kconfig
+++ b/drivers/bcma/Kconfig +++ b/drivers/bcma/Kconfig
@@ -35,8 +35,14 @@ config BCMA_DRIVER_PCI_HOSTMODE @@ -36,8 +36,14 @@ config BCMA_DRIVER_PCI_HOSTMODE
PCI core hostmode operation (external PCI bus). PCI core hostmode operation (external PCI bus).
config BCMA_HOST_SOC config BCMA_HOST_SOC

2
target/linux/bcm53xx/patches-3.10/0013-bcma-add-constants-for-new-ARM-based-SoCs.patch
View File

@ -12,7 +12,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
--- a/include/linux/bcma/bcma.h --- a/include/linux/bcma/bcma.h
+++ b/include/linux/bcma/bcma.h +++ b/include/linux/bcma/bcma.h
@@ -188,6 +188,11 @@ struct bcma_host_ops { @@ -189,6 +189,11 @@ struct bcma_host_ops {
#define BCMA_PKG_ID_BCM5357 11 #define BCMA_PKG_ID_BCM5357 11
#define BCMA_CHIP_ID_BCM53572 53572 #define BCMA_CHIP_ID_BCM53572 53572
#define BCMA_PKG_ID_BCM47188 9 #define BCMA_PKG_ID_BCM47188 9

2
target/linux/bcm53xx/patches-3.10/0014-bcma-return-correct-error-code-when-bus-can-failed.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
--- a/drivers/bcma/main.c --- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c +++ b/drivers/bcma/main.c
@@ -218,7 +218,7 @@ int bcma_bus_register(struct bcma_bus *b @@ -237,7 +237,7 @@ int bcma_bus_register(struct bcma_bus *b
err = bcma_bus_scan(bus); err = bcma_bus_scan(bus);
if (err) { if (err) {
bcma_err(bus, "Failed to scan: %d\n", err); bcma_err(bus, "Failed to scan: %d\n", err);

2
target/linux/brcm2708/Makefile
View File

@ -13,7 +13,7 @@ BOARDNAME:=Broadcom BCM2708/BCM2835
FEATURES:=ext4 audio usb usbgadget display gpio FEATURES:=ext4 audio usb usbgadget display gpio
MAINTAINER:=Florian Fainelli <florian@openwrt.org> MAINTAINER:=Florian Fainelli <florian@openwrt.org>
LINUX_VERSION:=3.10.1 LINUX_VERSION:=3.10.2
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += brcm2708-gpu-fw kmod-usb-hid kmod-sound-core kmod-sound-arm-bcm2835 DEFAULT_PACKAGES += brcm2708-gpu-fw kmod-usb-hid kmod-sound-core kmod-sound-arm-bcm2835

342
target/linux/brcm2708/patches-3.10/001-Add-dwc_otg-driver.patch
View File

@ -1,7 +1,6 @@
diff -urN linux-3.10/drivers/usb/core/generic.c linux-rpi-3.10.y/drivers/usb/core/generic.c --- a/drivers/usb/core/generic.c
--- linux-3.10/drivers/usb/core/generic.c 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/usb/core/generic.c
+++ linux-rpi-3.10.y/drivers/usb/core/generic.c 2013-07-06 15:25:50.000000000 +0100 @@ -152,6 +152,7 @@ int usb_choose_configuration(struct usb_
@@ -152,6 +152,7 @@
dev_warn(&udev->dev, dev_warn(&udev->dev,
"no configuration chosen from %d choice%s\n", "no configuration chosen from %d choice%s\n",
num_configs, plural(num_configs)); num_configs, plural(num_configs));
@ -9,10 +8,9 @@ diff -urN linux-3.10/drivers/usb/core/generic.c linux-rpi-3.10.y/drivers/usb/cor
} }
return i; return i;
} }
diff -urN linux-3.10/drivers/usb/core/message.c linux-rpi-3.10.y/drivers/usb/core/message.c --- a/drivers/usb/core/message.c
--- linux-3.10/drivers/usb/core/message.c 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/usb/core/message.c
+++ linux-rpi-3.10.y/drivers/usb/core/message.c 2013-07-06 15:25:50.000000000 +0100 @@ -1875,6 +1875,85 @@ free_interfaces:
@@ -1875,6 +1875,85 @@
if (cp->string == NULL && if (cp->string == NULL &&
!(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS)) !(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS))
cp->string = usb_cache_string(dev, cp->desc.iConfiguration); cp->string = usb_cache_string(dev, cp->desc.iConfiguration);
@ -98,9 +96,8 @@ diff -urN linux-3.10/drivers/usb/core/message.c linux-rpi-3.10.y/drivers/usb/cor
/* Now that the interfaces are installed, re-enable LPM. */ /* Now that the interfaces are installed, re-enable LPM. */
usb_unlocked_enable_lpm(dev); usb_unlocked_enable_lpm(dev);
diff -urN linux-3.10/drivers/usb/core/otg_whitelist.h linux-rpi-3.10.y/drivers/usb/core/otg_whitelist.h --- a/drivers/usb/core/otg_whitelist.h
--- linux-3.10/drivers/usb/core/otg_whitelist.h 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/usb/core/otg_whitelist.h
+++ linux-rpi-3.10.y/drivers/usb/core/otg_whitelist.h 2013-07-06 15:25:50.000000000 +0100
@@ -19,33 +19,82 @@ @@ -19,33 +19,82 @@
static struct usb_device_id whitelist_table [] = { static struct usb_device_id whitelist_table [] = {
@ -190,7 +187,7 @@ diff -urN linux-3.10/drivers/usb/core/otg_whitelist.h linux-rpi-3.10.y/drivers/u
static int is_targeted(struct usb_device *dev) static int is_targeted(struct usb_device *dev)
{ {
struct usb_device_id *id = whitelist_table; struct usb_device_id *id = whitelist_table;
@@ -55,58 +104,83 @@ @@ -55,58 +104,83 @@ static int is_targeted(struct usb_device
return 1; return 1;
/* HNP test device is _never_ targeted (see OTG spec 6.6.6) */ /* HNP test device is _never_ targeted (see OTG spec 6.6.6) */
@ -316,9 +313,8 @@ diff -urN linux-3.10/drivers/usb/core/otg_whitelist.h linux-rpi-3.10.y/drivers/u
#endif #endif
} }
diff -urN linux-3.10/drivers/usb/gadget/file_storage.c linux-rpi-3.10.y/drivers/usb/gadget/file_storage.c --- /dev/null
--- linux-3.10/drivers/usb/gadget/file_storage.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/gadget/file_storage.c
+++ linux-rpi-3.10.y/drivers/usb/gadget/file_storage.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,3676 @@ @@ -0,0 +1,3676 @@
+/* +/*
+ * file_storage.c -- File-backed USB Storage Gadget, for USB development + * file_storage.c -- File-backed USB Storage Gadget, for USB development
@ -3996,9 +3992,8 @@ diff -urN linux-3.10/drivers/usb/gadget/file_storage.c linux-rpi-3.10.y/drivers/
+ kref_put(&fsg->ref, fsg_release); + kref_put(&fsg->ref, fsg_release);
+} +}
+module_exit(fsg_cleanup); +module_exit(fsg_cleanup);
diff -urN linux-3.10/drivers/usb/host/dwc_common_port/changes.txt linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/changes.txt --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_common_port/changes.txt 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_common_port/changes.txt
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/changes.txt 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,174 @@ @@ -0,0 +1,174 @@
+ +
+dwc_read_reg32() and friends now take an additional parameter, a pointer to an +dwc_read_reg32() and friends now take an additional parameter, a pointer to an
@ -4174,9 +4169,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_common_port/changes.txt linux-rpi-3.10
+A DWC_LIBMODULE #define has also been added. If this is not defined, then the +A DWC_LIBMODULE #define has also been added. If this is not defined, then the
+module code in dwc_common_linux.c is not compiled in. This allows linking the +module code in dwc_common_linux.c is not compiled in. This allows linking the
+library code directly into a driver module, instead of as a standalone module. +library code directly into a driver module, instead of as a standalone module.
diff -urN linux-3.10/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/doc/doxygen.cfg --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_common_port/doc/doxygen.cfg
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/doc/doxygen.cfg 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,270 @@ @@ -0,0 +1,270 @@
+# Doxyfile 1.4.5 +# Doxyfile 1.4.5
+ +
@ -4448,9 +4442,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_common_port/doc/doxygen.cfg linux-rpi-
+# Configuration::additions related to the search engine +# Configuration::additions related to the search engine
+#--------------------------------------------------------------------------- +#---------------------------------------------------------------------------
+SEARCHENGINE = NO +SEARCHENGINE = NO
diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_cc.c linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_cc.c --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_common_port/dwc_cc.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_common_port/dwc_cc.c
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_cc.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,532 @@ @@ -0,0 +1,532 @@
+/* ========================================================================= +/* =========================================================================
+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.c $ + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.c $
@ -4984,9 +4977,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_cc.c linux-rpi-3.10.y/
+} +}
+ +
+#endif /* DWC_CCLIB */ +#endif /* DWC_CCLIB */
diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_cc.h linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_cc.h --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_common_port/dwc_cc.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_common_port/dwc_cc.h
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_cc.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,225 @@ @@ -0,0 +1,225 @@
+/* ========================================================================= +/* =========================================================================
+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.h $ + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_cc.h $
@ -5213,9 +5205,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_cc.h linux-rpi-3.10.y/
+ +
+#endif /* _DWC_CC_H_ */ +#endif /* _DWC_CC_H_ */
+ +
diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,1308 @@ @@ -0,0 +1,1308 @@
+#include "dwc_os.h" +#include "dwc_os.h"
+#include "dwc_list.h" +#include "dwc_list.h"
@ -6525,9 +6516,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c linux-rp
+{ +{
+ return wq->pending; + return wq->pending;
+} +}
diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_common_linux.c --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_common_port/dwc_common_linux.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_common_port/dwc_common_linux.c
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_common_linux.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,1426 @@ @@ -0,0 +1,1426 @@
+#include <linux/kernel.h> +#include <linux/kernel.h>
+#include <linux/init.h> +#include <linux/init.h>
@ -7955,9 +7945,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_common_linux.c linux-r
+MODULE_LICENSE ("GPL"); +MODULE_LICENSE ("GPL");
+ +
+#endif /* DWC_LIBMODULE */ +#endif /* DWC_LIBMODULE */
diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,1275 @@ @@ -0,0 +1,1275 @@
+#include "dwc_os.h" +#include "dwc_os.h"
+#include "dwc_list.h" +#include "dwc_list.h"
@ -9234,9 +9223,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c linux-rp
+{ +{
+ return wq->pending; + return wq->pending;
+} +}
diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_crypto.c --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_common_port/dwc_crypto.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_common_port/dwc_crypto.c
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_crypto.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,308 @@ @@ -0,0 +1,308 @@
+/* ========================================================================= +/* =========================================================================
+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.c $ + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.c $
@ -9546,9 +9534,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_crypto.c linux-rpi-3.1
+} +}
+ +
+#endif /* DWC_CRYPTOLIB */ +#endif /* DWC_CRYPTOLIB */
diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_crypto.h --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_common_port/dwc_crypto.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_common_port/dwc_crypto.h
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_crypto.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,111 @@ @@ -0,0 +1,111 @@
+/* ========================================================================= +/* =========================================================================
+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.h $ + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_crypto.h $
@ -9661,9 +9648,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_crypto.h linux-rpi-3.1
+#endif +#endif
+ +
+#endif /* _DWC_CRYPTO_H_ */ +#endif /* _DWC_CRYPTO_H_ */
diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_dh.c linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_dh.c --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_common_port/dwc_dh.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_common_port/dwc_dh.c
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_dh.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,291 @@ @@ -0,0 +1,291 @@
+/* ========================================================================= +/* =========================================================================
+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.c $ + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.c $
@ -9956,9 +9942,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_dh.c linux-rpi-3.10.y/
+#endif /* !CONFIG_MACH_IPMATE */ +#endif /* !CONFIG_MACH_IPMATE */
+ +
+#endif /* DWC_CRYPTOLIB */ +#endif /* DWC_CRYPTOLIB */
diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_dh.h linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_dh.h --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_common_port/dwc_dh.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_common_port/dwc_dh.h
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_dh.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,106 @@ @@ -0,0 +1,106 @@
+/* ========================================================================= +/* =========================================================================
+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.h $ + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_dh.h $
@ -10066,9 +10051,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_dh.h linux-rpi-3.10.y/
+#endif +#endif
+ +
+#endif /* _DWC_DH_H_ */ +#endif /* _DWC_DH_H_ */
diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_list.h linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_list.h --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_common_port/dwc_list.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_common_port/dwc_list.h
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_list.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,594 @@ @@ -0,0 +1,594 @@
+/* $OpenBSD: queue.h,v 1.26 2004/05/04 16:59:32 grange Exp $ */ +/* $OpenBSD: queue.h,v 1.26 2004/05/04 16:59:32 grange Exp $ */
+/* $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $ */ +/* $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $ */
@ -10664,9 +10648,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_list.h linux-rpi-3.10.
+#endif +#endif
+ +
+#endif /* _DWC_LIST_H_ */ +#endif /* _DWC_LIST_H_ */
diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_mem.c linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_mem.c --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_common_port/dwc_mem.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_common_port/dwc_mem.c
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_mem.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,245 @@ @@ -0,0 +1,245 @@
+/* Memory Debugging */ +/* Memory Debugging */
+#ifdef DWC_DEBUG_MEMORY +#ifdef DWC_DEBUG_MEMORY
@ -10913,9 +10896,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_mem.c linux-rpi-3.10.y
+} +}
+ +
+#endif /* DWC_DEBUG_MEMORY */ +#endif /* DWC_DEBUG_MEMORY */
diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_modpow.c --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_common_port/dwc_modpow.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_common_port/dwc_modpow.c
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_modpow.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,636 @@ @@ -0,0 +1,636 @@
+/* Bignum routines adapted from PUTTY sources. PuTTY copyright notice follows. +/* Bignum routines adapted from PUTTY sources. PuTTY copyright notice follows.
+ * + *
@ -11553,9 +11535,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_modpow.c linux-rpi-3.1
+#endif /* CONFIG_MACH_IPMATE */ +#endif /* CONFIG_MACH_IPMATE */
+ +
+#endif /*DWC_CRYPTOLIB */ +#endif /*DWC_CRYPTOLIB */
diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_modpow.h --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_common_port/dwc_modpow.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_common_port/dwc_modpow.h
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_modpow.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,34 @@ @@ -0,0 +1,34 @@
+/* +/*
+ * dwc_modpow.h + * dwc_modpow.h
@ -11591,9 +11572,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_modpow.h linux-rpi-3.1
+#endif +#endif
+ +
+#endif /* _LINUX_BIGNUM_H */ +#endif /* _LINUX_BIGNUM_H */
diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_notifier.c --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_common_port/dwc_notifier.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_common_port/dwc_notifier.c
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_notifier.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,319 @@ @@ -0,0 +1,319 @@
+#ifdef DWC_NOTIFYLIB +#ifdef DWC_NOTIFYLIB
+ +
@ -11914,9 +11894,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_notifier.c linux-rpi-3
+} +}
+ +
+#endif /* DWC_NOTIFYLIB */ +#endif /* DWC_NOTIFYLIB */
diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_notifier.h --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_common_port/dwc_notifier.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_common_port/dwc_notifier.h
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_notifier.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,122 @@ @@ -0,0 +1,122 @@
+ +
+#ifndef __DWC_NOTIFIER_H__ +#ifndef __DWC_NOTIFIER_H__
@ -12040,9 +12019,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_notifier.h linux-rpi-3
+#endif +#endif
+ +
+#endif /* __DWC_NOTIFIER_H__ */ +#endif /* __DWC_NOTIFIER_H__ */
diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_os.h linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_os.h --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_common_port/dwc_os.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_common_port/dwc_os.h
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/dwc_os.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,1262 @@ @@ -0,0 +1,1262 @@
+/* ========================================================================= +/* =========================================================================
+ * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_os.h $ + * $File: //dwh/usb_iip/dev/software/dwc_common_port_2/dwc_os.h $
@ -13306,9 +13284,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_common_port/dwc_os.h linux-rpi-3.10.y/
+#endif +#endif
+ +
+#endif /* _DWC_OS_H_ */ +#endif /* _DWC_OS_H_ */
diff -urN linux-3.10/drivers/usb/host/dwc_common_port/Makefile linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/Makefile --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_common_port/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_common_port/Makefile
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/Makefile 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,58 @@ @@ -0,0 +1,58 @@
+# +#
+# Makefile for DWC_common library +# Makefile for DWC_common library
@ -13368,9 +13345,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_common_port/Makefile linux-rpi-3.10.y/
+ +
+clean: +clean:
+ rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/ + rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/
diff -urN linux-3.10/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/Makefile.fbsd --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_common_port/Makefile.fbsd 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_common_port/Makefile.fbsd
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/Makefile.fbsd 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,17 @@ @@ -0,0 +1,17 @@
+CFLAGS += -I/sys/i386/compile/GENERIC -I/sys/i386/include -I/usr/include +CFLAGS += -I/sys/i386/compile/GENERIC -I/sys/i386/include -I/usr/include
+CFLAGS += -DDWC_FREEBSD +CFLAGS += -DDWC_FREEBSD
@ -13389,9 +13365,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_common_port/Makefile.fbsd linux-rpi-3.
+ dwc_common_fbsd.c dwc_mem.c + dwc_common_fbsd.c dwc_mem.c
+ +
+.include <bsd.kmod.mk> +.include <bsd.kmod.mk>
diff -urN linux-3.10/drivers/usb/host/dwc_common_port/Makefile.linux linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/Makefile.linux --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_common_port/Makefile.linux 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_common_port/Makefile.linux
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/Makefile.linux 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,49 @@ @@ -0,0 +1,49 @@
+# +#
+# Makefile for DWC_common library +# Makefile for DWC_common library
@ -13442,9 +13417,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_common_port/Makefile.linux linux-rpi-3
+ +
+clean: +clean:
+ rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/ + rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/
diff -urN linux-3.10/drivers/usb/host/dwc_common_port/usb.h linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/usb.h --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_common_port/usb.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_common_port/usb.h
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_common_port/usb.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,946 @@ @@ -0,0 +1,946 @@
+/* +/*
+ * Copyright (c) 1998 The NetBSD Foundation, Inc. + * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -14392,9 +14366,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_common_port/usb.h linux-rpi-3.10.y/dri
+#endif +#endif
+ +
+#endif /* _USB_H_ */ +#endif /* _USB_H_ */
diff -urN linux-3.10/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-rpi-3.10.y/drivers/usb/host/dwc_otg/doc/doxygen.cfg --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/doc/doxygen.cfg 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/doc/doxygen.cfg
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/doc/doxygen.cfg 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,224 @@ @@ -0,0 +1,224 @@
+# Doxyfile 1.3.9.1 +# Doxyfile 1.3.9.1
+ +
@ -14620,9 +14593,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/doc/doxygen.cfg linux-rpi-3.10.y/d
+# Configuration::additions related to the search engine +# Configuration::additions related to the search engine
+#--------------------------------------------------------------------------- +#---------------------------------------------------------------------------
+SEARCHENGINE = NO +SEARCHENGINE = NO
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dummy_audio.c linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dummy_audio.c --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dummy_audio.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dummy_audio.c
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dummy_audio.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,1575 @@ @@ -0,0 +1,1575 @@
+/* +/*
+ * zero.c -- Gadget Zero, for USB development + * zero.c -- Gadget Zero, for USB development
@ -16199,9 +16171,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dummy_audio.c linux-rpi-3.10.y/dri
+ remove_proc_entry("isoc_test", NULL); + remove_proc_entry("isoc_test", NULL);
+} +}
+module_exit (cleanup); +module_exit (cleanup);
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_cfi_common.h --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_cfi_common.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_cfi_common.h
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_cfi_common.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,142 @@ @@ -0,0 +1,142 @@
+/* ========================================================================== +/* ==========================================================================
+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
@ -16345,9 +16316,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_cfi_common.h linux-rpi-3.10.y/
+typedef struct cfi_string cfi_string_t; +typedef struct cfi_string cfi_string_t;
+ +
+#endif +#endif
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_adp.c --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_adp.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_adp.c
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_adp.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,854 @@ @@ -0,0 +1,854 @@
+/* ========================================================================== +/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.c $ + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.c $
@ -17203,9 +17173,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_adp.c linux-rpi-3.10.y/dri
+#endif +#endif
+ return 1; + return 1;
+} +}
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_adp.h --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_adp.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_adp.h
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_adp.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,80 @@ @@ -0,0 +1,80 @@
+/* ========================================================================== +/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.h $ + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_adp.h $
@ -17287,9 +17256,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_adp.h linux-rpi-3.10.y/dri
+extern int32_t dwc_otg_adp_handle_srp_intr(dwc_otg_core_if_t * core_if); +extern int32_t dwc_otg_adp_handle_srp_intr(dwc_otg_core_if_t * core_if);
+ +
+#endif //__DWC_OTG_ADP_H__ +#endif //__DWC_OTG_ADP_H__
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_attr.c --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_attr.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_attr.c
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_attr.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,1210 @@ @@ -0,0 +1,1210 @@
+/* ========================================================================== +/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.c $ + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.c $
@ -18501,9 +18469,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_attr.c linux-rpi-3.10.y/dr
+ device_remove_file(&dev->dev, &dev_attr_sleep_status); + device_remove_file(&dev->dev, &dev_attr_sleep_status);
+#endif +#endif
+} +}
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_attr.h --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_attr.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_attr.h
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_attr.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,89 @@ @@ -0,0 +1,89 @@
+/* ========================================================================== +/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.h $ + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_attr.h $
@ -18594,9 +18561,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_attr.h linux-rpi-3.10.y/dr
+#endif +#endif
+ ); + );
+#endif +#endif
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.c --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_cfi.c
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,1876 @@ @@ -0,0 +1,1876 @@
+/* ========================================================================== +/* ==========================================================================
+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
@ -20474,9 +20440,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_cfi.c linux-rpi-3.10.y/dri
+} +}
+ +
+#endif //DWC_UTE_CFI +#endif //DWC_UTE_CFI
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.h --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_cfi.h
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_cfi.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,320 @@ @@ -0,0 +1,320 @@
+/* ========================================================================== +/* ==========================================================================
+ * Synopsys HS OTG Linux Software Driver and documentation (hereinafter, + * Synopsys HS OTG Linux Software Driver and documentation (hereinafter,
@ -20798,9 +20763,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_cfi.h linux-rpi-3.10.y/dri
+int cfi_setup(struct dwc_otg_pcd *pcd, struct cfi_usb_ctrlrequest *ctrl); +int cfi_setup(struct dwc_otg_pcd *pcd, struct cfi_usb_ctrlrequest *ctrl);
+ +
+#endif /* (__DWC_OTG_CFI_H__) */ +#endif /* (__DWC_OTG_CFI_H__) */
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_cil.c --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_cil.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_cil.c
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_cil.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,7151 @@ @@ -0,0 +1,7151 @@
+/* ========================================================================== +/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.c $ + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.c $
@ -27953,9 +27917,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_cil.c linux-rpi-3.10.y/dri
+ dwc_otg_pcd_start_srp_timer(core_if); + dwc_otg_pcd_start_srp_timer(core_if);
+ return; + return;
+} +}
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_cil.h --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_cil.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_cil.h
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_cil.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,1464 @@ @@ -0,0 +1,1464 @@
+/* ========================================================================== +/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.h $ + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil.h $
@ -29421,9 +29384,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_cil.h linux-rpi-3.10.y/dri
+////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////
+ +
+#endif +#endif
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,1571 @@ @@ -0,0 +1,1571 @@
+/* ========================================================================== +/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil_intr.c $ + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_cil_intr.c $
@ -30996,9 +30958,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c linux-rpi-3.10.
+ +
+ return retval; + return retval;
+} +}
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_core_if.h --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_core_if.h
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_core_if.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,705 @@ @@ -0,0 +1,705 @@
+/* ========================================================================== +/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_core_if.h $ + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_core_if.h $
@ -31705,9 +31666,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_core_if.h linux-rpi-3.10.y
+/** @} */ +/** @} */
+ +
+#endif /* __DWC_CORE_IF_H__ */ +#endif /* __DWC_CORE_IF_H__ */
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_dbg.h --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_dbg.h
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_dbg.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,117 @@ @@ -0,0 +1,117 @@
+/* ========================================================================== +/* ==========================================================================
+ * + *
@ -31826,9 +31786,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_dbg.h linux-rpi-3.10.y/dri
+ +
+#endif /*DEBUG*/ +#endif /*DEBUG*/
+#endif +#endif
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_driver.c --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_driver.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_driver.c
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_driver.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,1732 @@ @@ -0,0 +1,1732 @@
+/* ========================================================================== +/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.c $ + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.c $
@ -33562,9 +33521,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_driver.c linux-rpi-3.10.y/
+ </td></tr> + </td></tr>
+ +
+*/ +*/
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_driver.h --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_driver.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_driver.h
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_driver.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,86 @@ @@ -0,0 +1,86 @@
+/* ========================================================================== +/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.h $ + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_driver.h $
@ -33652,9 +33610,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_driver.h linux-rpi-3.10.y/
+#endif +#endif
+ +
+#endif +#endif
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.c --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,3533 @@ @@ -0,0 +1,3533 @@
+ +
+/* ========================================================================== +/* ==========================================================================
@ -37189,9 +37146,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_hcd.c linux-rpi-3.10.y/dri
+} +}
+ +
+#endif /* DWC_DEVICE_ONLY */ +#endif /* DWC_DEVICE_ONLY */
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,1132 @@ @@ -0,0 +1,1132 @@
+/*========================================================================== +/*==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_ddma.c $ + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_ddma.c $
@ -38325,9 +38281,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c linux-rpi-3.10.
+} +}
+ +
+#endif /* DWC_DEVICE_ONLY */ +#endif /* DWC_DEVICE_ONLY */
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.h --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.h
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_hcd.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,839 @@ @@ -0,0 +1,839 @@
+/* ========================================================================== +/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd.h $ + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd.h $
@ -39168,9 +39123,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_hcd.h linux-rpi-3.10.y/dri
+#endif +#endif
+#endif +#endif
+#endif /* DWC_DEVICE_ONLY */ +#endif /* DWC_DEVICE_ONLY */
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,417 @@ @@ -0,0 +1,417 @@
+/* ========================================================================== +/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_if.h $ + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_if.h $
@ -39589,9 +39543,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h linux-rpi-3.10.y/
+ +
+#endif /* __DWC_HCD_IF_H__ */ +#endif /* __DWC_HCD_IF_H__ */
+#endif /* DWC_DEVICE_ONLY */ +#endif /* DWC_DEVICE_ONLY */
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,2258 @@ @@ -0,0 +1,2258 @@
+/* ========================================================================== +/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_intr.c $ + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_intr.c $
@ -41851,9 +41804,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c linux-rpi-3.10.
+ return retval; + return retval;
+} +}
+#endif /* DWC_DEVICE_ONLY */ +#endif /* DWC_DEVICE_ONLY */
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,955 @@ @@ -0,0 +1,955 @@
+ +
+/* ========================================================================== +/* ==========================================================================
@ -42810,9 +42762,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c linux-rpi-3.10
+} +}
+ +
+#endif /* DWC_DEVICE_ONLY */ +#endif /* DWC_DEVICE_ONLY */
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,958 @@ @@ -0,0 +1,958 @@
+/* ========================================================================== +/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_queue.c $ + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_hcd_queue.c $
@ -43772,9 +43723,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c linux-rpi-3.10
+} +}
+ +
+#endif /* DWC_DEVICE_ONLY */ +#endif /* DWC_DEVICE_ONLY */
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,113 @@ @@ -0,0 +1,113 @@
+#include "dwc_otg_regs.h" +#include "dwc_otg_regs.h"
+#include "dwc_otg_dbg.h" +#include "dwc_otg_dbg.h"
@ -43889,9 +43839,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.c linux-rpi-3.10.
+ +
+ return; + return;
+} +}
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,36 @@ @@ -0,0 +1,36 @@
+#ifndef __DWC_OTG_MPHI_FIX_H__ +#ifndef __DWC_OTG_MPHI_FIX_H__
+#define __DWC_OTG_MPHI_FIX_H__ +#define __DWC_OTG_MPHI_FIX_H__
@ -43929,9 +43878,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_mphi_fix.h linux-rpi-3.10.
+#endif +#endif
+ +
+#endif +#endif
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,188 @@ @@ -0,0 +1,188 @@
+#ifndef _DWC_OS_DEP_H_ +#ifndef _DWC_OS_DEP_H_
+#define _DWC_OS_DEP_H_ +#define _DWC_OS_DEP_H_
@ -44121,9 +44069,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h linux-rpi-3.10.y/
+ +
+ +
+#endif /* _DWC_OS_DEP_H_ */ +#endif /* _DWC_OS_DEP_H_ */
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.c --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd.c
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,2708 @@ @@ -0,0 +1,2708 @@
+/* ========================================================================== +/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.c $ + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.c $
@ -46833,9 +46780,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_pcd.c linux-rpi-3.10.y/dri
+} +}
+ +
+#endif /* DWC_HOST_ONLY */ +#endif /* DWC_HOST_ONLY */
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.h --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd.h
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_pcd.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,266 @@ @@ -0,0 +1,266 @@
+/* ========================================================================== +/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.h $ + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd.h $
@ -47103,9 +47049,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_pcd.h linux-rpi-3.10.y/dri
+extern void do_test_mode(void *data); +extern void do_test_mode(void *data);
+#endif +#endif
+#endif /* DWC_HOST_ONLY */ +#endif /* DWC_HOST_ONLY */
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,360 @@ @@ -0,0 +1,360 @@
+/* ========================================================================== +/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_if.h $ + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_if.h $
@ -47467,9 +47412,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h linux-rpi-3.10.y/
+#endif /* __DWC_PCD_IF_H__ */ +#endif /* __DWC_PCD_IF_H__ */
+ +
+#endif /* DWC_HOST_ONLY */ +#endif /* DWC_HOST_ONLY */
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,5147 @@ @@ -0,0 +1,5147 @@
+/* ========================================================================== +/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_intr.c $ + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_intr.c $
@ -52618,9 +52562,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c linux-rpi-3.10.
+} +}
+ +
+#endif /* DWC_HOST_ONLY */ +#endif /* DWC_HOST_ONLY */
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,1358 @@ @@ -0,0 +1,1358 @@
+ /* ========================================================================== + /* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_linux.c $ + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_pcd_linux.c $
@ -53980,9 +53923,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c linux-rpi-3.10
+EXPORT_SYMBOL(usb_gadget_unregister_driver); +EXPORT_SYMBOL(usb_gadget_unregister_driver);
+ +
+#endif /* DWC_HOST_ONLY */ +#endif /* DWC_HOST_ONLY */
diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_regs.h --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_regs.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/dwc_otg_regs.h
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/dwc_otg_regs.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,2550 @@ @@ -0,0 +1,2550 @@
+/* ========================================================================== +/* ==========================================================================
+ * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_regs.h $ + * $File: //dwh/usb_iip/dev/software/otg/linux/drivers/dwc_otg_regs.h $
@ -56534,9 +56476,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/dwc_otg_regs.h linux-rpi-3.10.y/dr
+} gpwrdn_data_t; +} gpwrdn_data_t;
+ +
+#endif +#endif
diff -urN linux-3.10/drivers/usb/host/dwc_otg/Makefile linux-rpi-3.10.y/drivers/usb/host/dwc_otg/Makefile --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/Makefile
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/Makefile 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,81 @@ @@ -0,0 +1,81 @@
+# +#
+# Makefile for DWC_otg Highspeed USB controller driver +# Makefile for DWC_otg Highspeed USB controller driver
@ -56619,9 +56560,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/Makefile linux-rpi-3.10.y/drivers/
+ rm -rf *.o *.ko .*cmd *.mod.c .tmp_versions Module.symvers + rm -rf *.o *.ko .*cmd *.mod.c .tmp_versions Module.symvers
+ +
+endif +endif
diff -urN linux-3.10/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-rpi-3.10.y/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,337 @@ @@ -0,0 +1,337 @@
+package dwc_otg_test; +package dwc_otg_test;
+ +
@ -56960,9 +56900,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm linux-rpi-3.1
+); +);
+ +
+1; +1;
diff -urN linux-3.10/drivers/usb/host/dwc_otg/test/Makefile linux-rpi-3.10.y/drivers/usb/host/dwc_otg/test/Makefile --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/test/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/test/Makefile
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/test/Makefile 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,16 @@ @@ -0,0 +1,16 @@
+ +
+PERL=/usr/bin/perl +PERL=/usr/bin/perl
@ -56980,9 +56919,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/test/Makefile linux-rpi-3.10.y/dri
+ else echo "=======> $$test, FAILED" ; \ + else echo "=======> $$test, FAILED" ; \
+ fi \ + fi \
+ done + done
diff -urN linux-3.10/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-rpi-3.10.y/drivers/usb/host/dwc_otg/test/test_mod_param.pl --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/test/test_mod_param.pl 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/test/test_mod_param.pl
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/test/test_mod_param.pl 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,133 @@ @@ -0,0 +1,133 @@
+#!/usr/bin/perl -w +#!/usr/bin/perl -w
+# +#
@ -57117,9 +57055,8 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/test/test_mod_param.pl linux-rpi-3
+ +
+test_main(); +test_main();
+0; +0;
diff -urN linux-3.10/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-rpi-3.10.y/drivers/usb/host/dwc_otg/test/test_sysfs.pl --- /dev/null
--- linux-3.10/drivers/usb/host/dwc_otg/test/test_sysfs.pl 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/usb/host/dwc_otg/test/test_sysfs.pl
+++ linux-rpi-3.10.y/drivers/usb/host/dwc_otg/test/test_sysfs.pl 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,193 @@ @@ -0,0 +1,193 @@
+#!/usr/bin/perl -w +#!/usr/bin/perl -w
+# +#
@ -57314,10 +57251,9 @@ diff -urN linux-3.10/drivers/usb/host/dwc_otg/test/test_sysfs.pl linux-rpi-3.10.
+ +
+test_main(); +test_main();
+0; +0;
diff -urN linux-3.10/drivers/usb/host/Kconfig linux-rpi-3.10.y/drivers/usb/host/Kconfig --- a/drivers/usb/host/Kconfig
--- linux-3.10/drivers/usb/host/Kconfig 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/usb/host/Kconfig
+++ linux-rpi-3.10.y/drivers/usb/host/Kconfig 2013-07-06 15:25:50.000000000 +0100 @@ -663,6 +663,19 @@ config USB_HWA_HCD
@@ -663,6 +663,19 @@
To compile this driver a module, choose M here: the module To compile this driver a module, choose M here: the module
will be called "hwa-hc". will be called "hwa-hc".
@ -57337,10 +57273,9 @@ diff -urN linux-3.10/drivers/usb/host/Kconfig linux-rpi-3.10.y/drivers/usb/host/
config USB_IMX21_HCD config USB_IMX21_HCD
tristate "i.MX21 HCD support" tristate "i.MX21 HCD support"
depends on ARM && ARCH_MXC depends on ARM && ARCH_MXC
diff -urN linux-3.10/drivers/usb/host/Makefile linux-rpi-3.10.y/drivers/usb/host/Makefile --- a/drivers/usb/host/Makefile
--- linux-3.10/drivers/usb/host/Makefile 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/usb/host/Makefile
+++ linux-rpi-3.10.y/drivers/usb/host/Makefile 2013-07-06 15:25:50.000000000 +0100 @@ -47,6 +47,8 @@ obj-$(CONFIG_USB_U132_HCD) += u132-hcd.o
@@ -47,6 +47,8 @@
obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o
obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o
obj-$(CONFIG_USB_HWA_HCD) += hwa-hc.o obj-$(CONFIG_USB_HWA_HCD) += hwa-hc.o
@ -57349,10 +57284,9 @@ diff -urN linux-3.10/drivers/usb/host/Makefile linux-rpi-3.10.y/drivers/usb/host
obj-$(CONFIG_USB_IMX21_HCD) += imx21-hcd.o obj-$(CONFIG_USB_IMX21_HCD) += imx21-hcd.o
obj-$(CONFIG_USB_FSL_MPH_DR_OF) += fsl-mph-dr-of.o obj-$(CONFIG_USB_FSL_MPH_DR_OF) += fsl-mph-dr-of.o
obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o
diff -urN linux-3.10/drivers/usb/Makefile linux-rpi-3.10.y/drivers/usb/Makefile --- a/drivers/usb/Makefile
--- linux-3.10/drivers/usb/Makefile 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/usb/Makefile
+++ linux-rpi-3.10.y/drivers/usb/Makefile 2013-07-06 15:25:50.000000000 +0100 @@ -23,6 +23,7 @@ obj-$(CONFIG_USB_U132_HCD) += host/
@@ -23,6 +23,7 @@
obj-$(CONFIG_USB_R8A66597_HCD) += host/ obj-$(CONFIG_USB_R8A66597_HCD) += host/
obj-$(CONFIG_USB_HWA_HCD) += host/ obj-$(CONFIG_USB_HWA_HCD) += host/
obj-$(CONFIG_USB_ISP1760_HCD) += host/ obj-$(CONFIG_USB_ISP1760_HCD) += host/

277
target/linux/brcm2708/patches-3.10/002-Main-bcm2708-linux-port.patch
View File

@ -1,6 +1,5 @@
diff -urN linux-3.10/arch/arm/configs/bcmrpi_cutdown_defconfig linux-rpi-3.10.y/arch/arm/configs/bcmrpi_cutdown_defconfig --- /dev/null
--- linux-3.10/arch/arm/configs/bcmrpi_cutdown_defconfig 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/configs/bcmrpi_cutdown_defconfig
+++ linux-rpi-3.10.y/arch/arm/configs/bcmrpi_cutdown_defconfig 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,504 @@ @@ -0,0 +1,504 @@
+CONFIG_EXPERIMENTAL=y +CONFIG_EXPERIMENTAL=y
+# CONFIG_LOCALVERSION_AUTO is not set +# CONFIG_LOCALVERSION_AUTO is not set
@ -506,9 +505,8 @@ diff -urN linux-3.10/arch/arm/configs/bcmrpi_cutdown_defconfig linux-rpi-3.10.y/
+CONFIG_SPI_MASTER=y +CONFIG_SPI_MASTER=y
+CONFIG_SPI_BCM2708=m +CONFIG_SPI_BCM2708=m
+ +
diff -urN linux-3.10/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.10.y/arch/arm/configs/bcmrpi_defconfig --- /dev/null
--- linux-3.10/arch/arm/configs/bcmrpi_defconfig 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/configs/bcmrpi_defconfig
+++ linux-rpi-3.10.y/arch/arm/configs/bcmrpi_defconfig 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,743 @@ @@ -0,0 +1,743 @@
+# CONFIG_ARM_PATCH_PHYS_VIRT is not set +# CONFIG_ARM_PATCH_PHYS_VIRT is not set
+# CONFIG_LOCALVERSION_AUTO is not set +# CONFIG_LOCALVERSION_AUTO is not set
@ -1253,9 +1251,8 @@ diff -urN linux-3.10/arch/arm/configs/bcmrpi_defconfig linux-rpi-3.10.y/arch/arm
+# CONFIG_CRYPTO_HW is not set +# CONFIG_CRYPTO_HW is not set
+CONFIG_CRC_ITU_T=y +CONFIG_CRC_ITU_T=y
+CONFIG_LIBCRC32C=y +CONFIG_LIBCRC32C=y
diff -urN linux-3.10/arch/arm/configs/bcmrpi_emergency_defconfig linux-rpi-3.10.y/arch/arm/configs/bcmrpi_emergency_defconfig --- /dev/null
--- linux-3.10/arch/arm/configs/bcmrpi_emergency_defconfig 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/configs/bcmrpi_emergency_defconfig
+++ linux-rpi-3.10.y/arch/arm/configs/bcmrpi_emergency_defconfig 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,532 @@ @@ -0,0 +1,532 @@
+CONFIG_EXPERIMENTAL=y +CONFIG_EXPERIMENTAL=y
+# CONFIG_LOCALVERSION_AUTO is not set +# CONFIG_LOCALVERSION_AUTO is not set
@ -1789,9 +1786,8 @@ diff -urN linux-3.10/arch/arm/configs/bcmrpi_emergency_defconfig linux-rpi-3.10.
+# CONFIG_CRYPTO_HW is not set +# CONFIG_CRYPTO_HW is not set
+CONFIG_CRC_ITU_T=y +CONFIG_CRC_ITU_T=y
+CONFIG_LIBCRC32C=y +CONFIG_LIBCRC32C=y
diff -urN linux-3.10/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi-3.10.y/arch/arm/configs/bcmrpi_quick_defconfig --- /dev/null
--- linux-3.10/arch/arm/configs/bcmrpi_quick_defconfig 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/configs/bcmrpi_quick_defconfig
+++ linux-rpi-3.10.y/arch/arm/configs/bcmrpi_quick_defconfig 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,197 @@ @@ -0,0 +1,197 @@
+# CONFIG_ARM_PATCH_PHYS_VIRT is not set +# CONFIG_ARM_PATCH_PHYS_VIRT is not set
+CONFIG_LOCALVERSION="-quick" +CONFIG_LOCALVERSION="-quick"
@ -1990,10 +1986,9 @@ diff -urN linux-3.10/arch/arm/configs/bcmrpi_quick_defconfig linux-rpi-3.10.y/ar
+# CONFIG_CRYPTO_HW is not set +# CONFIG_CRYPTO_HW is not set
+CONFIG_CRC_ITU_T=y +CONFIG_CRC_ITU_T=y
+CONFIG_LIBCRC32C=y +CONFIG_LIBCRC32C=y
diff -urN linux-3.10/arch/arm/include/asm/fiq.h linux-rpi-3.10.y/arch/arm/include/asm/fiq.h --- a/arch/arm/include/asm/fiq.h
--- linux-3.10/arch/arm/include/asm/fiq.h 2013-06-30 23:13:29.000000000 +0100 +++ b/arch/arm/include/asm/fiq.h
+++ linux-rpi-3.10.y/arch/arm/include/asm/fiq.h 2013-07-06 15:25:50.000000000 +0100 @@ -42,6 +42,7 @@ extern void disable_fiq(int fiq);
@@ -42,6 +42,7 @@
/* helpers defined in fiqasm.S: */ /* helpers defined in fiqasm.S: */
extern void __set_fiq_regs(unsigned long const *regs); extern void __set_fiq_regs(unsigned long const *regs);
extern void __get_fiq_regs(unsigned long *regs); extern void __get_fiq_regs(unsigned long *regs);
@ -2001,10 +1996,9 @@ diff -urN linux-3.10/arch/arm/include/asm/fiq.h linux-rpi-3.10.y/arch/arm/includ
static inline void set_fiq_regs(struct pt_regs const *regs) static inline void set_fiq_regs(struct pt_regs const *regs)
{ {
diff -urN linux-3.10/arch/arm/Kconfig linux-rpi-3.10.y/arch/arm/Kconfig --- a/arch/arm/Kconfig
--- linux-3.10/arch/arm/Kconfig 2013-06-30 23:13:29.000000000 +0100 +++ b/arch/arm/Kconfig
+++ linux-rpi-3.10.y/arch/arm/Kconfig 2013-07-06 15:25:50.000000000 +0100 @@ -361,6 +361,23 @@ config ARCH_AT91
@@ -361,6 +361,23 @@
This enables support for systems based on Atmel This enables support for systems based on Atmel
AT91RM9200 and AT91SAM9* processors. AT91RM9200 and AT91SAM9* processors.
@ -2028,7 +2022,7 @@ diff -urN linux-3.10/arch/arm/Kconfig linux-rpi-3.10.y/arch/arm/Kconfig
config ARCH_CLPS711X config ARCH_CLPS711X
bool "Cirrus Logic CLPS711x/EP721x/EP731x-based" bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
@@ -1025,6 +1042,7 @@ @@ -1025,6 +1042,7 @@ source "arch/arm/mach-virt/Kconfig"
source "arch/arm/mach-vt8500/Kconfig" source "arch/arm/mach-vt8500/Kconfig"
source "arch/arm/mach-w90x900/Kconfig" source "arch/arm/mach-w90x900/Kconfig"
@ -2036,10 +2030,9 @@ diff -urN linux-3.10/arch/arm/Kconfig linux-rpi-3.10.y/arch/arm/Kconfig
source "arch/arm/mach-zynq/Kconfig" source "arch/arm/mach-zynq/Kconfig"
diff -urN linux-3.10/arch/arm/Kconfig.debug linux-rpi-3.10.y/arch/arm/Kconfig.debug --- a/arch/arm/Kconfig.debug
--- linux-3.10/arch/arm/Kconfig.debug 2013-06-30 23:13:29.000000000 +0100 +++ b/arch/arm/Kconfig.debug
+++ linux-rpi-3.10.y/arch/arm/Kconfig.debug 2013-07-06 15:25:50.000000000 +0100 @@ -519,6 +519,14 @@ choice
@@ -519,6 +519,14 @@
For more details about semihosting, please see For more details about semihosting, please see
chapter 8 of DUI0203I_rvct_developer_guide.pdf from ARM Ltd. chapter 8 of DUI0203I_rvct_developer_guide.pdf from ARM Ltd.
@ -2054,10 +2047,9 @@ diff -urN linux-3.10/arch/arm/Kconfig.debug linux-rpi-3.10.y/arch/arm/Kconfig.de
endchoice endchoice
config DEBUG_EXYNOS_UART config DEBUG_EXYNOS_UART
diff -urN linux-3.10/arch/arm/kernel/armksyms.c linux-rpi-3.10.y/arch/arm/kernel/armksyms.c --- a/arch/arm/kernel/armksyms.c
--- linux-3.10/arch/arm/kernel/armksyms.c 2013-06-30 23:13:29.000000000 +0100 +++ b/arch/arm/kernel/armksyms.c
+++ linux-rpi-3.10.y/arch/arm/kernel/armksyms.c 2013-07-06 15:25:50.000000000 +0100 @@ -156,3 +156,7 @@ EXPORT_SYMBOL(__gnu_mcount_nc);
@@ -156,3 +156,7 @@
#ifdef CONFIG_ARM_PATCH_PHYS_VIRT #ifdef CONFIG_ARM_PATCH_PHYS_VIRT
EXPORT_SYMBOL(__pv_phys_offset); EXPORT_SYMBOL(__pv_phys_offset);
#endif #endif
@ -2065,9 +2057,8 @@ diff -urN linux-3.10/arch/arm/kernel/armksyms.c linux-rpi-3.10.y/arch/arm/kernel
+extern void v6wbi_flush_kern_tlb_range(void); +extern void v6wbi_flush_kern_tlb_range(void);
+EXPORT_SYMBOL(v6wbi_flush_kern_tlb_range); +EXPORT_SYMBOL(v6wbi_flush_kern_tlb_range);
+ +
diff -urN linux-3.10/arch/arm/kernel/fiqasm.S linux-rpi-3.10.y/arch/arm/kernel/fiqasm.S --- a/arch/arm/kernel/fiqasm.S
--- linux-3.10/arch/arm/kernel/fiqasm.S 2013-06-30 23:13:29.000000000 +0100 +++ b/arch/arm/kernel/fiqasm.S
+++ linux-rpi-3.10.y/arch/arm/kernel/fiqasm.S 2013-07-06 15:25:50.000000000 +0100
@@ -25,6 +25,9 @@ @@ -25,6 +25,9 @@
ENTRY(__set_fiq_regs) ENTRY(__set_fiq_regs)
mov r2, #PSR_I_BIT | PSR_F_BIT | FIQ_MODE mov r2, #PSR_I_BIT | PSR_F_BIT | FIQ_MODE
@ -2078,7 +2069,7 @@ diff -urN linux-3.10/arch/arm/kernel/fiqasm.S linux-rpi-3.10.y/arch/arm/kernel/f
msr cpsr_c, r2 @ select FIQ mode msr cpsr_c, r2 @ select FIQ mode
mov r0, r0 @ avoid hazard prior to ARMv4 mov r0, r0 @ avoid hazard prior to ARMv4
ldmia r0!, {r8 - r12} ldmia r0!, {r8 - r12}
@@ -47,3 +50,7 @@ @@ -47,3 +50,7 @@ ENTRY(__get_fiq_regs)
mov r0, r0 @ avoid hazard prior to ARMv4 mov r0, r0 @ avoid hazard prior to ARMv4
mov pc, lr mov pc, lr
ENDPROC(__get_fiq_regs) ENDPROC(__get_fiq_regs)
@ -2086,10 +2077,9 @@ diff -urN linux-3.10/arch/arm/kernel/fiqasm.S linux-rpi-3.10.y/arch/arm/kernel/f
+ENTRY(__FIQ_Branch) +ENTRY(__FIQ_Branch)
+ mov pc, r8 + mov pc, r8
+ENDPROC(__FIQ_Branch) +ENDPROC(__FIQ_Branch)
diff -urN linux-3.10/arch/arm/kernel/fiq.c linux-rpi-3.10.y/arch/arm/kernel/fiq.c --- a/arch/arm/kernel/fiq.c
--- linux-3.10/arch/arm/kernel/fiq.c 2013-06-30 23:13:29.000000000 +0100 +++ b/arch/arm/kernel/fiq.c
+++ linux-rpi-3.10.y/arch/arm/kernel/fiq.c 2013-07-06 15:25:50.000000000 +0100 @@ -137,6 +137,7 @@ void disable_fiq(int fiq)
@@ -137,6 +137,7 @@
EXPORT_SYMBOL(set_fiq_handler); EXPORT_SYMBOL(set_fiq_handler);
EXPORT_SYMBOL(__set_fiq_regs); /* defined in fiqasm.S */ EXPORT_SYMBOL(__set_fiq_regs); /* defined in fiqasm.S */
EXPORT_SYMBOL(__get_fiq_regs); /* defined in fiqasm.S */ EXPORT_SYMBOL(__get_fiq_regs); /* defined in fiqasm.S */
@ -2097,9 +2087,8 @@ diff -urN linux-3.10/arch/arm/kernel/fiq.c linux-rpi-3.10.y/arch/arm/kernel/fiq.
EXPORT_SYMBOL(claim_fiq); EXPORT_SYMBOL(claim_fiq);
EXPORT_SYMBOL(release_fiq); EXPORT_SYMBOL(release_fiq);
EXPORT_SYMBOL(enable_fiq); EXPORT_SYMBOL(enable_fiq);
diff -urN linux-3.10/arch/arm/mach-bcm2708/armctrl.c linux-rpi-3.10.y/arch/arm/mach-bcm2708/armctrl.c --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/armctrl.c 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/armctrl.c
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/armctrl.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,219 @@ @@ -0,0 +1,219 @@
+/* +/*
+ * linux/arch/arm/mach-bcm2708/armctrl.c + * linux/arch/arm/mach-bcm2708/armctrl.c
@ -2320,9 +2309,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/armctrl.c linux-rpi-3.10.y/arch/arm/m
+ init_FIQ(FIQ_START); + init_FIQ(FIQ_START);
+ return 0; + return 0;
+} +}
diff -urN linux-3.10/arch/arm/mach-bcm2708/armctrl.h linux-rpi-3.10.y/arch/arm/mach-bcm2708/armctrl.h --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/armctrl.h 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/armctrl.h
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/armctrl.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
+/* +/*
+ * linux/arch/arm/mach-bcm2708/armctrl.h + * linux/arch/arm/mach-bcm2708/armctrl.h
@ -2351,9 +2339,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/armctrl.h linux-rpi-3.10.y/arch/arm/m
+ u32 armctrl_sources, u32 resume_sources); + u32 armctrl_sources, u32 resume_sources);
+ +
+#endif +#endif
diff -urN linux-3.10/arch/arm/mach-bcm2708/bcm2708.c linux-rpi-3.10.y/arch/arm/mach-bcm2708/bcm2708.c --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/bcm2708.c 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/bcm2708.c
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/bcm2708.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,885 @@ @@ -0,0 +1,885 @@
+/* +/*
+ * linux/arch/arm/mach-bcm2708/bcm2708.c + * linux/arch/arm/mach-bcm2708/bcm2708.c
@ -3240,9 +3227,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/bcm2708.c linux-rpi-3.10.y/arch/arm/m
+module_param(boardrev, uint, 0644); +module_param(boardrev, uint, 0644);
+module_param(serial, uint, 0644); +module_param(serial, uint, 0644);
+module_param(uart_clock, uint, 0644); +module_param(uart_clock, uint, 0644);
diff -urN linux-3.10/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi-3.10.y/arch/arm/mach-bcm2708/bcm2708_gpio.c --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/bcm2708_gpio.c 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/bcm2708_gpio.c
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/bcm2708_gpio.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,339 @@ @@ -0,0 +1,339 @@
+/* +/*
+ * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c + * linux/arch/arm/mach-bcm2708/bcm2708_gpio.c
@ -3583,9 +3569,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/bcm2708_gpio.c linux-rpi-3.10.y/arch/
+ +
+MODULE_DESCRIPTION("Broadcom BCM2708 GPIO driver"); +MODULE_DESCRIPTION("Broadcom BCM2708 GPIO driver");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
diff -urN linux-3.10/arch/arm/mach-bcm2708/bcm2708.h linux-rpi-3.10.y/arch/arm/mach-bcm2708/bcm2708.h --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/bcm2708.h 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/bcm2708.h
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/bcm2708.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,51 @@ @@ -0,0 +1,51 @@
+/* +/*
+ * linux/arch/arm/mach-bcm2708/bcm2708.h + * linux/arch/arm/mach-bcm2708/bcm2708.h
@ -3638,9 +3623,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/bcm2708.h linux-rpi-3.10.y/arch/arm/m
+} +}
+ +
+#endif +#endif
diff -urN linux-3.10/arch/arm/mach-bcm2708/clock.c linux-rpi-3.10.y/arch/arm/mach-bcm2708/clock.c --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/clock.c 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/clock.c
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/clock.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,61 @@ @@ -0,0 +1,61 @@
+/* +/*
+ * linux/arch/arm/mach-bcm2708/clock.c + * linux/arch/arm/mach-bcm2708/clock.c
@ -3703,9 +3687,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/clock.c linux-rpi-3.10.y/arch/arm/mac
+ return -EIO; + return -EIO;
+} +}
+EXPORT_SYMBOL(clk_set_rate); +EXPORT_SYMBOL(clk_set_rate);
diff -urN linux-3.10/arch/arm/mach-bcm2708/clock.h linux-rpi-3.10.y/arch/arm/mach-bcm2708/clock.h --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/clock.h 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/clock.h
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/clock.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,24 @@ @@ -0,0 +1,24 @@
+/* +/*
+ * linux/arch/arm/mach-bcm2708/clock.h + * linux/arch/arm/mach-bcm2708/clock.h
@ -3731,9 +3714,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/clock.h linux-rpi-3.10.y/arch/arm/mac
+struct clk { +struct clk {
+ unsigned long rate; + unsigned long rate;
+}; +};
diff -urN linux-3.10/arch/arm/mach-bcm2708/dma.c linux-rpi-3.10.y/arch/arm/mach-bcm2708/dma.c --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/dma.c 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/dma.c
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/dma.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,399 @@ @@ -0,0 +1,399 @@
+/* +/*
+ * linux/arch/arm/mach-bcm2708/dma.c + * linux/arch/arm/mach-bcm2708/dma.c
@ -4134,9 +4116,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/dma.c linux-rpi-3.10.y/arch/arm/mach-
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+ +
+MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM"); +MODULE_PARM_DESC(dmachans, "Bitmap of DMA channels available to the ARM");
diff -urN linux-3.10/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.10.y/arch/arm/mach-bcm2708/dmaer.c --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/dmaer.c 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/dmaer.c
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/dmaer.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,887 @@ @@ -0,0 +1,887 @@
+#include <linux/init.h> +#include <linux/init.h>
+#include <linux/sched.h> +#include <linux/sched.h>
@ -5025,9 +5006,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/dmaer.c linux-rpi-3.10.y/arch/arm/mac
+module_init(dmaer_init); +module_init(dmaer_init);
+module_exit(dmaer_exit); +module_exit(dmaer_exit);
+ +
diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/arm_control.h --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/include/mach/arm_control.h 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/include/mach/arm_control.h
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/arm_control.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,419 @@ @@ -0,0 +1,419 @@
+/* +/*
+ * linux/arch/arm/mach-bcm2708/arm_control.h + * linux/arch/arm/mach-bcm2708/arm_control.h
@ -5448,9 +5428,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/arm_control.h linux-rpi-
+#define AJBTDO HW_REGISTER_RW(AJB_BASE+0x0c) +#define AJBTDO HW_REGISTER_RW(AJB_BASE+0x0c)
+ +
+#endif +#endif
diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/arm_power.h --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/include/mach/arm_power.h 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/include/mach/arm_power.h
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/arm_power.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,60 @@ @@ -0,0 +1,60 @@
+/* +/*
+ * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h + * linux/arch/arm/mach-bcm2708/include/mach/arm_power.h
@ -5512,9 +5491,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/arm_power.h linux-rpi-3.
+}; +};
+ +
+#endif +#endif
diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/clkdev.h --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/include/mach/clkdev.h 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/include/mach/clkdev.h
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/clkdev.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
+#ifndef __ASM_MACH_CLKDEV_H +#ifndef __ASM_MACH_CLKDEV_H
+#define __ASM_MACH_CLKDEV_H +#define __ASM_MACH_CLKDEV_H
@ -5523,9 +5501,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/clkdev.h linux-rpi-3.10.
+#define __clk_put(clk) do { } while (0) +#define __clk_put(clk) do { } while (0)
+ +
+#endif +#endif
diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/debug-macro.S --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/include/mach/debug-macro.S 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/include/mach/debug-macro.S
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/debug-macro.S 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,22 @@ @@ -0,0 +1,22 @@
+/* arch/arm/mach-bcm2708/include/mach/debug-macro.S +/* arch/arm/mach-bcm2708/include/mach/debug-macro.S
+ * + *
@ -5549,9 +5526,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/debug-macro.S linux-rpi-
+ .endm + .endm
+ +
+#include <asm/hardware/debug-pl01x.S> +#include <asm/hardware/debug-pl01x.S>
diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/dma.h --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/include/mach/dma.h 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/include/mach/dma.h
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/dma.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,86 @@ @@ -0,0 +1,86 @@
+/* +/*
+ * linux/arch/arm/mach-bcm2708/include/mach/dma.h + * linux/arch/arm/mach-bcm2708/include/mach/dma.h
@ -5639,9 +5615,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/dma.h linux-rpi-3.10.y/a
+ +
+ +
+#endif /* _MACH_BCM2708_DMA_H */ +#endif /* _MACH_BCM2708_DMA_H */
diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/entry-macro.S --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/include/mach/entry-macro.S 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/include/mach/entry-macro.S
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/entry-macro.S 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,69 @@ @@ -0,0 +1,69 @@
+/* +/*
+ * arch/arm/mach-bcm2708/include/mach/entry-macro.S + * arch/arm/mach-bcm2708/include/mach/entry-macro.S
@ -5712,9 +5687,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/entry-macro.S linux-rpi-
+1020: @ EQ will be set if no irqs pending +1020: @ EQ will be set if no irqs pending
+ +
+ .endm + .endm
diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/frc.h --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/include/mach/frc.h 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/include/mach/frc.h
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/frc.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,38 @@ @@ -0,0 +1,38 @@
+/* +/*
+ * arch/arm/mach-bcm2708/include/mach/timex.h + * arch/arm/mach-bcm2708/include/mach/timex.h
@ -5754,9 +5728,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/frc.h linux-rpi-3.10.y/a
+extern unsigned long long frc_clock_ticks63(void); +extern unsigned long long frc_clock_ticks63(void);
+ +
+#endif +#endif
diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/gpio.h --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/include/mach/gpio.h 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/include/mach/gpio.h
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/gpio.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,18 @@ @@ -0,0 +1,18 @@
+/* +/*
+ * arch/arm/mach-bcm2708/include/mach/gpio.h + * arch/arm/mach-bcm2708/include/mach/gpio.h
@ -5776,9 +5749,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/gpio.h linux-rpi-3.10.y/
+ +
+#endif +#endif
+ +
diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/hardware.h --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/include/mach/hardware.h 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/include/mach/hardware.h
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/hardware.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,28 @@ @@ -0,0 +1,28 @@
+/* +/*
+ * arch/arm/mach-bcm2708/include/mach/hardware.h + * arch/arm/mach-bcm2708/include/mach/hardware.h
@ -5808,9 +5780,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/hardware.h linux-rpi-3.1
+#include <mach/platform.h> +#include <mach/platform.h>
+ +
+#endif +#endif
diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/io.h --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/include/mach/io.h 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/include/mach/io.h
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/io.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
+/* +/*
+ * arch/arm/mach-bcm2708/include/mach/io.h + * arch/arm/mach-bcm2708/include/mach/io.h
@ -5839,9 +5810,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/io.h linux-rpi-3.10.y/ar
+#define __io(a) __typesafe_io(a) +#define __io(a) __typesafe_io(a)
+ +
+#endif +#endif
diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/irqs.h --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/include/mach/irqs.h 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/include/mach/irqs.h
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/irqs.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,199 @@ @@ -0,0 +1,199 @@
+/* +/*
+ * arch/arm/mach-bcm2708/include/mach/irqs.h + * arch/arm/mach-bcm2708/include/mach/irqs.h
@ -6042,9 +6012,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/irqs.h linux-rpi-3.10.y/
+ +
+ +
+#endif /* _BCM2708_IRQS_H_ */ +#endif /* _BCM2708_IRQS_H_ */
diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/memory.h --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/include/mach/memory.h 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/include/mach/memory.h
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/memory.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,57 @@ @@ -0,0 +1,57 @@
+/* +/*
+ * arch/arm/mach-bcm2708/include/mach/memory.h + * arch/arm/mach-bcm2708/include/mach/memory.h
@ -6103,9 +6072,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/memory.h linux-rpi-3.10.
+#define __bus_to_pfn(x) __phys_to_pfn((x) - (BUS_OFFSET - PLAT_PHYS_OFFSET)) +#define __bus_to_pfn(x) __phys_to_pfn((x) - (BUS_OFFSET - PLAT_PHYS_OFFSET))
+ +
+#endif +#endif
diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/platform.h --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/include/mach/platform.h 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/include/mach/platform.h
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/platform.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,226 @@ @@ -0,0 +1,226 @@
+/* +/*
+ * arch/arm/mach-bcm2708/include/mach/platform.h + * arch/arm/mach-bcm2708/include/mach/platform.h
@ -6333,9 +6301,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/platform.h linux-rpi-3.1
+#endif +#endif
+ +
+/* END */ +/* END */
diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/power.h --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/include/mach/power.h 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/include/mach/power.h
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/power.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,26 @@ @@ -0,0 +1,26 @@
+/* +/*
+ * linux/arch/arm/mach-bcm2708/power.h + * linux/arch/arm/mach-bcm2708/power.h
@ -6363,9 +6330,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/power.h linux-rpi-3.10.y
+extern int bcm_power_close(BCM_POWER_HANDLE_T handle); +extern int bcm_power_close(BCM_POWER_HANDLE_T handle);
+ +
+#endif +#endif
diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/system.h --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/include/mach/system.h 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/include/mach/system.h
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/system.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,38 @@ @@ -0,0 +1,38 @@
+/* +/*
+ * arch/arm/mach-bcm2708/include/mach/system.h + * arch/arm/mach-bcm2708/include/mach/system.h
@ -6405,9 +6371,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/system.h linux-rpi-3.10.
+} +}
+ +
+#endif +#endif
diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/timex.h --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/include/mach/timex.h 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/include/mach/timex.h
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/timex.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
+/* +/*
+ * arch/arm/mach-bcm2708/include/mach/timex.h + * arch/arm/mach-bcm2708/include/mach/timex.h
@ -6432,9 +6397,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/timex.h linux-rpi-3.10.y
+ */ + */
+ +
+#define CLOCK_TICK_RATE (1000000) +#define CLOCK_TICK_RATE (1000000)
diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/uncompress.h --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/include/mach/uncompress.h 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/include/mach/uncompress.h
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/uncompress.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,85 @@ @@ -0,0 +1,85 @@
+/* +/*
+ * arch/arm/mach-bcn2708/include/mach/uncompress.h + * arch/arm/mach-bcn2708/include/mach/uncompress.h
@ -6521,9 +6485,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/uncompress.h linux-rpi-3
+ */ + */
+#define arch_decomp_wdog() +#define arch_decomp_wdog()
+ +
diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/vcio.h --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/include/mach/vcio.h 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/include/mach/vcio.h
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/vcio.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,141 @@ @@ -0,0 +1,141 @@
+/* +/*
+ * arch/arm/mach-bcm2708/include/mach/vcio.h + * arch/arm/mach-bcm2708/include/mach/vcio.h
@ -6666,9 +6629,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/vcio.h linux-rpi-3.10.y/
+#define DEVICE_FILE_NAME "char_dev" +#define DEVICE_FILE_NAME "char_dev"
+ +
+#endif +#endif
diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/vc_mem.h --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/include/mach/vc_mem.h 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/include/mach/vc_mem.h
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/vc_mem.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,36 @@ @@ -0,0 +1,36 @@
+/***************************************************************************** +/*****************************************************************************
+* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved.
@ -6706,9 +6668,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/vc_mem.h linux-rpi-3.10.
+ +
+#endif /* VC_MEM_H */ +#endif /* VC_MEM_H */
+ +
diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/vc_support.h linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/vc_support.h --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/include/mach/vc_support.h 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/include/mach/vc_support.h
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/vc_support.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,69 @@ @@ -0,0 +1,69 @@
+#ifndef _VC_SUPPORT_H_ +#ifndef _VC_SUPPORT_H_
+#define _VC_SUPPORT_H_ +#define _VC_SUPPORT_H_
@ -6779,9 +6740,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/vc_support.h linux-rpi-3
+ unsigned int r0, unsigned int r1, unsigned int r2, unsigned int r3, unsigned int r4, unsigned int r5); + unsigned int r0, unsigned int r1, unsigned int r2, unsigned int r3, unsigned int r4, unsigned int r5);
+ +
+#endif +#endif
diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/vmalloc.h --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/include/mach/vmalloc.h 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/include/mach/vmalloc.h
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/include/mach/vmalloc.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,20 @@ @@ -0,0 +1,20 @@
+/* +/*
+ * arch/arm/mach-bcm2708/include/mach/vmalloc.h + * arch/arm/mach-bcm2708/include/mach/vmalloc.h
@ -6803,9 +6763,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/include/mach/vmalloc.h linux-rpi-3.10
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */ + */
+#define VMALLOC_END (0xe8000000) +#define VMALLOC_END (0xe8000000)
diff -urN linux-3.10/arch/arm/mach-bcm2708/Kconfig linux-rpi-3.10.y/arch/arm/mach-bcm2708/Kconfig --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/Kconfig
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/Kconfig 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,48 @@ @@ -0,0 +1,48 @@
+menu "Broadcom BCM2708 Implementations" +menu "Broadcom BCM2708 Implementations"
+ depends on ARCH_BCM2708 + depends on ARCH_BCM2708
@ -6855,9 +6814,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/Kconfig linux-rpi-3.10.y/arch/arm/mac
+ help + help
+ Binds spidev driver to the SPI0 master + Binds spidev driver to the SPI0 master
+endmenu +endmenu
diff -urN linux-3.10/arch/arm/mach-bcm2708/Makefile linux-rpi-3.10.y/arch/arm/mach-bcm2708/Makefile --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/Makefile
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/Makefile 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+# +#
+# Makefile for the linux kernel. +# Makefile for the linux kernel.
@ -6870,16 +6828,14 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/Makefile linux-rpi-3.10.y/arch/arm/ma
+obj-$(CONFIG_BCM2708_DMAER) += dmaer_master.o +obj-$(CONFIG_BCM2708_DMAER) += dmaer_master.o
+dmaer_master-objs := dmaer.o vc_support.o +dmaer_master-objs := dmaer.o vc_support.o
+ +
diff -urN linux-3.10/arch/arm/mach-bcm2708/Makefile.boot linux-rpi-3.10.y/arch/arm/mach-bcm2708/Makefile.boot --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/Makefile.boot
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/Makefile.boot 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
+ zreladdr-y := 0x00008000 + zreladdr-y := 0x00008000
+params_phys-y := 0x00000100 +params_phys-y := 0x00000100
+initrd_phys-y := 0x00800000 +initrd_phys-y := 0x00800000
diff -urN linux-3.10/arch/arm/mach-bcm2708/power.c linux-rpi-3.10.y/arch/arm/mach-bcm2708/power.c --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/power.c 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/power.c
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/power.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,194 @@ @@ -0,0 +1,194 @@
+/* +/*
+ * linux/arch/arm/mach-bcm2708/power.c + * linux/arch/arm/mach-bcm2708/power.c
@ -7075,9 +7031,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/power.c linux-rpi-3.10.y/arch/arm/mac
+MODULE_AUTHOR("Phil Elwell"); +MODULE_AUTHOR("Phil Elwell");
+MODULE_DESCRIPTION("Interface to BCM2708 power management"); +MODULE_DESCRIPTION("Interface to BCM2708 power management");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
diff -urN linux-3.10/arch/arm/mach-bcm2708/vcio.c linux-rpi-3.10.y/arch/arm/mach-bcm2708/vcio.c --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/vcio.c 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/vcio.c
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/vcio.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,474 @@ @@ -0,0 +1,474 @@
+/* +/*
+ * linux/arch/arm/mach-bcm2708/vcio.c + * linux/arch/arm/mach-bcm2708/vcio.c
@ -7553,9 +7508,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/vcio.c linux-rpi-3.10.y/arch/arm/mach
+MODULE_DESCRIPTION("ARM I/O to VideoCore processor"); +MODULE_DESCRIPTION("ARM I/O to VideoCore processor");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:bcm-mbox"); +MODULE_ALIAS("platform:bcm-mbox");
diff -urN linux-3.10/arch/arm/mach-bcm2708/vc_mem.c linux-rpi-3.10.y/arch/arm/mach-bcm2708/vc_mem.c --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/vc_mem.c 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/vc_mem.c
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/vc_mem.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,462 @@ @@ -0,0 +1,462 @@
+/***************************************************************************** +/*****************************************************************************
+* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved. +* Copyright 2010 - 2011 Broadcom Corporation. All rights reserved.
@ -8019,9 +7973,8 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/vc_mem.c linux-rpi-3.10.y/arch/arm/ma
+module_param(mem_size, uint, 0644); +module_param(mem_size, uint, 0644);
+module_param(mem_base, uint, 0644); +module_param(mem_base, uint, 0644);
+ +
diff -urN linux-3.10/arch/arm/mach-bcm2708/vc_support.c linux-rpi-3.10.y/arch/arm/mach-bcm2708/vc_support.c --- /dev/null
--- linux-3.10/arch/arm/mach-bcm2708/vc_support.c 1970-01-01 01:00:00.000000000 +0100 +++ b/arch/arm/mach-bcm2708/vc_support.c
+++ linux-rpi-3.10.y/arch/arm/mach-bcm2708/vc_support.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,319 @@ @@ -0,0 +1,319 @@
+/* +/*
+ * vc_support.c + * vc_support.c
@ -8342,10 +8295,9 @@ diff -urN linux-3.10/arch/arm/mach-bcm2708/vc_support.c linux-rpi-3.10.y/arch/ar
+ } + }
+} +}
+ +
diff -urN linux-3.10/arch/arm/Makefile linux-rpi-3.10.y/arch/arm/Makefile --- a/arch/arm/Makefile
--- linux-3.10/arch/arm/Makefile 2013-06-30 23:13:29.000000000 +0100 +++ b/arch/arm/Makefile
+++ linux-rpi-3.10.y/arch/arm/Makefile 2013-07-06 15:25:50.000000000 +0100 @@ -144,6 +144,7 @@ textofs-$(CONFIG_ARCH_MSM8960) := 0x0020
@@ -139,6 +139,7 @@
# by CONFIG_* macro name. # by CONFIG_* macro name.
machine-$(CONFIG_ARCH_AT91) += at91 machine-$(CONFIG_ARCH_AT91) += at91
machine-$(CONFIG_ARCH_BCM) += bcm machine-$(CONFIG_ARCH_BCM) += bcm
@ -8353,10 +8305,9 @@ diff -urN linux-3.10/arch/arm/Makefile linux-rpi-3.10.y/arch/arm/Makefile
machine-$(CONFIG_ARCH_BCM2835) += bcm2835 machine-$(CONFIG_ARCH_BCM2835) += bcm2835
machine-$(CONFIG_ARCH_CLPS711X) += clps711x machine-$(CONFIG_ARCH_CLPS711X) += clps711x
machine-$(CONFIG_ARCH_CNS3XXX) += cns3xxx machine-$(CONFIG_ARCH_CNS3XXX) += cns3xxx
diff -urN linux-3.10/arch/arm/mm/Kconfig linux-rpi-3.10.y/arch/arm/mm/Kconfig --- a/arch/arm/mm/Kconfig
--- linux-3.10/arch/arm/mm/Kconfig 2013-06-30 23:13:29.000000000 +0100 +++ b/arch/arm/mm/Kconfig
+++ linux-rpi-3.10.y/arch/arm/mm/Kconfig 2013-07-06 15:25:50.000000000 +0100 @@ -358,7 +358,7 @@ config CPU_PJ4B
@@ -358,7 +358,7 @@
# ARMv6 # ARMv6
config CPU_V6 config CPU_V6
@ -8365,10 +8316,9 @@ diff -urN linux-3.10/arch/arm/mm/Kconfig linux-rpi-3.10.y/arch/arm/mm/Kconfig
select CPU_32v6 select CPU_32v6
select CPU_ABRT_EV6 select CPU_ABRT_EV6
select CPU_CACHE_V6 select CPU_CACHE_V6
diff -urN linux-3.10/arch/arm/mm/proc-v6.S linux-rpi-3.10.y/arch/arm/mm/proc-v6.S --- a/arch/arm/mm/proc-v6.S
--- linux-3.10/arch/arm/mm/proc-v6.S 2013-06-30 23:13:29.000000000 +0100 +++ b/arch/arm/mm/proc-v6.S
+++ linux-rpi-3.10.y/arch/arm/mm/proc-v6.S 2013-07-06 15:25:50.000000000 +0100 @@ -73,10 +73,19 @@ ENDPROC(cpu_v6_reset)
@@ -73,10 +73,19 @@
* *
* IRQs are already disabled. * IRQs are already disabled.
*/ */
@ -8391,10 +8341,9 @@ diff -urN linux-3.10/arch/arm/mm/proc-v6.S linux-rpi-3.10.y/arch/arm/mm/proc-v6.
mov pc, lr mov pc, lr
ENTRY(cpu_v6_dcache_clean_area) ENTRY(cpu_v6_dcache_clean_area)
diff -urN linux-3.10/arch/arm/tools/mach-types linux-rpi-3.10.y/arch/arm/tools/mach-types --- a/arch/arm/tools/mach-types
--- linux-3.10/arch/arm/tools/mach-types 2013-06-30 23:13:29.000000000 +0100 +++ b/arch/arm/tools/mach-types
+++ linux-rpi-3.10.y/arch/arm/tools/mach-types 2013-07-06 15:25:50.000000000 +0100 @@ -522,6 +522,7 @@ torbreck MACH_TORBRECK TORBRECK 3090
@@ -522,6 +522,7 @@
prima2_evb MACH_PRIMA2_EVB PRIMA2_EVB 3103 prima2_evb MACH_PRIMA2_EVB PRIMA2_EVB 3103
paz00 MACH_PAZ00 PAZ00 3128 paz00 MACH_PAZ00 PAZ00 3128
acmenetusfoxg20 MACH_ACMENETUSFOXG20 ACMENETUSFOXG20 3129 acmenetusfoxg20 MACH_ACMENETUSFOXG20 ACMENETUSFOXG20 3129

19
target/linux/brcm2708/patches-3.10/003-bcm2708-watchdog-driver.patch
View File

@ -1,6 +1,5 @@
diff -urN linux-3.10/drivers/watchdog/bcm2708_wdog.c linux-rpi-3.10.y/drivers/watchdog/bcm2708_wdog.c --- /dev/null
--- linux-3.10/drivers/watchdog/bcm2708_wdog.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/watchdog/bcm2708_wdog.c
+++ linux-rpi-3.10.y/drivers/watchdog/bcm2708_wdog.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,385 @@ @@ -0,0 +1,385 @@
+/* +/*
+ * Broadcom BCM2708 watchdog driver. + * Broadcom BCM2708 watchdog driver.
@ -387,10 +386,9 @@ diff -urN linux-3.10/drivers/watchdog/bcm2708_wdog.c linux-rpi-3.10.y/drivers/wa
+MODULE_ALIAS_MISCDEV(TEMP_MINOR); +MODULE_ALIAS_MISCDEV(TEMP_MINOR);
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+ +
diff -urN linux-3.10/drivers/watchdog/Kconfig linux-rpi-3.10.y/drivers/watchdog/Kconfig --- a/drivers/watchdog/Kconfig
--- linux-3.10/drivers/watchdog/Kconfig 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/watchdog/Kconfig
+++ linux-rpi-3.10.y/drivers/watchdog/Kconfig 2013-07-06 15:25:50.000000000 +0100 @@ -391,6 +391,12 @@ config RETU_WATCHDOG
@@ -391,6 +391,12 @@
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called retu_wdt. module will be called retu_wdt.
@ -403,10 +401,9 @@ diff -urN linux-3.10/drivers/watchdog/Kconfig linux-rpi-3.10.y/drivers/watchdog/
# AVR32 Architecture # AVR32 Architecture
config AT32AP700X_WDT config AT32AP700X_WDT
diff -urN linux-3.10/drivers/watchdog/Makefile linux-rpi-3.10.y/drivers/watchdog/Makefile --- a/drivers/watchdog/Makefile
--- linux-3.10/drivers/watchdog/Makefile 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/watchdog/Makefile
+++ linux-rpi-3.10.y/drivers/watchdog/Makefile 2013-07-06 15:25:50.000000000 +0100 @@ -54,6 +54,7 @@ obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_
@@ -54,6 +54,7 @@
obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o
obj-$(CONFIG_UX500_WATCHDOG) += ux500_wdt.o obj-$(CONFIG_UX500_WATCHDOG) += ux500_wdt.o
obj-$(CONFIG_RETU_WATCHDOG) += retu_wdt.o obj-$(CONFIG_RETU_WATCHDOG) += retu_wdt.o

51
target/linux/brcm2708/patches-3.10/004-bcm2708-framebuffer-driver.patch
View File

@ -1,6 +1,5 @@
diff -urN linux-3.10/drivers/video/bcm2708_fb.c linux-rpi-3.10.y/drivers/video/bcm2708_fb.c --- /dev/null
--- linux-3.10/drivers/video/bcm2708_fb.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/video/bcm2708_fb.c
+++ linux-rpi-3.10.y/drivers/video/bcm2708_fb.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,647 @@ @@ -0,0 +1,647 @@
+/* +/*
+ * linux/drivers/video/bcm2708_fb.c + * linux/drivers/video/bcm2708_fb.c
@ -649,9 +648,8 @@ diff -urN linux-3.10/drivers/video/bcm2708_fb.c linux-rpi-3.10.y/drivers/video/b
+MODULE_PARM_DESC(fbwidth, "Width of ARM Framebuffer"); +MODULE_PARM_DESC(fbwidth, "Width of ARM Framebuffer");
+MODULE_PARM_DESC(fbheight, "Height of ARM Framebuffer"); +MODULE_PARM_DESC(fbheight, "Height of ARM Framebuffer");
+MODULE_PARM_DESC(fbdepth, "Bit depth of ARM Framebuffer"); +MODULE_PARM_DESC(fbdepth, "Bit depth of ARM Framebuffer");
diff -urN linux-3.10/drivers/video/cfbimgblt.c linux-rpi-3.10.y/drivers/video/cfbimgblt.c --- a/drivers/video/cfbimgblt.c
--- linux-3.10/drivers/video/cfbimgblt.c 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/video/cfbimgblt.c
+++ linux-rpi-3.10.y/drivers/video/cfbimgblt.c 2013-07-06 15:25:50.000000000 +0100
@@ -28,6 +28,11 @@ @@ -28,6 +28,11 @@
* *
* Also need to add code to deal with cards endians that are different than * Also need to add code to deal with cards endians that are different than
@ -664,7 +662,7 @@ diff -urN linux-3.10/drivers/video/cfbimgblt.c linux-rpi-3.10.y/drivers/video/cf
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/string.h> #include <linux/string.h>
@@ -262,6 +267,133 @@ @@ -262,6 +267,133 @@ static inline void fast_imageblit(const
} }
} }
@ -798,7 +796,7 @@ diff -urN linux-3.10/drivers/video/cfbimgblt.c linux-rpi-3.10.y/drivers/video/cf
void cfb_imageblit(struct fb_info *p, const struct fb_image *image) void cfb_imageblit(struct fb_info *p, const struct fb_image *image)
{ {
u32 fgcolor, bgcolor, start_index, bitstart, pitch_index = 0; u32 fgcolor, bgcolor, start_index, bitstart, pitch_index = 0;
@@ -294,11 +426,21 @@ @@ -294,11 +426,21 @@ void cfb_imageblit(struct fb_info *p, co
bgcolor = image->bg_color; bgcolor = image->bg_color;
} }
@ -825,10 +823,9 @@ diff -urN linux-3.10/drivers/video/cfbimgblt.c linux-rpi-3.10.y/drivers/video/cf
slow_imageblit(image, p, dst1, fgcolor, bgcolor, slow_imageblit(image, p, dst1, fgcolor, bgcolor,
start_index, pitch_index); start_index, pitch_index);
} else } else
diff -urN linux-3.10/drivers/video/fbmem.c linux-rpi-3.10.y/drivers/video/fbmem.c --- a/drivers/video/fbmem.c
--- linux-3.10/drivers/video/fbmem.c 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/video/fbmem.c
+++ linux-rpi-3.10.y/drivers/video/fbmem.c 2013-07-06 15:25:50.000000000 +0100 @@ -1074,6 +1074,25 @@ fb_blank(struct fb_info *info, int blank
@@ -1074,6 +1074,25 @@
return ret; return ret;
} }
@ -854,7 +851,7 @@ diff -urN linux-3.10/drivers/video/fbmem.c linux-rpi-3.10.y/drivers/video/fbmem.
static long do_fb_ioctl(struct fb_info *info, unsigned int cmd, static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
unsigned long arg) unsigned long arg)
{ {
@@ -1084,6 +1103,7 @@ @@ -1084,6 +1103,7 @@ static long do_fb_ioctl(struct fb_info *
struct fb_cmap cmap_from; struct fb_cmap cmap_from;
struct fb_cmap_user cmap; struct fb_cmap_user cmap;
struct fb_event event; struct fb_event event;
@ -862,7 +859,7 @@ diff -urN linux-3.10/drivers/video/fbmem.c linux-rpi-3.10.y/drivers/video/fbmem.
void __user *argp = (void __user *)arg; void __user *argp = (void __user *)arg;
long ret = 0; long ret = 0;
@@ -1193,6 +1213,15 @@ @@ -1193,6 +1213,15 @@ static long do_fb_ioctl(struct fb_info *
console_unlock(); console_unlock();
unlock_fb_info(info); unlock_fb_info(info);
break; break;
@ -878,7 +875,7 @@ diff -urN linux-3.10/drivers/video/fbmem.c linux-rpi-3.10.y/drivers/video/fbmem.
default: default:
if (!lock_fb_info(info)) if (!lock_fb_info(info))
return -ENODEV; return -ENODEV;
@@ -1345,6 +1374,7 @@ @@ -1345,6 +1374,7 @@ static long fb_compat_ioctl(struct file
case FBIOPAN_DISPLAY: case FBIOPAN_DISPLAY:
case FBIOGET_CON2FBMAP: case FBIOGET_CON2FBMAP:
case FBIOPUT_CON2FBMAP: case FBIOPUT_CON2FBMAP:
@ -886,10 +883,9 @@ diff -urN linux-3.10/drivers/video/fbmem.c linux-rpi-3.10.y/drivers/video/fbmem.
arg = (unsigned long) compat_ptr(arg); arg = (unsigned long) compat_ptr(arg);
case FBIOBLANK: case FBIOBLANK:
ret = do_fb_ioctl(info, cmd, arg); ret = do_fb_ioctl(info, cmd, arg);
diff -urN linux-3.10/drivers/video/Kconfig linux-rpi-3.10.y/drivers/video/Kconfig --- a/drivers/video/Kconfig
--- linux-3.10/drivers/video/Kconfig 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/video/Kconfig
+++ linux-rpi-3.10.y/drivers/video/Kconfig 2013-07-06 15:25:50.000000000 +0100 @@ -310,6 +310,20 @@ config FB_PM2_FIFO_DISCONNECT
@@ -310,6 +310,20 @@
help help
Support the Permedia2 FIFO disconnect feature. Support the Permedia2 FIFO disconnect feature.
@ -910,9 +906,8 @@ diff -urN linux-3.10/drivers/video/Kconfig linux-rpi-3.10.y/drivers/video/Kconfi
config FB_ARMCLCD config FB_ARMCLCD
tristate "ARM PrimeCell PL110 support" tristate "ARM PrimeCell PL110 support"
depends on FB && ARM && ARM_AMBA depends on FB && ARM && ARM_AMBA
diff -urN linux-3.10/drivers/video/logo/logo_linux_clut224.ppm linux-rpi-3.10.y/drivers/video/logo/logo_linux_clut224.ppm --- a/drivers/video/logo/logo_linux_clut224.ppm
--- linux-3.10/drivers/video/logo/logo_linux_clut224.ppm 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/video/logo/logo_linux_clut224.ppm
+++ linux-rpi-3.10.y/drivers/video/logo/logo_linux_clut224.ppm 2013-07-06 15:25:50.000000000 +0100
@@ -1,1604 +1,883 @@ @@ -1,1604 +1,883 @@
P3 P3
-# Standard 224-color Linux logo -# Standard 224-color Linux logo
@ -3399,10 +3394,9 @@ diff -urN linux-3.10/drivers/video/logo/logo_linux_clut224.ppm linux-rpi-3.10.y/
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0
diff -urN linux-3.10/drivers/video/Makefile linux-rpi-3.10.y/drivers/video/Makefile --- a/drivers/video/Makefile
--- linux-3.10/drivers/video/Makefile 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/video/Makefile
+++ linux-rpi-3.10.y/drivers/video/Makefile 2013-07-06 15:25:50.000000000 +0100 @@ -100,6 +100,7 @@ obj-$(CONFIG_FB_PVR2) += pvr
@@ -100,6 +100,7 @@
obj-$(CONFIG_FB_VOODOO1) += sstfb.o obj-$(CONFIG_FB_VOODOO1) += sstfb.o
obj-$(CONFIG_FB_ARMCLCD) += amba-clcd.o obj-$(CONFIG_FB_ARMCLCD) += amba-clcd.o
obj-$(CONFIG_FB_GOLDFISH) += goldfishfb.o obj-$(CONFIG_FB_GOLDFISH) += goldfishfb.o
@ -3410,9 +3404,8 @@ diff -urN linux-3.10/drivers/video/Makefile linux-rpi-3.10.y/drivers/video/Makef
obj-$(CONFIG_FB_68328) += 68328fb.o obj-$(CONFIG_FB_68328) += 68328fb.o
obj-$(CONFIG_FB_GBE) += gbefb.o obj-$(CONFIG_FB_GBE) += gbefb.o
obj-$(CONFIG_FB_CIRRUS) += cirrusfb.o obj-$(CONFIG_FB_CIRRUS) += cirrusfb.o
diff -urN linux-3.10/include/uapi/linux/fb.h linux-rpi-3.10.y/include/uapi/linux/fb.h --- a/include/uapi/linux/fb.h
--- linux-3.10/include/uapi/linux/fb.h 2013-06-30 23:13:29.000000000 +0100 +++ b/include/uapi/linux/fb.h
+++ linux-rpi-3.10.y/include/uapi/linux/fb.h 2013-07-06 15:25:50.000000000 +0100
@@ -34,6 +34,11 @@ @@ -34,6 +34,11 @@
#define FBIOPUT_MODEINFO 0x4617 #define FBIOPUT_MODEINFO 0x4617
#define FBIOGET_DISPINFO 0x4618 #define FBIOGET_DISPINFO 0x4618

206
target/linux/brcm2708/patches-3.10/005-bcm2708-vchiq-driver.patch
View File

@ -1,6 +1,5 @@
diff -urN linux-3.10/drivers/char/broadcom/Kconfig linux-rpi-3.10.y/drivers/char/broadcom/Kconfig --- /dev/null
--- linux-3.10/drivers/char/broadcom/Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/char/broadcom/Kconfig
+++ linux-rpi-3.10.y/drivers/char/broadcom/Kconfig 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,17 @@ @@ -0,0 +1,17 @@
+# +#
+# Broadcom char driver config +# Broadcom char driver config
@ -19,15 +18,13 @@ diff -urN linux-3.10/drivers/char/broadcom/Kconfig linux-rpi-3.10.y/drivers/char
+ help + help
+ Helper for videocore CMA access. + Helper for videocore CMA access.
+ +
diff -urN linux-3.10/drivers/char/broadcom/Makefile linux-rpi-3.10.y/drivers/char/broadcom/Makefile --- /dev/null
--- linux-3.10/drivers/char/broadcom/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/char/broadcom/Makefile
+++ linux-rpi-3.10.y/drivers/char/broadcom/Makefile 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
+obj-$(CONFIG_BCM_VC_CMA) += vc_cma/ +obj-$(CONFIG_BCM_VC_CMA) += vc_cma/
+ +
diff -urN linux-3.10/drivers/char/broadcom/vc_cma/Makefile linux-rpi-3.10.y/drivers/char/broadcom/vc_cma/Makefile --- /dev/null
--- linux-3.10/drivers/char/broadcom/vc_cma/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/char/broadcom/vc_cma/Makefile
+++ linux-rpi-3.10.y/drivers/char/broadcom/vc_cma/Makefile 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,15 @@ @@ -0,0 +1,15 @@
+EXTRA_CFLAGS += -Wall -Wstrict-prototypes -Wno-trigraphs +EXTRA_CFLAGS += -Wall -Wstrict-prototypes -Wno-trigraphs
+EXTRA_CFLAGS += -Werror +EXTRA_CFLAGS += -Werror
@ -44,9 +41,8 @@ diff -urN linux-3.10/drivers/char/broadcom/vc_cma/Makefile linux-rpi-3.10.y/driv
+ +
+vc-cma-objs := vc_cma.o +vc-cma-objs := vc_cma.o
+ +
diff -urN linux-3.10/drivers/char/broadcom/vc_cma/vc_cma.c linux-rpi-3.10.y/drivers/char/broadcom/vc_cma/vc_cma.c --- /dev/null
--- linux-3.10/drivers/char/broadcom/vc_cma/vc_cma.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/char/broadcom/vc_cma/vc_cma.c
+++ linux-rpi-3.10.y/drivers/char/broadcom/vc_cma/vc_cma.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,1145 @@ @@ -0,0 +1,1145 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -1193,18 +1189,18 @@ diff -urN linux-3.10/drivers/char/broadcom/vc_cma/vc_cma.c linux-rpi-3.10.y/driv
+module_exit(vc_cma_exit); +module_exit(vc_cma_exit);
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Broadcom Corporation"); +MODULE_AUTHOR("Broadcom Corporation");
--- linux-3.10/drivers/char/Makefile 2013-06-30 23:13:29.000000000 +0100 --- a/drivers/char/Makefile
+++ linux-rpi-3.10.y/drivers/char/Makefile 2013-07-06 15:25:50.000000000 +0100 +++ b/drivers/char/Makefile
@@ -62,3 +62,6 @@ @@ -62,3 +62,6 @@ obj-$(CONFIG_JS_RTC) += js-rtc.o
js-rtc-y = rtc.o js-rtc-y = rtc.o
obj-$(CONFIG_TILE_SROM) += tile-srom.o obj-$(CONFIG_TILE_SROM) += tile-srom.o
+ +
+obj-$(CONFIG_BRCM_CHAR_DRIVERS) += broadcom/ +obj-$(CONFIG_BRCM_CHAR_DRIVERS) += broadcom/
+ +
--- linux-3.10/drivers/char/Kconfig 2013-06-30 23:13:29.000000000 +0100 --- a/drivers/char/Kconfig
+++ linux-rpi-3.10.y/drivers/char/Kconfig 2013-07-06 15:25:50.000000000 +0100 +++ b/drivers/char/Kconfig
@@ -586,6 +586,8 @@ @@ -586,6 +586,8 @@ config DEVPORT
source "drivers/s390/char/Kconfig" source "drivers/s390/char/Kconfig"
@ -1213,27 +1209,24 @@ diff -urN linux-3.10/drivers/char/broadcom/vc_cma/vc_cma.c linux-rpi-3.10.y/driv
config MSM_SMD_PKT config MSM_SMD_PKT
bool "Enable device interface for some SMD packet ports" bool "Enable device interface for some SMD packet ports"
default n default n
diff -urN linux-3.10/drivers/misc/Kconfig linux-rpi-3.10.y/drivers/misc/Kconfig --- a/drivers/misc/Kconfig
--- linux-3.10/drivers/misc/Kconfig 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/misc/Kconfig
+++ linux-rpi-3.10.y/drivers/misc/Kconfig 2013-07-06 15:25:50.000000000 +0100 @@ -536,4 +536,6 @@ source "drivers/misc/carma/Kconfig"
@@ -536,4 +536,6 @@
source "drivers/misc/altera-stapl/Kconfig" source "drivers/misc/altera-stapl/Kconfig"
source "drivers/misc/mei/Kconfig" source "drivers/misc/mei/Kconfig"
source "drivers/misc/vmw_vmci/Kconfig" source "drivers/misc/vmw_vmci/Kconfig"
+source "drivers/misc/vc04_services/Kconfig" +source "drivers/misc/vc04_services/Kconfig"
endmenu endmenu
+ +
diff -urN linux-3.10/drivers/misc/Makefile linux-rpi-3.10.y/drivers/misc/Makefile --- a/drivers/misc/Makefile
--- linux-3.10/drivers/misc/Makefile 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/misc/Makefile
+++ linux-rpi-3.10.y/drivers/misc/Makefile 2013-07-06 15:25:50.000000000 +0100 @@ -53,3 +53,4 @@ obj-$(CONFIG_INTEL_MEI) += mei/
@@ -53,3 +53,4 @@
obj-$(CONFIG_VMWARE_VMCI) += vmw_vmci/ obj-$(CONFIG_VMWARE_VMCI) += vmw_vmci/
obj-$(CONFIG_LATTICE_ECP3_CONFIG) += lattice-ecp3-config.o obj-$(CONFIG_LATTICE_ECP3_CONFIG) += lattice-ecp3-config.o
obj-$(CONFIG_SRAM) += sram.o obj-$(CONFIG_SRAM) += sram.o
+obj-$(CONFIG_BCM2708_VCHIQ) += vc04_services/ +obj-$(CONFIG_BCM2708_VCHIQ) += vc04_services/
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchi/connections/connection.h linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchi/connections/connection.h --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchi/connections/connection.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchi/connections/connection.h
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchi/connections/connection.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,328 @@ @@ -0,0 +1,328 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -1563,9 +1556,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchi/connections/conne
+#endif /* CONNECTION_H_ */ +#endif /* CONNECTION_H_ */
+ +
+/****************************** End of file **********************************/ +/****************************** End of file **********************************/
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchi/message_drivers/message.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,204 @@ @@ -0,0 +1,204 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -1771,9 +1763,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchi/message_drivers/m
+#endif // _VCHI_MESSAGE_H_ +#endif // _VCHI_MESSAGE_H_
+ +
+/****************************** End of file ***********************************/ +/****************************** End of file ***********************************/
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,224 @@ @@ -0,0 +1,224 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -1999,9 +1990,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchi/vchi_cfg.h linux-
+#endif /* VCHI_CFG_H_ */ +#endif /* VCHI_CFG_H_ */
+ +
+/****************************** End of file **********************************/ +/****************************** End of file **********************************/
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,71 @@ @@ -0,0 +1,71 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -2074,9 +2064,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchi/vchi_cfg_internal
+//#define VCHI_RX_NANOLOCKS +//#define VCHI_RX_NANOLOCKS
+ +
+#endif /*VCHI_CFG_INTERNAL_H_*/ +#endif /*VCHI_CFG_INTERNAL_H_*/
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchi/vchi_common.h linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchi/vchi_common.h --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchi/vchi_common.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchi/vchi_common.h
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchi/vchi_common.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,163 @@ @@ -0,0 +1,163 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -2241,9 +2230,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchi/vchi_common.h lin
+ +
+ +
+#endif // VCHI_COMMON_H_ +#endif // VCHI_COMMON_H_
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchi/vchi.h linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchi/vchi.h --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchi/vchi.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchi/vchi.h
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchi/vchi.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,373 @@ @@ -0,0 +1,373 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -2618,9 +2606,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchi/vchi.h linux-rpi-
+#endif /* VCHI_H_ */ +#endif /* VCHI_H_ */
+ +
+/****************************** End of file **********************************/ +/****************************** End of file **********************************/
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchi/vchi_mh.h --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchi/vchi_mh.h
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchi/vchi_mh.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,42 @@ @@ -0,0 +1,42 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -2664,9 +2651,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchi/vchi_mh.h linux-r
+#define VCHI_MEM_HANDLE_INVALID 0 +#define VCHI_MEM_HANDLE_INVALID 0
+ +
+#endif +#endif
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,538 @@ @@ -0,0 +1,538 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -3206,9 +3192,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835_a
+ +
+ kfree(pagelist); + kfree(pagelist);
+} +}
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,42 @@ @@ -0,0 +1,42 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -3252,9 +3237,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_2835.h
+#define VCHIQ_PLATFORM_FRAGMENTS_COUNT_IDX 1 +#define VCHIQ_PLATFORM_FRAGMENTS_COUNT_IDX 1
+ +
+#endif /* VCHIQ_2835_H */ +#endif /* VCHIQ_2835_H */
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,2806 @@ @@ -0,0 +1,2806 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -6062,9 +6046,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c
+module_exit(vchiq_exit); +module_exit(vchiq_exit);
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Broadcom Corporation"); +MODULE_AUTHOR("Broadcom Corporation");
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,212 @@ @@ -0,0 +1,212 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -6278,9 +6261,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.h
+ +
+ +
+#endif /* VCHIQ_ARM_H */ +#endif /* VCHIQ_ARM_H */
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_info.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,37 @@ @@ -0,0 +1,37 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -6319,9 +6301,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_build_
+const char *vchiq_get_build_version(void); +const char *vchiq_get_build_version(void);
+const char *vchiq_get_build_time(void); +const char *vchiq_get_build_time(void);
+const char *vchiq_get_build_date(void); +const char *vchiq_get_build_date(void);
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,60 @@ @@ -0,0 +1,60 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -6383,9 +6364,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_cfg.h
+#endif +#endif
+ +
+#endif /* VCHIQ_CFG_H */ +#endif /* VCHIQ_CFG_H */
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,119 @@ @@ -0,0 +1,119 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -6506,9 +6486,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connec
+ mutex_unlock(&g_connected_mutex); + mutex_unlock(&g_connected_mutex);
+} +}
+EXPORT_SYMBOL(vchiq_add_connected_callback); +EXPORT_SYMBOL(vchiq_add_connected_callback);
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connected.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,51 @@ @@ -0,0 +1,51 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -6561,9 +6540,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_connec
+ +
+#endif /* VCHIQ_CONNECTED_H */ +#endif /* VCHIQ_CONNECTED_H */
+ +
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,3818 @@ @@ -0,0 +1,3818 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -10383,9 +10361,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c
+ numBytes = 0; + numBytes = 0;
+ } + }
+} +}
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,703 @@ @@ -0,0 +1,703 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -11090,9 +11067,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.h
+ size_t numBytes); + size_t numBytes);
+ +
+#endif +#endif
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genversion 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,89 @@ @@ -0,0 +1,89 @@
+#!/usr/bin/perl -w +#!/usr/bin/perl -w
+ +
@ -11183,9 +11159,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_genver
+EOF +EOF
+ +
+ +
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,41 @@ @@ -0,0 +1,41 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -11228,9 +11203,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq.h linu
+ +
+#endif +#endif
+ +
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,188 @@ @@ -0,0 +1,188 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -11420,9 +11394,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_if.h l
+ short *peer_version); + short *peer_version);
+ +
+#endif /* VCHIQ_IF_H */ +#endif /* VCHIQ_IF_H */
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,129 @@ @@ -0,0 +1,129 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -11553,9 +11526,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_ioctl.
+#define VCHIQ_IOC_MAX 15 +#define VCHIQ_IOC_MAX 15
+ +
+#endif +#endif
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_lib.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,454 @@ @@ -0,0 +1,454 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -12011,9 +11983,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_kern_l
+ +
+ return status; + return status;
+} +}
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,71 @@ @@ -0,0 +1,71 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -12086,9 +12057,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_memdrv
+ const VCHIQ_PLATFORM_DATA_T * platform_data); + const VCHIQ_PLATFORM_DATA_T * platform_data);
+ +
+#endif +#endif
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pagelist.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,58 @@ @@ -0,0 +1,58 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -12148,9 +12118,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_pageli
+} FRAGMENTS_T; +} FRAGMENTS_T;
+ +
+#endif /* VCHIQ_PAGELIST_H */ +#endif /* VCHIQ_PAGELIST_H */
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,243 @@ @@ -0,0 +1,243 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -12395,9 +12364,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_proc.c
+ return proc_info.clients; + return proc_info.clients;
+} +}
+ +
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,815 @@ @@ -0,0 +1,815 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -13214,9 +13182,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_shim.c
+ return ret; + return ret;
+} +}
+EXPORT_SYMBOL(vchi_service_release); +EXPORT_SYMBOL(vchi_service_release);
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,120 @@ @@ -0,0 +1,120 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -13338,9 +13305,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.c
+ +
+ return header; + return header;
+} +}
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,82 @@ @@ -0,0 +1,82 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -13424,9 +13390,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_util.h
+ +
+#endif +#endif
+ +
diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_version.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,59 @@ @@ -0,0 +1,59 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -13487,9 +13452,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_versio
+{ +{
+ return vchiq_build_time; + return vchiq_build_time;
+} +}
diff -urN linux-3.10/drivers/misc/vc04_services/Kconfig linux-rpi-3.10.y/drivers/misc/vc04_services/Kconfig --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/Kconfig
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/Kconfig 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,10 @@ @@ -0,0 +1,10 @@
+config BCM2708_VCHIQ +config BCM2708_VCHIQ
+ tristate "Videocore VCHIQ" + tristate "Videocore VCHIQ"
@ -13501,9 +13465,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/Kconfig linux-rpi-3.10.y/drivers
+ Defaults to Y when the Broadcom Videocore services + Defaults to Y when the Broadcom Videocore services
+ are included in the build, N otherwise. + are included in the build, N otherwise.
+ +
diff -urN linux-3.10/drivers/misc/vc04_services/Makefile linux-rpi-3.10.y/drivers/misc/vc04_services/Makefile --- /dev/null
--- linux-3.10/drivers/misc/vc04_services/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/misc/vc04_services/Makefile
+++ linux-rpi-3.10.y/drivers/misc/vc04_services/Makefile 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,18 @@ @@ -0,0 +1,18 @@
+ifeq ($(CONFIG_MACH_BCM2708),y) +ifeq ($(CONFIG_MACH_BCM2708),y)
+ +
@ -13523,9 +13486,8 @@ diff -urN linux-3.10/drivers/misc/vc04_services/Makefile linux-rpi-3.10.y/driver
+ +
+endif +endif
+ +
diff -urN linux-3.10/include/linux/broadcom/vc_cma.h linux-rpi-3.10.y/include/linux/broadcom/vc_cma.h --- /dev/null
--- linux-3.10/include/linux/broadcom/vc_cma.h 1970-01-01 01:00:00.000000000 +0100 +++ b/include/linux/broadcom/vc_cma.h
+++ linux-rpi-3.10.y/include/linux/broadcom/vc_cma.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
+/***************************************************************************** +/*****************************************************************************
+* Copyright 2012 Broadcom Corporation. All rights reserved. +* Copyright 2012 Broadcom Corporation. All rights reserved.

9
target/linux/brcm2708/patches-3.10/006-Allow-mac-address-to-be-set-in-smsc95xx.patch
View File

@ -1,6 +1,5 @@
diff -urN linux-3.10/drivers/net/usb/smsc95xx.c linux-rpi-3.10.y/drivers/net/usb/smsc95xx.c --- a/drivers/net/usb/smsc95xx.c
--- linux-3.10/drivers/net/usb/smsc95xx.c 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/net/usb/smsc95xx.c
+++ linux-rpi-3.10.y/drivers/net/usb/smsc95xx.c 2013-07-06 15:25:50.000000000 +0100
@@ -61,6 +61,7 @@ @@ -61,6 +61,7 @@
#define SUSPEND_SUSPEND3 (0x08) #define SUSPEND_SUSPEND3 (0x08)
#define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \ #define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \
@ -9,7 +8,7 @@ diff -urN linux-3.10/drivers/net/usb/smsc95xx.c linux-rpi-3.10.y/drivers/net/usb
struct smsc95xx_priv { struct smsc95xx_priv {
u32 mac_cr; u32 mac_cr;
@@ -76,6 +77,10 @@ @@ -76,6 +77,10 @@ static bool turbo_mode = true;
module_param(turbo_mode, bool, 0644); module_param(turbo_mode, bool, 0644);
MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction"); MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");
@ -20,7 +19,7 @@ diff -urN linux-3.10/drivers/net/usb/smsc95xx.c linux-rpi-3.10.y/drivers/net/usb
static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index, static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
u32 *data, int in_pm) u32 *data, int in_pm)
{ {
@@ -765,8 +770,59 @@ @@ -765,8 +770,59 @@ static int smsc95xx_ioctl(struct net_dev
return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL); return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
} }

19
target/linux/brcm2708/patches-3.10/007-bcm2708_hw_random-driver.patch
View File

@ -1,6 +1,5 @@
diff -urN linux-3.10/drivers/char/hw_random/bcm2708-rng.c linux-rpi-3.10.y/drivers/char/hw_random/bcm2708-rng.c --- /dev/null
--- linux-3.10/drivers/char/hw_random/bcm2708-rng.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/char/hw_random/bcm2708-rng.c
+++ linux-rpi-3.10.y/drivers/char/hw_random/bcm2708-rng.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,117 @@ @@ -0,0 +1,117 @@
+/** +/**
+ * Copyright (c) 2010-2012 Broadcom. All rights reserved. + * Copyright (c) 2010-2012 Broadcom. All rights reserved.
@ -119,10 +118,9 @@ diff -urN linux-3.10/drivers/char/hw_random/bcm2708-rng.c linux-rpi-3.10.y/drive
+ +
+MODULE_DESCRIPTION("BCM2708 H/W Random Number Generator (RNG) driver"); +MODULE_DESCRIPTION("BCM2708 H/W Random Number Generator (RNG) driver");
+MODULE_LICENSE("GPL and additional rights"); +MODULE_LICENSE("GPL and additional rights");
diff -urN linux-3.10/drivers/char/hw_random/Kconfig linux-rpi-3.10.y/drivers/char/hw_random/Kconfig --- a/drivers/char/hw_random/Kconfig
--- linux-3.10/drivers/char/hw_random/Kconfig 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/char/hw_random/Kconfig
+++ linux-rpi-3.10.y/drivers/char/hw_random/Kconfig 2013-07-06 15:25:50.000000000 +0100 @@ -314,3 +314,15 @@ config HW_RANDOM_TPM
@@ -314,3 +314,15 @@
module will be called tpm-rng. module will be called tpm-rng.
If unsure, say Y. If unsure, say Y.
@ -138,10 +136,9 @@ diff -urN linux-3.10/drivers/char/hw_random/Kconfig linux-rpi-3.10.y/drivers/cha
+ +
+ If unsure, say N. + If unsure, say N.
+ +
diff -urN linux-3.10/drivers/char/hw_random/Makefile linux-rpi-3.10.y/drivers/char/hw_random/Makefile --- a/drivers/char/hw_random/Makefile
--- linux-3.10/drivers/char/hw_random/Makefile 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/char/hw_random/Makefile
+++ linux-rpi-3.10.y/drivers/char/hw_random/Makefile 2013-07-06 15:25:50.000000000 +0100 @@ -27,3 +27,4 @@ obj-$(CONFIG_HW_RANDOM_PSERIES) += pseri
@@ -27,3 +27,4 @@
obj-$(CONFIG_HW_RANDOM_EXYNOS) += exynos-rng.o obj-$(CONFIG_HW_RANDOM_EXYNOS) += exynos-rng.o
obj-$(CONFIG_HW_RANDOM_TPM) += tpm-rng.o obj-$(CONFIG_HW_RANDOM_TPM) += tpm-rng.o
obj-$(CONFIG_HW_RANDOM_BCM2835) += bcm2835-rng.o obj-$(CONFIG_HW_RANDOM_BCM2835) += bcm2835-rng.o

19
target/linux/brcm2708/patches-3.10/008-lirc_rpi_driver.patch
View File

@ -1,7 +1,6 @@
diff -urN linux-3.10/drivers/staging/media/lirc/Kconfig linux-rpi-3.10.y/drivers/staging/media/lirc/Kconfig --- a/drivers/staging/media/lirc/Kconfig
--- linux-3.10/drivers/staging/media/lirc/Kconfig 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/staging/media/lirc/Kconfig
+++ linux-rpi-3.10.y/drivers/staging/media/lirc/Kconfig 2013-07-06 15:25:50.000000000 +0100 @@ -38,6 +38,12 @@ config LIRC_PARALLEL
@@ -38,6 +38,12 @@
help help
Driver for Homebrew Parallel Port Receivers Driver for Homebrew Parallel Port Receivers
@ -14,9 +13,8 @@ diff -urN linux-3.10/drivers/staging/media/lirc/Kconfig linux-rpi-3.10.y/drivers
config LIRC_SASEM config LIRC_SASEM
tristate "Sasem USB IR Remote" tristate "Sasem USB IR Remote"
depends on LIRC && USB depends on LIRC && USB
diff -urN linux-3.10/drivers/staging/media/lirc/lirc_rpi.c linux-rpi-3.10.y/drivers/staging/media/lirc/lirc_rpi.c --- /dev/null
--- linux-3.10/drivers/staging/media/lirc/lirc_rpi.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/staging/media/lirc/lirc_rpi.c
+++ linux-rpi-3.10.y/drivers/staging/media/lirc/lirc_rpi.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,692 @@ @@ -0,0 +1,692 @@
+/* +/*
+ * lirc_rpi.c + * lirc_rpi.c
@ -710,10 +708,9 @@ diff -urN linux-3.10/drivers/staging/media/lirc/lirc_rpi.c linux-rpi-3.10.y/driv
+ +
+module_param(debug, bool, S_IRUGO | S_IWUSR); +module_param(debug, bool, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(debug, "Enable debugging messages"); +MODULE_PARM_DESC(debug, "Enable debugging messages");
diff -urN linux-3.10/drivers/staging/media/lirc/Makefile linux-rpi-3.10.y/drivers/staging/media/lirc/Makefile --- a/drivers/staging/media/lirc/Makefile
--- linux-3.10/drivers/staging/media/lirc/Makefile 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/staging/media/lirc/Makefile
+++ linux-rpi-3.10.y/drivers/staging/media/lirc/Makefile 2013-07-06 15:25:50.000000000 +0100 @@ -7,6 +7,7 @@ obj-$(CONFIG_LIRC_BT829) += lirc_bt829.o
@@ -7,6 +7,7 @@
obj-$(CONFIG_LIRC_IGORPLUGUSB) += lirc_igorplugusb.o obj-$(CONFIG_LIRC_IGORPLUGUSB) += lirc_igorplugusb.o
obj-$(CONFIG_LIRC_IMON) += lirc_imon.o obj-$(CONFIG_LIRC_IMON) += lirc_imon.o
obj-$(CONFIG_LIRC_PARALLEL) += lirc_parallel.o obj-$(CONFIG_LIRC_PARALLEL) += lirc_parallel.o

19
target/linux/brcm2708/patches-3.10/009-bcm2708-spi-driver.patch
View File

@ -1,7 +1,6 @@
diff -urN linux-3.10/drivers/spi/Kconfig linux-rpi-3.10.y/drivers/spi/Kconfig --- a/drivers/spi/Kconfig
--- linux-3.10/drivers/spi/Kconfig 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/spi/Kconfig
+++ linux-rpi-3.10.y/drivers/spi/Kconfig 2013-07-06 15:25:50.000000000 +0100 @@ -86,6 +86,14 @@ config SPI_BCM2835
@@ -86,6 +86,14 @@
is for the regular SPI controller. Slave mode operation is not also is for the regular SPI controller. Slave mode operation is not also
not supported. not supported.
@ -16,10 +15,9 @@ diff -urN linux-3.10/drivers/spi/Kconfig linux-rpi-3.10.y/drivers/spi/Kconfig
config SPI_BFIN5XX config SPI_BFIN5XX
tristate "SPI controller driver for ADI Blackfin5xx" tristate "SPI controller driver for ADI Blackfin5xx"
depends on BLACKFIN depends on BLACKFIN
diff -urN linux-3.10/drivers/spi/Makefile linux-rpi-3.10.y/drivers/spi/Makefile --- a/drivers/spi/Makefile
--- linux-3.10/drivers/spi/Makefile 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/spi/Makefile
+++ linux-rpi-3.10.y/drivers/spi/Makefile 2013-07-06 15:25:50.000000000 +0100 @@ -17,6 +17,7 @@ obj-$(CONFIG_SPI_AU1550) += spi-au1550.
@@ -17,6 +17,7 @@
obj-$(CONFIG_SPI_BCM2835) += spi-bcm2835.o obj-$(CONFIG_SPI_BCM2835) += spi-bcm2835.o
obj-$(CONFIG_SPI_BCM63XX) += spi-bcm63xx.o obj-$(CONFIG_SPI_BCM63XX) += spi-bcm63xx.o
obj-$(CONFIG_SPI_BFIN5XX) += spi-bfin5xx.o obj-$(CONFIG_SPI_BFIN5XX) += spi-bfin5xx.o
@ -27,9 +25,8 @@ diff -urN linux-3.10/drivers/spi/Makefile linux-rpi-3.10.y/drivers/spi/Makefile
obj-$(CONFIG_SPI_BFIN_SPORT) += spi-bfin-sport.o obj-$(CONFIG_SPI_BFIN_SPORT) += spi-bfin-sport.o
obj-$(CONFIG_SPI_BITBANG) += spi-bitbang.o obj-$(CONFIG_SPI_BITBANG) += spi-bitbang.o
obj-$(CONFIG_SPI_BUTTERFLY) += spi-butterfly.o obj-$(CONFIG_SPI_BUTTERFLY) += spi-butterfly.o
diff -urN linux-3.10/drivers/spi/spi-bcm2708.c linux-rpi-3.10.y/drivers/spi/spi-bcm2708.c --- /dev/null
--- linux-3.10/drivers/spi/spi-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/spi/spi-bcm2708.c
+++ linux-rpi-3.10.y/drivers/spi/spi-bcm2708.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,626 @@ @@ -0,0 +1,626 @@
+/* +/*
+ * Driver for Broadcom BCM2708 SPI Controllers + * Driver for Broadcom BCM2708 SPI Controllers

19
target/linux/brcm2708/patches-3.10/010-bcm2835-thermal-driver.patch
View File

@ -1,6 +1,5 @@
diff -urN linux-3.10/drivers/thermal/bcm2835-thermal.c linux-rpi-3.10.y/drivers/thermal/bcm2835-thermal.c --- /dev/null
--- linux-3.10/drivers/thermal/bcm2835-thermal.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/thermal/bcm2835-thermal.c
+++ linux-rpi-3.10.y/drivers/thermal/bcm2835-thermal.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,184 @@ @@ -0,0 +1,184 @@
+/***************************************************************************** +/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved. +* Copyright 2011 Broadcom Corporation. All rights reserved.
@ -186,10 +185,9 @@ diff -urN linux-3.10/drivers/thermal/bcm2835-thermal.c linux-rpi-3.10.y/drivers/
+MODULE_DESCRIPTION("Thermal driver for bcm2835 chip"); +MODULE_DESCRIPTION("Thermal driver for bcm2835 chip");
+ +
+module_platform_driver(bcm2835_thermal_driver); +module_platform_driver(bcm2835_thermal_driver);
diff -urN linux-3.10/drivers/thermal/Kconfig linux-rpi-3.10.y/drivers/thermal/Kconfig --- a/drivers/thermal/Kconfig
--- linux-3.10/drivers/thermal/Kconfig 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/thermal/Kconfig
+++ linux-rpi-3.10.y/drivers/thermal/Kconfig 2013-07-06 15:25:50.000000000 +0100 @@ -169,4 +169,11 @@ config INTEL_POWERCLAMP
@@ -169,4 +169,11 @@
enforce idle time which results in more package C-state residency. The enforce idle time which results in more package C-state residency. The
user interface is exposed via generic thermal framework. user interface is exposed via generic thermal framework.
@ -201,10 +199,9 @@ diff -urN linux-3.10/drivers/thermal/Kconfig linux-rpi-3.10.y/drivers/thermal/Kc
+ +
endif endif
+ +
diff -urN linux-3.10/drivers/thermal/Makefile linux-rpi-3.10.y/drivers/thermal/Makefile --- a/drivers/thermal/Makefile
--- linux-3.10/drivers/thermal/Makefile 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/thermal/Makefile
+++ linux-rpi-3.10.y/drivers/thermal/Makefile 2013-07-06 15:25:50.000000000 +0100 @@ -23,4 +23,5 @@ obj-$(CONFIG_DB8500_THERMAL) += db8500_t
@@ -23,4 +23,5 @@
obj-$(CONFIG_ARMADA_THERMAL) += armada_thermal.o obj-$(CONFIG_ARMADA_THERMAL) += armada_thermal.o
obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o
obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.o obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.o

19
target/linux/brcm2708/patches-3.10/011-bcm2835-cpufreq-driver.patch
View File

@ -1,6 +1,5 @@
diff -urN linux-3.10/drivers/cpufreq/bcm2835-cpufreq.c linux-rpi-3.10.y/drivers/cpufreq/bcm2835-cpufreq.c --- /dev/null
--- linux-3.10/drivers/cpufreq/bcm2835-cpufreq.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/cpufreq/bcm2835-cpufreq.c
+++ linux-rpi-3.10.y/drivers/cpufreq/bcm2835-cpufreq.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,239 @@ @@ -0,0 +1,239 @@
+/***************************************************************************** +/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved. +* Copyright 2011 Broadcom Corporation. All rights reserved.
@ -241,10 +240,9 @@ diff -urN linux-3.10/drivers/cpufreq/bcm2835-cpufreq.c linux-rpi-3.10.y/drivers/
+module_init(bcm2835_cpufreq_module_init); +module_init(bcm2835_cpufreq_module_init);
+module_exit(bcm2835_cpufreq_module_exit); +module_exit(bcm2835_cpufreq_module_exit);
+ +
diff -urN linux-3.10/drivers/cpufreq/Kconfig.arm linux-rpi-3.10.y/drivers/cpufreq/Kconfig.arm --- a/drivers/cpufreq/Kconfig.arm
--- linux-3.10/drivers/cpufreq/Kconfig.arm 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/cpufreq/Kconfig.arm
+++ linux-rpi-3.10.y/drivers/cpufreq/Kconfig.arm 2013-07-06 15:25:50.000000000 +0100 @@ -150,3 +150,11 @@ config ARM_SPEAR_CPUFREQ
@@ -150,3 +150,11 @@
default y default y
help help
This adds the CPUFreq driver support for SPEAr SOCs. This adds the CPUFreq driver support for SPEAr SOCs.
@ -256,10 +254,9 @@ diff -urN linux-3.10/drivers/cpufreq/Kconfig.arm linux-rpi-3.10.y/drivers/cpufre
+ This adds the CPUFreq driver for BCM2835 + This adds the CPUFreq driver for BCM2835
+ +
+ If in doubt, say N. + If in doubt, say N.
diff -urN linux-3.10/drivers/cpufreq/Makefile linux-rpi-3.10.y/drivers/cpufreq/Makefile --- a/drivers/cpufreq/Makefile
--- linux-3.10/drivers/cpufreq/Makefile 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/cpufreq/Makefile
+++ linux-rpi-3.10.y/drivers/cpufreq/Makefile 2013-07-06 15:25:50.000000000 +0100 @@ -72,6 +72,7 @@ obj-$(CONFIG_ARM_SA1100_CPUFREQ) += sa11
@@ -72,6 +72,7 @@
obj-$(CONFIG_ARM_SA1110_CPUFREQ) += sa1110-cpufreq.o obj-$(CONFIG_ARM_SA1110_CPUFREQ) += sa1110-cpufreq.o
obj-$(CONFIG_ARM_SPEAR_CPUFREQ) += spear-cpufreq.o obj-$(CONFIG_ARM_SPEAR_CPUFREQ) += spear-cpufreq.o
obj-$(CONFIG_ARCH_TEGRA) += tegra-cpufreq.o obj-$(CONFIG_ARCH_TEGRA) += tegra-cpufreq.o

44
target/linux/brcm2708/patches-3.10/012-bcm2708-sound-driver.patch
View File

@ -1,6 +1,5 @@
diff -urN linux-3.10/sound/arm/bcm2835.c linux-rpi-3.10.y/sound/arm/bcm2835.c --- /dev/null
--- linux-3.10/sound/arm/bcm2835.c 1970-01-01 01:00:00.000000000 +0100 +++ b/sound/arm/bcm2835.c
+++ linux-rpi-3.10.y/sound/arm/bcm2835.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,413 @@ @@ -0,0 +1,413 @@
+/***************************************************************************** +/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved. +* Copyright 2011 Broadcom Corporation. All rights reserved.
@ -415,9 +414,8 @@ diff -urN linux-3.10/sound/arm/bcm2835.c linux-rpi-3.10.y/sound/arm/bcm2835.c
+MODULE_DESCRIPTION("Alsa driver for BCM2835 chip"); +MODULE_DESCRIPTION("Alsa driver for BCM2835 chip");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:bcm2835_alsa"); +MODULE_ALIAS("platform:bcm2835_alsa");
diff -urN linux-3.10/sound/arm/bcm2835-ctl.c linux-rpi-3.10.y/sound/arm/bcm2835-ctl.c --- /dev/null
--- linux-3.10/sound/arm/bcm2835-ctl.c 1970-01-01 01:00:00.000000000 +0100 +++ b/sound/arm/bcm2835-ctl.c
+++ linux-rpi-3.10.y/sound/arm/bcm2835-ctl.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,200 @@ @@ -0,0 +1,200 @@
+/***************************************************************************** +/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved. +* Copyright 2011 Broadcom Corporation. All rights reserved.
@ -619,9 +617,8 @@ diff -urN linux-3.10/sound/arm/bcm2835-ctl.c linux-rpi-3.10.y/sound/arm/bcm2835-
+ } + }
+ return 0; + return 0;
+} +}
diff -urN linux-3.10/sound/arm/bcm2835.h linux-rpi-3.10.y/sound/arm/bcm2835.h --- /dev/null
--- linux-3.10/sound/arm/bcm2835.h 1970-01-01 01:00:00.000000000 +0100 +++ b/sound/arm/bcm2835.h
+++ linux-rpi-3.10.y/sound/arm/bcm2835.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,157 @@ @@ -0,0 +1,157 @@
+/***************************************************************************** +/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved. +* Copyright 2011 Broadcom Corporation. All rights reserved.
@ -780,9 +777,8 @@ diff -urN linux-3.10/sound/arm/bcm2835.h linux-rpi-3.10.y/sound/arm/bcm2835.h
+void bcm2835_audio_flush_playback_buffers(bcm2835_alsa_stream_t * alsa_stream); +void bcm2835_audio_flush_playback_buffers(bcm2835_alsa_stream_t * alsa_stream);
+ +
+#endif /* __SOUND_ARM_BCM2835_H */ +#endif /* __SOUND_ARM_BCM2835_H */
diff -urN linux-3.10/sound/arm/bcm2835-pcm.c linux-rpi-3.10.y/sound/arm/bcm2835-pcm.c --- /dev/null
--- linux-3.10/sound/arm/bcm2835-pcm.c 1970-01-01 01:00:00.000000000 +0100 +++ b/sound/arm/bcm2835-pcm.c
+++ linux-rpi-3.10.y/sound/arm/bcm2835-pcm.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,426 @@ @@ -0,0 +1,426 @@
+/***************************************************************************** +/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved. +* Copyright 2011 Broadcom Corporation. All rights reserved.
@ -1210,9 +1206,8 @@ diff -urN linux-3.10/sound/arm/bcm2835-pcm.c linux-rpi-3.10.y/sound/arm/bcm2835-
+ +
+ return 0; + return 0;
+} +}
diff -urN linux-3.10/sound/arm/bcm2835-vchiq.c linux-rpi-3.10.y/sound/arm/bcm2835-vchiq.c --- /dev/null
--- linux-3.10/sound/arm/bcm2835-vchiq.c 1970-01-01 01:00:00.000000000 +0100 +++ b/sound/arm/bcm2835-vchiq.c
+++ linux-rpi-3.10.y/sound/arm/bcm2835-vchiq.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,879 @@ @@ -0,0 +1,879 @@
+/***************************************************************************** +/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved. +* Copyright 2011 Broadcom Corporation. All rights reserved.
@ -2093,10 +2088,9 @@ diff -urN linux-3.10/sound/arm/bcm2835-vchiq.c linux-rpi-3.10.y/sound/arm/bcm283
+ +
+module_param(force_bulk, bool, 0444); +module_param(force_bulk, bool, 0444);
+MODULE_PARM_DESC(force_bulk, "Force use of vchiq bulk for audio"); +MODULE_PARM_DESC(force_bulk, "Force use of vchiq bulk for audio");
diff -urN linux-3.10/sound/arm/Kconfig linux-rpi-3.10.y/sound/arm/Kconfig --- a/sound/arm/Kconfig
--- linux-3.10/sound/arm/Kconfig 2013-06-30 23:13:29.000000000 +0100 +++ b/sound/arm/Kconfig
+++ linux-rpi-3.10.y/sound/arm/Kconfig 2013-07-06 15:25:50.000000000 +0100 @@ -39,5 +39,12 @@ config SND_PXA2XX_AC97
@@ -39,5 +39,12 @@
Say Y or M if you want to support any AC97 codec attached to Say Y or M if you want to support any AC97 codec attached to
the PXA2xx AC97 interface. the PXA2xx AC97 interface.
@ -2109,10 +2103,9 @@ diff -urN linux-3.10/sound/arm/Kconfig linux-rpi-3.10.y/sound/arm/Kconfig
+ +
endif # SND_ARM endif # SND_ARM
diff -urN linux-3.10/sound/arm/Makefile linux-rpi-3.10.y/sound/arm/Makefile --- a/sound/arm/Makefile
--- linux-3.10/sound/arm/Makefile 2013-06-30 23:13:29.000000000 +0100 +++ b/sound/arm/Makefile
+++ linux-rpi-3.10.y/sound/arm/Makefile 2013-07-06 15:25:50.000000000 +0100 @@ -14,3 +14,9 @@ snd-pxa2xx-lib-$(CONFIG_SND_PXA2XX_LIB_A
@@ -14,3 +14,9 @@
obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o
snd-pxa2xx-ac97-objs := pxa2xx-ac97.o snd-pxa2xx-ac97-objs := pxa2xx-ac97.o
@ -2122,9 +2115,8 @@ diff -urN linux-3.10/sound/arm/Makefile linux-rpi-3.10.y/sound/arm/Makefile
+ +
+EXTRA_CFLAGS += -Idrivers/misc/vc04_services -Idrivers/misc/vc04_services/interface/vcos/linuxkernel -D__VCCOREVER__=0x04000000 +EXTRA_CFLAGS += -Idrivers/misc/vc04_services -Idrivers/misc/vc04_services/interface/vcos/linuxkernel -D__VCCOREVER__=0x04000000
+ +
diff -urN linux-3.10/sound/arm/vc_vchi_audioserv_defs.h linux-rpi-3.10.y/sound/arm/vc_vchi_audioserv_defs.h --- /dev/null
--- linux-3.10/sound/arm/vc_vchi_audioserv_defs.h 1970-01-01 01:00:00.000000000 +0100 +++ b/sound/arm/vc_vchi_audioserv_defs.h
+++ linux-rpi-3.10.y/sound/arm/vc_vchi_audioserv_defs.h 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,116 @@ @@ -0,0 +1,116 @@
+/***************************************************************************** +/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved. +* Copyright 2011 Broadcom Corporation. All rights reserved.

22
target/linux/brcm2708/patches-3.10/013-bcm2835-hwmon-driver.patch
View File

@ -1,7 +1,5 @@
Index: linux-3.10/drivers/hwmon/bcm2835-hwmon.c --- /dev/null
=================================================================== +++ b/drivers/hwmon/bcm2835-hwmon.c
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-3.10/drivers/hwmon/bcm2835-hwmon.c 2013-07-09 20:25:51.309324091 +0100
@@ -0,0 +1,219 @@ @@ -0,0 +1,219 @@
+/***************************************************************************** +/*****************************************************************************
+* Copyright 2011 Broadcom Corporation. All rights reserved. +* Copyright 2011 Broadcom Corporation. All rights reserved.
@ -222,11 +220,9 @@ Index: linux-3.10/drivers/hwmon/bcm2835-hwmon.c
+MODULE_DESCRIPTION("HW Monitor driver for bcm2835 chip"); +MODULE_DESCRIPTION("HW Monitor driver for bcm2835 chip");
+ +
+module_platform_driver(bcm2835_hwmon_driver); +module_platform_driver(bcm2835_hwmon_driver);
Index: linux-3.10/drivers/hwmon/Kconfig --- a/drivers/hwmon/Kconfig
=================================================================== +++ b/drivers/hwmon/Kconfig
--- linux-3.10.orig/drivers/hwmon/Kconfig 2013-07-09 20:25:51.321324159 +0100 @@ -1537,6 +1537,16 @@ config SENSORS_MC13783_ADC
+++ linux-3.10/drivers/hwmon/Kconfig 2013-07-09 20:25:51.313324108 +0100
@@ -1537,6 +1537,16 @@
help help
Support for the A/D converter on MC13783 and MC13892 PMIC. Support for the A/D converter on MC13783 and MC13892 PMIC.
@ -243,11 +239,9 @@ Index: linux-3.10/drivers/hwmon/Kconfig
if ACPI if ACPI
comment "ACPI drivers" comment "ACPI drivers"
Index: linux-3.10/drivers/hwmon/Makefile --- a/drivers/hwmon/Makefile
=================================================================== +++ b/drivers/hwmon/Makefile
--- linux-3.10.orig/drivers/hwmon/Makefile 2013-07-09 20:25:51.321324159 +0100 @@ -141,6 +141,7 @@ obj-$(CONFIG_SENSORS_W83L786NG) += w83l7
+++ linux-3.10/drivers/hwmon/Makefile 2013-07-09 20:26:07.361403698 +0100
@@ -141,6 +141,7 @@
obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o
obj-$(CONFIG_SENSORS_WM8350) += wm8350-hwmon.o obj-$(CONFIG_SENSORS_WM8350) += wm8350-hwmon.o
obj-$(CONFIG_SENSORS_GSC) += gsc.o obj-$(CONFIG_SENSORS_GSC) += gsc.o

177
target/linux/brcm2708/patches-3.10/014-bcm2708-sdhci-driver.patch
View File

@ -1,7 +1,6 @@
diff -urwN linux-3.10/drivers/mmc/card/block.c linux-rpi-3.10.y/drivers/mmc/card/block.c --- a/drivers/mmc/card/block.c
--- linux-3.10/drivers/mmc/card/block.c 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/mmc/card/block.c
+++ linux-rpi-3.10.y/drivers/mmc/card/block.c 2013-07-06 15:25:50.000000000 +0100 @@ -1294,7 +1294,7 @@ static void mmc_blk_rw_rq_prep(struct mm
@@ -1294,7 +1294,7 @@
brq->data.blocks = 1; brq->data.blocks = 1;
} }
@ -10,9 +9,8 @@ diff -urwN linux-3.10/drivers/mmc/card/block.c linux-rpi-3.10.y/drivers/mmc/card
/* SPI multiblock writes terminate using a special /* SPI multiblock writes terminate using a special
* token, not a STOP_TRANSMISSION request. * token, not a STOP_TRANSMISSION request.
*/ */
diff -urwN linux-3.10/drivers/mmc/core/sd.c linux-rpi-3.10.y/drivers/mmc/core/sd.c --- a/drivers/mmc/core/sd.c
--- linux-3.10/drivers/mmc/core/sd.c 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/mmc/core/sd.c
+++ linux-rpi-3.10.y/drivers/mmc/core/sd.c 2013-07-06 15:25:50.000000000 +0100
@@ -13,6 +13,8 @@ @@ -13,6 +13,8 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/slab.h> #include <linux/slab.h>
@ -22,7 +20,7 @@ diff -urwN linux-3.10/drivers/mmc/core/sd.c linux-rpi-3.10.y/drivers/mmc/core/sd
#include <linux/mmc/host.h> #include <linux/mmc/host.h>
#include <linux/mmc/card.h> #include <linux/mmc/card.h>
@@ -58,6 +60,15 @@ @@ -58,6 +60,15 @@ static const unsigned int tacc_mant[] =
__res & __mask; \ __res & __mask; \
}) })
@ -38,7 +36,7 @@ diff -urwN linux-3.10/drivers/mmc/core/sd.c linux-rpi-3.10.y/drivers/mmc/core/sd
/* /*
* Given the decoded CSD structure, decode the raw CID to our CID structure. * Given the decoded CSD structure, decode the raw CID to our CID structure.
*/ */
@@ -210,12 +221,62 @@ @@ -210,12 +221,62 @@ static int mmc_decode_scr(struct mmc_car
} }
/* /*
@ -103,7 +101,7 @@ diff -urwN linux-3.10/drivers/mmc/core/sd.c linux-rpi-3.10.y/drivers/mmc/core/sd
u32 *ssr; u32 *ssr;
if (!(card->csd.cmdclass & CCC_APP_SPEC)) { if (!(card->csd.cmdclass & CCC_APP_SPEC)) {
@@ -228,14 +289,40 @@ @@ -228,14 +289,40 @@ static int mmc_read_ssr(struct mmc_card
if (!ssr) if (!ssr)
return -ENOMEM; return -ENOMEM;
@ -148,7 +146,7 @@ diff -urwN linux-3.10/drivers/mmc/core/sd.c linux-rpi-3.10.y/drivers/mmc/core/sd
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
ssr[i] = be32_to_cpu(ssr[i]); ssr[i] = be32_to_cpu(ssr[i]);
@@ -808,13 +895,9 @@ @@ -808,13 +895,9 @@ int mmc_sd_setup_card(struct mmc_host *h
if (!reinit) { if (!reinit) {
/* /*
@ -164,10 +162,9 @@ diff -urwN linux-3.10/drivers/mmc/core/sd.c linux-rpi-3.10.y/drivers/mmc/core/sd
if (err) if (err)
return err; return err;
diff -urwN linux-3.10/drivers/mmc/host/Kconfig linux-rpi-3.10.y/drivers/mmc/host/Kconfig --- a/drivers/mmc/host/Kconfig
--- linux-3.10/drivers/mmc/host/Kconfig 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/mmc/host/Kconfig
+++ linux-rpi-3.10.y/drivers/mmc/host/Kconfig 2013-07-06 15:25:50.000000000 +0100 @@ -249,6 +249,27 @@ config MMC_SDHCI_S3C_DMA
@@ -249,6 +249,27 @@
YMMV. YMMV.
@ -195,10 +192,9 @@ diff -urwN linux-3.10/drivers/mmc/host/Kconfig linux-rpi-3.10.y/drivers/mmc/host
config MMC_SDHCI_BCM2835 config MMC_SDHCI_BCM2835
tristate "SDHCI platform support for the BCM2835 SD/MMC Controller" tristate "SDHCI platform support for the BCM2835 SD/MMC Controller"
depends on ARCH_BCM2835 depends on ARCH_BCM2835
diff -urwN linux-3.10/drivers/mmc/host/Makefile linux-rpi-3.10.y/drivers/mmc/host/Makefile --- a/drivers/mmc/host/Makefile
--- linux-3.10/drivers/mmc/host/Makefile 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/mmc/host/Makefile
+++ linux-rpi-3.10.y/drivers/mmc/host/Makefile 2013-07-06 15:25:50.000000000 +0100 @@ -15,6 +15,7 @@ obj-$(CONFIG_MMC_SDHCI_PXAV2) += sdhci-p
@@ -15,6 +15,7 @@
obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o
obj-$(CONFIG_MMC_SDHCI_SIRF) += sdhci-sirf.o obj-$(CONFIG_MMC_SDHCI_SIRF) += sdhci-sirf.o
obj-$(CONFIG_MMC_SDHCI_SPEAR) += sdhci-spear.o obj-$(CONFIG_MMC_SDHCI_SPEAR) += sdhci-spear.o
@ -206,9 +202,8 @@ diff -urwN linux-3.10/drivers/mmc/host/Makefile linux-rpi-3.10.y/drivers/mmc/hos
obj-$(CONFIG_MMC_WBSD) += wbsd.o obj-$(CONFIG_MMC_WBSD) += wbsd.o
obj-$(CONFIG_MMC_AU1X) += au1xmmc.o obj-$(CONFIG_MMC_AU1X) += au1xmmc.o
obj-$(CONFIG_MMC_OMAP) += omap.o obj-$(CONFIG_MMC_OMAP) += omap.o
diff -urwN linux-3.10/drivers/mmc/host/sdhci-bcm2708.c linux-rpi-3.10.y/drivers/mmc/host/sdhci-bcm2708.c --- /dev/null
--- linux-3.10/drivers/mmc/host/sdhci-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/mmc/host/sdhci-bcm2708.c
+++ linux-rpi-3.10.y/drivers/mmc/host/sdhci-bcm2708.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,1420 @@ @@ -0,0 +1,1420 @@
+/* +/*
+ * sdhci-bcm2708.c Support for SDHCI device on BCM2708 + * sdhci-bcm2708.c Support for SDHCI device on BCM2708
@ -1630,9 +1625,8 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci-bcm2708.c linux-rpi-3.10.y/drivers/
+MODULE_PARM_DESC(extra_messages, "Enable more sdcard warning messages"); +MODULE_PARM_DESC(extra_messages, "Enable more sdcard warning messages");
+ +
+ +
diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host/sdhci.c --- a/drivers/mmc/host/sdhci.c
--- linux-3.10/drivers/mmc/host/sdhci.c 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/mmc/host/sdhci.c
+++ linux-rpi-3.10.y/drivers/mmc/host/sdhci.c 2013-07-06 15:25:50.000000000 +0100
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
#include <linux/mmc/mmc.h> #include <linux/mmc/mmc.h>
#include <linux/mmc/host.h> #include <linux/mmc/host.h>
@ -1641,7 +1635,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
#include <linux/mmc/slot-gpio.h> #include <linux/mmc/slot-gpio.h>
#include "sdhci.h" #include "sdhci.h"
@@ -123,6 +124,91 @@ @@ -123,6 +124,91 @@ static void sdhci_dumpregs(struct sdhci_
* Low level functions * * Low level functions *
* * * *
\*****************************************************************************/ \*****************************************************************************/
@ -1733,7 +1727,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
static void sdhci_clear_set_irqs(struct sdhci_host *host, u32 clear, u32 set) static void sdhci_clear_set_irqs(struct sdhci_host *host, u32 clear, u32 set)
{ {
@@ -288,7 +374,7 @@ @@ -288,7 +374,7 @@ static void sdhci_led_control(struct led
struct sdhci_host *host = container_of(led, struct sdhci_host, led); struct sdhci_host *host = container_of(led, struct sdhci_host, led);
unsigned long flags; unsigned long flags;
@ -1742,7 +1736,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
if (host->runtime_suspended) if (host->runtime_suspended)
goto out; goto out;
@@ -298,7 +384,7 @@ @@ -298,7 +384,7 @@ static void sdhci_led_control(struct led
else else
sdhci_activate_led(host); sdhci_activate_led(host);
out: out:
@ -1751,7 +1745,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
} }
#endif #endif
@@ -315,7 +401,7 @@ @@ -315,7 +401,7 @@ static void sdhci_read_block_pio(struct
u32 uninitialized_var(scratch); u32 uninitialized_var(scratch);
u8 *buf; u8 *buf;
@ -1760,7 +1754,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
blksize = host->data->blksz; blksize = host->data->blksz;
chunk = 0; chunk = 0;
@@ -360,7 +446,7 @@ @@ -360,7 +446,7 @@ static void sdhci_write_block_pio(struct
u32 scratch; u32 scratch;
u8 *buf; u8 *buf;
@ -1769,7 +1763,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
blksize = host->data->blksz; blksize = host->data->blksz;
chunk = 0; chunk = 0;
@@ -399,19 +485,28 @@ @@ -399,19 +485,28 @@ static void sdhci_write_block_pio(struct
local_irq_restore(flags); local_irq_restore(flags);
} }
@ -1801,7 +1795,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
/* /*
* Some controllers (JMicron JMB38x) mess up the buffer bits * Some controllers (JMicron JMB38x) mess up the buffer bits
@@ -422,7 +517,7 @@ @@ -422,7 +517,7 @@ static void sdhci_transfer_pio(struct sd
(host->data->blocks == 1)) (host->data->blocks == 1))
mask = ~0; mask = ~0;
@ -1810,7 +1804,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
if (host->quirks & SDHCI_QUIRK_PIO_NEEDS_DELAY) if (host->quirks & SDHCI_QUIRK_PIO_NEEDS_DELAY)
udelay(100); udelay(100);
@@ -434,9 +529,11 @@ @@ -434,9 +529,11 @@ static void sdhci_transfer_pio(struct sd
host->blocks--; host->blocks--;
if (host->blocks == 0) if (host->blocks == 0)
break; break;
@ -1823,7 +1817,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
} }
static char *sdhci_kmap_atomic(struct scatterlist *sg, unsigned long *flags) static char *sdhci_kmap_atomic(struct scatterlist *sg, unsigned long *flags)
@@ -709,7 +806,9 @@ @@ -709,7 +806,9 @@ static void sdhci_set_transfer_irqs(stru
u32 pio_irqs = SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL; u32 pio_irqs = SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL;
u32 dma_irqs = SDHCI_INT_DMA_END | SDHCI_INT_ADMA_ERROR; u32 dma_irqs = SDHCI_INT_DMA_END | SDHCI_INT_ADMA_ERROR;
@ -1834,7 +1828,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
sdhci_clear_set_irqs(host, pio_irqs, dma_irqs); sdhci_clear_set_irqs(host, pio_irqs, dma_irqs);
else else
sdhci_clear_set_irqs(host, dma_irqs, pio_irqs); sdhci_clear_set_irqs(host, dma_irqs, pio_irqs);
@@ -741,44 +840,25 @@ @@ -741,44 +840,25 @@ static void sdhci_prepare_data(struct sd
host->data_early = 0; host->data_early = 0;
host->data->bytes_xfered = 0; host->data->bytes_xfered = 0;
@ -1887,7 +1881,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
int broken, i; int broken, i;
struct scatterlist *sg; struct scatterlist *sg;
@@ -837,7 +917,8 @@ @@ -837,7 +917,8 @@ static void sdhci_prepare_data(struct sd
*/ */
WARN_ON(1); WARN_ON(1);
host->flags &= ~SDHCI_REQ_USE_DMA; host->flags &= ~SDHCI_REQ_USE_DMA;
@ -1897,7 +1891,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
WARN_ON(sg_cnt != 1); WARN_ON(sg_cnt != 1);
sdhci_writel(host, sg_dma_address(data->sg), sdhci_writel(host, sg_dma_address(data->sg),
SDHCI_DMA_ADDRESS); SDHCI_DMA_ADDRESS);
@@ -853,11 +934,13 @@ @@ -853,11 +934,13 @@ static void sdhci_prepare_data(struct sd
if (host->version >= SDHCI_SPEC_200) { if (host->version >= SDHCI_SPEC_200) {
ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL); ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);
ctrl &= ~SDHCI_CTRL_DMA_MASK; ctrl &= ~SDHCI_CTRL_DMA_MASK;
@ -1911,7 +1905,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL); sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);
} }
@@ -909,7 +992,8 @@ @@ -909,7 +992,8 @@ static void sdhci_set_transfer_mode(stru
if (data->flags & MMC_DATA_READ) if (data->flags & MMC_DATA_READ)
mode |= SDHCI_TRNS_READ; mode |= SDHCI_TRNS_READ;
@ -1921,7 +1915,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
mode |= SDHCI_TRNS_DMA; mode |= SDHCI_TRNS_DMA;
sdhci_writew(host, mode, SDHCI_TRANSFER_MODE); sdhci_writew(host, mode, SDHCI_TRANSFER_MODE);
@@ -925,13 +1009,16 @@ @@ -925,13 +1009,16 @@ static void sdhci_finish_data(struct sdh
host->data = NULL; host->data = NULL;
if (host->flags & SDHCI_REQ_USE_DMA) { if (host->flags & SDHCI_REQ_USE_DMA) {
@ -1942,7 +1936,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
} }
/* /*
@@ -984,6 +1071,12 @@ @@ -984,6 +1071,12 @@ static void sdhci_send_command(struct sd
if ((cmd->data != NULL) || (cmd->flags & MMC_RSP_BUSY)) if ((cmd->data != NULL) || (cmd->flags & MMC_RSP_BUSY))
mask |= SDHCI_DATA_INHIBIT; mask |= SDHCI_DATA_INHIBIT;
@ -1955,7 +1949,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
/* We shouldn't wait for data inihibit for stop commands, even /* We shouldn't wait for data inihibit for stop commands, even
though they might use busy signaling */ though they might use busy signaling */
if (host->mrq->data && (cmd == host->mrq->data->stop)) if (host->mrq->data && (cmd == host->mrq->data->stop))
@@ -999,12 +1092,20 @@ @@ -999,12 +1092,20 @@ static void sdhci_send_command(struct sd
return; return;
} }
timeout--; timeout--;
@ -1976,7 +1970,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
sdhci_prepare_data(host, cmd); sdhci_prepare_data(host, cmd);
@@ -1220,7 +1321,9 @@ @@ -1220,7 +1321,9 @@ clock_set:
return; return;
} }
timeout--; timeout--;
@ -1986,7 +1980,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
} }
clk |= SDHCI_CLOCK_CARD_EN; clk |= SDHCI_CLOCK_CARD_EN;
@@ -1316,7 +1419,7 @@ @@ -1316,7 +1419,7 @@ static void sdhci_request(struct mmc_hos
sdhci_runtime_pm_get(host); sdhci_runtime_pm_get(host);
@ -1995,7 +1989,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
WARN_ON(host->mrq != NULL); WARN_ON(host->mrq != NULL);
@@ -1374,9 +1477,9 @@ @@ -1374,9 +1477,9 @@ static void sdhci_request(struct mmc_hos
mmc->card->type == MMC_TYPE_MMC ? mmc->card->type == MMC_TYPE_MMC ?
MMC_SEND_TUNING_BLOCK_HS200 : MMC_SEND_TUNING_BLOCK_HS200 :
MMC_SEND_TUNING_BLOCK; MMC_SEND_TUNING_BLOCK;
@ -2007,7 +2001,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
/* Restore original mmc_request structure */ /* Restore original mmc_request structure */
host->mrq = mrq; host->mrq = mrq;
@@ -1390,7 +1493,7 @@ @@ -1390,7 +1493,7 @@ static void sdhci_request(struct mmc_hos
} }
mmiowb(); mmiowb();
@ -2016,7 +2010,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
} }
static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios)
@@ -1399,10 +1502,10 @@ @@ -1399,10 +1502,10 @@ static void sdhci_do_set_ios(struct sdhc
int vdd_bit = -1; int vdd_bit = -1;
u8 ctrl; u8 ctrl;
@ -2029,7 +2023,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
if (host->vmmc && ios->power_mode == MMC_POWER_OFF) if (host->vmmc && ios->power_mode == MMC_POWER_OFF)
mmc_regulator_set_ocr(host->mmc, host->vmmc, 0); mmc_regulator_set_ocr(host->mmc, host->vmmc, 0);
return; return;
@@ -1429,9 +1532,9 @@ @@ -1429,9 +1532,9 @@ static void sdhci_do_set_ios(struct sdhc
vdd_bit = sdhci_set_power(host, ios->vdd); vdd_bit = sdhci_set_power(host, ios->vdd);
if (host->vmmc && vdd_bit != -1) { if (host->vmmc && vdd_bit != -1) {
@ -2041,7 +2035,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
} }
if (host->ops->platform_send_init_74_clocks) if (host->ops->platform_send_init_74_clocks)
@@ -1470,7 +1573,7 @@ @@ -1470,7 +1573,7 @@ static void sdhci_do_set_ios(struct sdhc
else else
ctrl &= ~SDHCI_CTRL_HISPD; ctrl &= ~SDHCI_CTRL_HISPD;
@ -2050,7 +2044,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
u16 clk, ctrl_2; u16 clk, ctrl_2;
/* In case of UHS-I modes, set High Speed Enable */ /* In case of UHS-I modes, set High Speed Enable */
@@ -1569,7 +1672,7 @@ @@ -1569,7 +1672,7 @@ static void sdhci_do_set_ios(struct sdhc
sdhci_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA); sdhci_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);
mmiowb(); mmiowb();
@ -2059,7 +2053,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
} }
static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
@@ -1617,7 +1720,7 @@ @@ -1617,7 +1720,7 @@ static int sdhci_check_ro(struct sdhci_h
unsigned long flags; unsigned long flags;
int is_readonly; int is_readonly;
@ -2068,7 +2062,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
if (host->flags & SDHCI_DEVICE_DEAD) if (host->flags & SDHCI_DEVICE_DEAD)
is_readonly = 0; is_readonly = 0;
@@ -1627,7 +1730,7 @@ @@ -1627,7 +1730,7 @@ static int sdhci_check_ro(struct sdhci_h
is_readonly = !(sdhci_readl(host, SDHCI_PRESENT_STATE) is_readonly = !(sdhci_readl(host, SDHCI_PRESENT_STATE)
& SDHCI_WRITE_PROTECT); & SDHCI_WRITE_PROTECT);
@ -2077,7 +2071,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
/* This quirk needs to be replaced by a callback-function later */ /* This quirk needs to be replaced by a callback-function later */
return host->quirks & SDHCI_QUIRK_INVERTED_WRITE_PROTECT ? return host->quirks & SDHCI_QUIRK_INVERTED_WRITE_PROTECT ?
@@ -1700,9 +1803,9 @@ @@ -1700,9 +1803,9 @@ static void sdhci_enable_sdio_irq(struct
struct sdhci_host *host = mmc_priv(mmc); struct sdhci_host *host = mmc_priv(mmc);
unsigned long flags; unsigned long flags;
@ -2089,7 +2083,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
} }
static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host, static int sdhci_do_start_signal_voltage_switch(struct sdhci_host *host,
@@ -2046,7 +2149,7 @@ @@ -2046,7 +2149,7 @@ static void sdhci_card_event(struct mmc_
struct sdhci_host *host = mmc_priv(mmc); struct sdhci_host *host = mmc_priv(mmc);
unsigned long flags; unsigned long flags;
@ -2098,7 +2092,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
/* Check host->mrq first in case we are runtime suspended */ /* Check host->mrq first in case we are runtime suspended */
if (host->mrq && if (host->mrq &&
@@ -2063,7 +2166,7 @@ @@ -2063,7 +2166,7 @@ static void sdhci_card_event(struct mmc_
tasklet_schedule(&host->finish_tasklet); tasklet_schedule(&host->finish_tasklet);
} }
@ -2107,7 +2101,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
} }
static const struct mmc_host_ops sdhci_ops = { static const struct mmc_host_ops sdhci_ops = {
@@ -2102,14 +2205,14 @@ @@ -2102,14 +2205,14 @@ static void sdhci_tasklet_finish(unsigne
host = (struct sdhci_host*)param; host = (struct sdhci_host*)param;
@ -2124,7 +2118,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
return; return;
} }
@@ -2147,7 +2250,7 @@ @@ -2147,7 +2250,7 @@ static void sdhci_tasklet_finish(unsigne
#endif #endif
mmiowb(); mmiowb();
@ -2133,7 +2127,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
mmc_request_done(host->mmc, mrq); mmc_request_done(host->mmc, mrq);
sdhci_runtime_pm_put(host); sdhci_runtime_pm_put(host);
@@ -2160,11 +2263,11 @@ @@ -2160,11 +2263,11 @@ static void sdhci_timeout_timer(unsigned
host = (struct sdhci_host*)data; host = (struct sdhci_host*)data;
@ -2147,7 +2141,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
sdhci_dumpregs(host); sdhci_dumpregs(host);
if (host->data) { if (host->data) {
@@ -2181,7 +2284,7 @@ @@ -2181,7 +2284,7 @@ static void sdhci_timeout_timer(unsigned
} }
mmiowb(); mmiowb();
@ -2156,7 +2150,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
} }
static void sdhci_tuning_timer(unsigned long data) static void sdhci_tuning_timer(unsigned long data)
@@ -2191,11 +2294,11 @@ @@ -2191,11 +2294,11 @@ static void sdhci_tuning_timer(unsigned
host = (struct sdhci_host *)data; host = (struct sdhci_host *)data;
@ -2170,7 +2164,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
} }
/*****************************************************************************\ /*****************************************************************************\
@@ -2209,10 +2312,13 @@ @@ -2209,10 +2312,13 @@ static void sdhci_cmd_irq(struct sdhci_h
BUG_ON(intmask == 0); BUG_ON(intmask == 0);
if (!host->cmd) { if (!host->cmd) {
@ -2184,7 +2178,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
return; return;
} }
@@ -2282,6 +2388,19 @@ @@ -2282,6 +2388,19 @@ static void sdhci_show_adma_error(struct
static void sdhci_show_adma_error(struct sdhci_host *host) { } static void sdhci_show_adma_error(struct sdhci_host *host) { }
#endif #endif
@ -2204,7 +2198,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
static void sdhci_data_irq(struct sdhci_host *host, u32 intmask) static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)
{ {
u32 command; u32 command;
@@ -2311,23 +2430,39 @@ @@ -2311,23 +2430,39 @@ static void sdhci_data_irq(struct sdhci_
} }
} }
@ -2248,7 +2242,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
pr_err("%s: ADMA error\n", mmc_hostname(host->mmc)); pr_err("%s: ADMA error\n", mmc_hostname(host->mmc));
sdhci_show_adma_error(host); sdhci_show_adma_error(host);
host->data->error = -EIO; host->data->error = -EIO;
@@ -2335,11 +2470,18 @@ @@ -2335,11 +2470,18 @@ static void sdhci_data_irq(struct sdhci_
host->ops->adma_workaround(host, intmask); host->ops->adma_workaround(host, intmask);
} }
@ -2271,7 +2265,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
/* /*
* We currently don't do anything fancy with DMA * We currently don't do anything fancy with DMA
@@ -2368,18 +2510,8 @@ @@ -2368,18 +2510,8 @@ static void sdhci_data_irq(struct sdhci_
sdhci_writel(host, dmanow, SDHCI_DMA_ADDRESS); sdhci_writel(host, dmanow, SDHCI_DMA_ADDRESS);
} }
@ -2292,7 +2286,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
} }
} }
@@ -2390,10 +2522,10 @@ @@ -2390,10 +2522,10 @@ static irqreturn_t sdhci_irq(int irq, vo
u32 intmask, unexpected = 0; u32 intmask, unexpected = 0;
int cardint = 0, max_loops = 16; int cardint = 0, max_loops = 16;
@ -2305,7 +2299,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
pr_warning("%s: got irq while runtime suspended\n", pr_warning("%s: got irq while runtime suspended\n",
mmc_hostname(host->mmc)); mmc_hostname(host->mmc));
return IRQ_HANDLED; return IRQ_HANDLED;
@@ -2435,6 +2567,22 @@ @@ -2435,6 +2567,22 @@ again:
tasklet_schedule(&host->card_tasklet); tasklet_schedule(&host->card_tasklet);
} }
@ -2328,7 +2322,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
if (intmask & SDHCI_INT_CMD_MASK) { if (intmask & SDHCI_INT_CMD_MASK) {
sdhci_writel(host, intmask & SDHCI_INT_CMD_MASK, sdhci_writel(host, intmask & SDHCI_INT_CMD_MASK,
SDHCI_INT_STATUS); SDHCI_INT_STATUS);
@@ -2449,7 +2597,13 @@ @@ -2449,7 +2597,13 @@ again:
intmask &= ~(SDHCI_INT_CMD_MASK | SDHCI_INT_DATA_MASK); intmask &= ~(SDHCI_INT_CMD_MASK | SDHCI_INT_DATA_MASK);
@ -2343,7 +2337,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
if (intmask & SDHCI_INT_BUS_POWER) { if (intmask & SDHCI_INT_BUS_POWER) {
pr_err("%s: Card is consuming too much power!\n", pr_err("%s: Card is consuming too much power!\n",
@@ -2475,7 +2629,7 @@ @@ -2475,7 +2629,7 @@ again:
if (intmask && --max_loops) if (intmask && --max_loops)
goto again; goto again;
out: out:
@ -2352,7 +2346,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
if (unexpected) { if (unexpected) {
pr_err("%s: Unexpected interrupt 0x%08x.\n", pr_err("%s: Unexpected interrupt 0x%08x.\n",
@@ -2569,7 +2723,8 @@ @@ -2569,7 +2723,8 @@ int sdhci_resume_host(struct sdhci_host
{ {
int ret; int ret;
@ -2362,7 +2356,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
if (host->ops->enable_dma) if (host->ops->enable_dma)
host->ops->enable_dma(host); host->ops->enable_dma(host);
} }
@@ -2636,15 +2791,15 @@ @@ -2636,15 +2791,15 @@ int sdhci_runtime_suspend_host(struct sd
host->flags &= ~SDHCI_NEEDS_RETUNING; host->flags &= ~SDHCI_NEEDS_RETUNING;
} }
@ -2382,7 +2376,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
return ret; return ret;
} }
@@ -2670,16 +2825,16 @@ @@ -2670,16 +2825,16 @@ int sdhci_runtime_resume_host(struct sdh
sdhci_do_start_signal_voltage_switch(host, &host->mmc->ios); sdhci_do_start_signal_voltage_switch(host, &host->mmc->ios);
if ((host_flags & SDHCI_PV_ENABLED) && if ((host_flags & SDHCI_PV_ENABLED) &&
!(host->quirks2 & SDHCI_QUIRK2_PRESET_VALUE_BROKEN)) { !(host->quirks2 & SDHCI_QUIRK2_PRESET_VALUE_BROKEN)) {
@ -2402,7 +2396,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
host->runtime_suspended = false; host->runtime_suspended = false;
@@ -2690,7 +2845,7 @@ @@ -2690,7 +2845,7 @@ int sdhci_runtime_resume_host(struct sdh
/* Enable Card Detection */ /* Enable Card Detection */
sdhci_enable_card_detection(host); sdhci_enable_card_detection(host);
@ -2411,7 +2405,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
return ret; return ret;
} }
@@ -2785,14 +2940,16 @@ @@ -2785,14 +2940,16 @@ int sdhci_add_host(struct sdhci_host *ho
host->flags &= ~SDHCI_USE_ADMA; host->flags &= ~SDHCI_USE_ADMA;
} }
@ -2430,7 +2424,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
} }
} }
} }
@@ -3080,6 +3237,12 @@ @@ -3080,6 +3237,12 @@ int sdhci_add_host(struct sdhci_host *ho
SDHCI_MAX_CURRENT_MULTIPLIER; SDHCI_MAX_CURRENT_MULTIPLIER;
} }
@ -2443,7 +2437,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
mmc->ocr_avail = ocr_avail; mmc->ocr_avail = ocr_avail;
mmc->ocr_avail_sdio = ocr_avail; mmc->ocr_avail_sdio = ocr_avail;
if (host->ocr_avail_sdio) if (host->ocr_avail_sdio)
@@ -3174,7 +3337,7 @@ @@ -3174,7 +3337,7 @@ int sdhci_add_host(struct sdhci_host *ho
host->tuning_timer.function = sdhci_tuning_timer; host->tuning_timer.function = sdhci_tuning_timer;
} }
@ -2452,7 +2446,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
mmc_hostname(mmc), host); mmc_hostname(mmc), host);
if (ret) { if (ret) {
pr_err("%s: Failed to request IRQ %d: %d\n", pr_err("%s: Failed to request IRQ %d: %d\n",
@@ -3210,6 +3373,7 @@ @@ -3210,6 +3373,7 @@ int sdhci_add_host(struct sdhci_host *ho
pr_info("%s: SDHCI controller on %s [%s] using %s\n", pr_info("%s: SDHCI controller on %s [%s] using %s\n",
mmc_hostname(mmc), host->hw_name, dev_name(mmc_dev(mmc)), mmc_hostname(mmc), host->hw_name, dev_name(mmc_dev(mmc)),
@ -2460,7 +2454,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
(host->flags & SDHCI_USE_ADMA) ? "ADMA" : (host->flags & SDHCI_USE_ADMA) ? "ADMA" :
(host->flags & SDHCI_USE_SDMA) ? "DMA" : "PIO"); (host->flags & SDHCI_USE_SDMA) ? "DMA" : "PIO");
@@ -3237,7 +3401,7 @@ @@ -3237,7 +3401,7 @@ void sdhci_remove_host(struct sdhci_host
unsigned long flags; unsigned long flags;
if (dead) { if (dead) {
@ -2469,7 +2463,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
host->flags |= SDHCI_DEVICE_DEAD; host->flags |= SDHCI_DEVICE_DEAD;
@@ -3249,7 +3413,7 @@ @@ -3249,7 +3413,7 @@ void sdhci_remove_host(struct sdhci_host
tasklet_schedule(&host->finish_tasklet); tasklet_schedule(&host->finish_tasklet);
} }
@ -2478,10 +2472,9 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.c linux-rpi-3.10.y/drivers/mmc/host
} }
sdhci_disable_card_detection(host); sdhci_disable_card_detection(host);
diff -urwN linux-3.10/drivers/mmc/host/sdhci.h linux-rpi-3.10.y/drivers/mmc/host/sdhci.h --- a/drivers/mmc/host/sdhci.h
--- linux-3.10/drivers/mmc/host/sdhci.h 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/mmc/host/sdhci.h
+++ linux-rpi-3.10.y/drivers/mmc/host/sdhci.h 2013-07-06 15:25:50.000000000 +0100 @@ -289,6 +289,20 @@ struct sdhci_ops {
@@ -289,6 +289,20 @@
void (*platform_reset_enter)(struct sdhci_host *host, u8 mask); void (*platform_reset_enter)(struct sdhci_host *host, u8 mask);
void (*platform_reset_exit)(struct sdhci_host *host, u8 mask); void (*platform_reset_exit)(struct sdhci_host *host, u8 mask);
int (*set_uhs_signaling)(struct sdhci_host *host, unsigned int uhs); int (*set_uhs_signaling)(struct sdhci_host *host, unsigned int uhs);
@ -2502,7 +2495,7 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.h linux-rpi-3.10.y/drivers/mmc/host
void (*hw_reset)(struct sdhci_host *host); void (*hw_reset)(struct sdhci_host *host);
void (*platform_suspend)(struct sdhci_host *host); void (*platform_suspend)(struct sdhci_host *host);
void (*platform_resume)(struct sdhci_host *host); void (*platform_resume)(struct sdhci_host *host);
@@ -399,9 +413,38 @@ @@ -399,9 +413,38 @@ extern int sdhci_resume_host(struct sdhc
extern void sdhci_enable_irq_wakeups(struct sdhci_host *host); extern void sdhci_enable_irq_wakeups(struct sdhci_host *host);
#endif #endif
@ -2541,10 +2534,9 @@ diff -urwN linux-3.10/drivers/mmc/host/sdhci.h linux-rpi-3.10.y/drivers/mmc/host
+ +
+ +
#endif /* __SDHCI_HW_H */ #endif /* __SDHCI_HW_H */
diff -urN linux-3.10/include/linux/mmc/host.h linux-rpi-3.10.y/include/linux/mmc/host.h --- a/include/linux/mmc/host.h
--- linux-3.10/include/linux/mmc/host.h 2013-06-30 23:13:29.000000000 +0100 +++ b/include/linux/mmc/host.h
+++ linux-rpi-3.10.y/include/linux/mmc/host.h 2013-07-06 15:25:50.000000000 +0100 @@ -281,6 +281,7 @@ struct mmc_host {
@@ -281,6 +281,7 @@
#define MMC_CAP2_PACKED_CMD (MMC_CAP2_PACKED_RD | \ #define MMC_CAP2_PACKED_CMD (MMC_CAP2_PACKED_RD | \
MMC_CAP2_PACKED_WR) MMC_CAP2_PACKED_WR)
#define MMC_CAP2_NO_PRESCAN_POWERUP (1 << 14) /* Don't power up before scan */ #define MMC_CAP2_NO_PRESCAN_POWERUP (1 << 14) /* Don't power up before scan */
@ -2552,10 +2544,9 @@ diff -urN linux-3.10/include/linux/mmc/host.h linux-rpi-3.10.y/include/linux/mmc
mmc_pm_flag_t pm_caps; /* supported pm features */ mmc_pm_flag_t pm_caps; /* supported pm features */
diff -urN linux-3.10/include/linux/mmc/sdhci.h linux-rpi-3.10.y/include/linux/mmc/sdhci.h --- a/include/linux/mmc/sdhci.h
--- linux-3.10/include/linux/mmc/sdhci.h 2013-06-30 23:13:29.000000000 +0100 +++ b/include/linux/mmc/sdhci.h
+++ linux-rpi-3.10.y/include/linux/mmc/sdhci.h 2013-07-06 15:25:50.000000000 +0100 @@ -97,6 +97,7 @@ struct sdhci_host {
@@ -97,6 +97,7 @@
#define SDHCI_QUIRK2_PRESET_VALUE_BROKEN (1<<3) #define SDHCI_QUIRK2_PRESET_VALUE_BROKEN (1<<3)
int irq; /* Device IRQ */ int irq; /* Device IRQ */
@ -2563,7 +2554,7 @@ diff -urN linux-3.10/include/linux/mmc/sdhci.h linux-rpi-3.10.y/include/linux/mm
void __iomem *ioaddr; /* Mapped address */ void __iomem *ioaddr; /* Mapped address */
const struct sdhci_ops *ops; /* Low level hw interface */ const struct sdhci_ops *ops; /* Low level hw interface */
@@ -128,6 +129,7 @@ @@ -128,6 +129,7 @@ struct sdhci_host {
#define SDHCI_SDIO_IRQ_ENABLED (1<<9) /* SDIO irq enabled */ #define SDHCI_SDIO_IRQ_ENABLED (1<<9) /* SDIO irq enabled */
#define SDHCI_HS200_NEEDS_TUNING (1<<10) /* HS200 needs tuning */ #define SDHCI_HS200_NEEDS_TUNING (1<<10) /* HS200 needs tuning */
#define SDHCI_USING_RETUNING_TIMER (1<<11) /* Host is using a retuning timer for the card */ #define SDHCI_USING_RETUNING_TIMER (1<<11) /* Host is using a retuning timer for the card */
@ -2571,7 +2562,7 @@ diff -urN linux-3.10/include/linux/mmc/sdhci.h linux-rpi-3.10.y/include/linux/mm
unsigned int version; /* SDHCI spec. version */ unsigned int version; /* SDHCI spec. version */
@@ -142,6 +144,7 @@ @@ -142,6 +144,7 @@ struct sdhci_host {
struct mmc_request *mrq; /* Current request */ struct mmc_request *mrq; /* Current request */
struct mmc_command *cmd; /* Current command */ struct mmc_command *cmd; /* Current command */

19
target/linux/brcm2708/patches-3.10/015-bcm2708-i2c-driver.patch
View File

@ -1,6 +1,5 @@
diff -urN linux-3.10/drivers/i2c/busses/i2c-bcm2708.c linux-rpi-3.10.y/drivers/i2c/busses/i2c-bcm2708.c --- /dev/null
--- linux-3.10/drivers/i2c/busses/i2c-bcm2708.c 1970-01-01 01:00:00.000000000 +0100 +++ b/drivers/i2c/busses/i2c-bcm2708.c
+++ linux-rpi-3.10.y/drivers/i2c/busses/i2c-bcm2708.c 2013-07-06 15:25:50.000000000 +0100
@@ -0,0 +1,408 @@ @@ -0,0 +1,408 @@
+/* +/*
+ * Driver for Broadcom BCM2708 BSC Controllers + * Driver for Broadcom BCM2708 BSC Controllers
@ -410,10 +409,9 @@ diff -urN linux-3.10/drivers/i2c/busses/i2c-bcm2708.c linux-rpi-3.10.y/drivers/i
+MODULE_AUTHOR("Chris Boot <bootc@bootc.net>"); +MODULE_AUTHOR("Chris Boot <bootc@bootc.net>");
+MODULE_LICENSE("GPL v2"); +MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRV_NAME); +MODULE_ALIAS("platform:" DRV_NAME);
diff -urN linux-3.10/drivers/i2c/busses/Kconfig linux-rpi-3.10.y/drivers/i2c/busses/Kconfig --- a/drivers/i2c/busses/Kconfig
--- linux-3.10/drivers/i2c/busses/Kconfig 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/i2c/busses/Kconfig
+++ linux-rpi-3.10.y/drivers/i2c/busses/Kconfig 2013-07-06 15:25:50.000000000 +0100 @@ -343,6 +343,25 @@ config I2C_BCM2835
@@ -343,6 +343,25 @@
This support is also available as a module. If so, the module This support is also available as a module. If so, the module
will be called i2c-bcm2835. will be called i2c-bcm2835.
@ -439,10 +437,9 @@ diff -urN linux-3.10/drivers/i2c/busses/Kconfig linux-rpi-3.10.y/drivers/i2c/bus
config I2C_BLACKFIN_TWI config I2C_BLACKFIN_TWI
tristate "Blackfin TWI I2C support" tristate "Blackfin TWI I2C support"
depends on BLACKFIN depends on BLACKFIN
diff -urN linux-3.10/drivers/i2c/busses/Makefile linux-rpi-3.10.y/drivers/i2c/busses/Makefile --- a/drivers/i2c/busses/Makefile
--- linux-3.10/drivers/i2c/busses/Makefile 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/i2c/busses/Makefile
+++ linux-rpi-3.10.y/drivers/i2c/busses/Makefile 2013-07-06 15:25:50.000000000 +0100 @@ -32,6 +32,7 @@ obj-$(CONFIG_I2C_POWERMAC) += i2c-powerm
@@ -32,6 +32,7 @@
obj-$(CONFIG_I2C_AT91) += i2c-at91.o obj-$(CONFIG_I2C_AT91) += i2c-at91.o
obj-$(CONFIG_I2C_AU1550) += i2c-au1550.o obj-$(CONFIG_I2C_AU1550) += i2c-au1550.o
obj-$(CONFIG_I2C_BCM2835) += i2c-bcm2835.o obj-$(CONFIG_I2C_BCM2835) += i2c-bcm2835.o

7
target/linux/brcm2708/patches-3.10/016-amba-pl011-fifosize.patch
View File

@ -1,7 +1,6 @@
diff -urN linux-3.10/drivers/tty/serial/amba-pl011.c linux-rpi-3.10.y/drivers/tty/serial/amba-pl011.c --- a/drivers/tty/serial/amba-pl011.c
--- linux-3.10/drivers/tty/serial/amba-pl011.c 2013-06-30 23:13:29.000000000 +0100 +++ b/drivers/tty/serial/amba-pl011.c
+++ linux-rpi-3.10.y/drivers/tty/serial/amba-pl011.c 2013-07-06 15:25:50.000000000 +0100 @@ -84,7 +84,7 @@ struct vendor_data {
@@ -84,7 +84,7 @@
static unsigned int get_fifosize_arm(unsigned int periphid) static unsigned int get_fifosize_arm(unsigned int periphid)
{ {

2
target/linux/brcm47xx/patches-3.10/160-kmap_coherent.patch
View File

@ -1,6 +1,6 @@
--- a/arch/mips/include/asm/cpu-features.h --- a/arch/mips/include/asm/cpu-features.h
+++ b/arch/mips/include/asm/cpu-features.h +++ b/arch/mips/include/asm/cpu-features.h
@@ -116,6 +116,9 @@ @@ -120,6 +120,9 @@
#ifndef cpu_has_local_ebase #ifndef cpu_has_local_ebase
#define cpu_has_local_ebase 1 #define cpu_has_local_ebase 1
#endif #endif

32
target/linux/generic/patches-3.10/020-ssb_update.patch
View File

@ -1,5 +1,3 @@
diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig
index 5ff3a4f..36171fd 100644
--- a/drivers/ssb/Kconfig --- a/drivers/ssb/Kconfig
+++ b/drivers/ssb/Kconfig +++ b/drivers/ssb/Kconfig
@@ -144,7 +144,7 @@ config SSB_SFLASH @@ -144,7 +144,7 @@ config SSB_SFLASH
@ -11,8 +9,6 @@ index 5ff3a4f..36171fd 100644
default y default y
config SSB_DRIVER_EXTIF config SSB_DRIVER_EXTIF
diff --git a/drivers/ssb/driver_chipcommon_sflash.c b/drivers/ssb/driver_chipcommon_sflash.c
index 720665c..e84cf04 100644
--- a/drivers/ssb/driver_chipcommon_sflash.c --- a/drivers/ssb/driver_chipcommon_sflash.c
+++ b/drivers/ssb/driver_chipcommon_sflash.c +++ b/drivers/ssb/driver_chipcommon_sflash.c
@@ -9,6 +9,19 @@ @@ -9,6 +9,19 @@
@ -44,7 +40,7 @@ index 720665c..e84cf04 100644
{ "M25P20", 0x11, 0x10000, 4, }, { "M25P20", 0x11, 0x10000, 4, },
{ "M25P40", 0x12, 0x10000, 8, }, { "M25P40", 0x12, 0x10000, 8, },
@@ -27,7 +40,7 @@ static struct ssb_sflash_tbl_e ssb_sflash_st_tbl[] = { @@ -27,7 +40,7 @@ static struct ssb_sflash_tbl_e ssb_sflas
{ 0 }, { 0 },
}; };
@ -53,7 +49,7 @@ index 720665c..e84cf04 100644
{ "SST25WF512", 1, 0x1000, 16, }, { "SST25WF512", 1, 0x1000, 16, },
{ "SST25VF512", 0x48, 0x1000, 16, }, { "SST25VF512", 0x48, 0x1000, 16, },
{ "SST25WF010", 2, 0x1000, 32, }, { "SST25WF010", 2, 0x1000, 32, },
@@ -45,7 +58,7 @@ static struct ssb_sflash_tbl_e ssb_sflash_sst_tbl[] = { @@ -45,7 +58,7 @@ static struct ssb_sflash_tbl_e ssb_sflas
{ 0 }, { 0 },
}; };
@ -62,7 +58,7 @@ index 720665c..e84cf04 100644
{ "AT45DB011", 0xc, 256, 512, }, { "AT45DB011", 0xc, 256, 512, },
{ "AT45DB021", 0x14, 256, 1024, }, { "AT45DB021", 0x14, 256, 1024, },
{ "AT45DB041", 0x1c, 256, 2048, }, { "AT45DB041", 0x1c, 256, 2048, },
@@ -73,7 +86,8 @@ static void ssb_sflash_cmd(struct ssb_chipcommon *cc, u32 opcode) @@ -73,7 +86,8 @@ static void ssb_sflash_cmd(struct ssb_ch
/* Initialize serial flash access */ /* Initialize serial flash access */
int ssb_sflash_init(struct ssb_chipcommon *cc) int ssb_sflash_init(struct ssb_chipcommon *cc)
{ {
@ -72,7 +68,7 @@ index 720665c..e84cf04 100644
u32 id, id2; u32 id, id2;
switch (cc->capabilities & SSB_CHIPCO_CAP_FLASHT) { switch (cc->capabilities & SSB_CHIPCO_CAP_FLASHT) {
@@ -131,9 +145,21 @@ int ssb_sflash_init(struct ssb_chipcommon *cc) @@ -131,9 +145,21 @@ int ssb_sflash_init(struct ssb_chipcommo
return -ENOTSUPP; return -ENOTSUPP;
} }
@ -94,11 +90,9 @@ index 720665c..e84cf04 100644
pr_err("Serial flash support is not implemented yet!\n"); pr_err("Serial flash support is not implemented yet!\n");
return -ENOTSUPP; return -ENOTSUPP;
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index 812775a..e55ddf7 100644
--- a/drivers/ssb/main.c --- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c +++ b/drivers/ssb/main.c
@@ -553,6 +553,14 @@ static int ssb_devices_register(struct ssb_bus *bus) @@ -553,6 +553,14 @@ static int ssb_devices_register(struct s
} }
#endif #endif
@ -113,11 +107,9 @@ index 812775a..e55ddf7 100644
return 0; return 0;
error: error:
/* Unwind the already registered devices. */ /* Unwind the already registered devices. */
diff --git a/drivers/ssb/pcihost_wrapper.c b/drivers/ssb/pcihost_wrapper.c
index 32ed1fa..69161bb 100644
--- a/drivers/ssb/pcihost_wrapper.c --- a/drivers/ssb/pcihost_wrapper.c
+++ b/drivers/ssb/pcihost_wrapper.c +++ b/drivers/ssb/pcihost_wrapper.c
@@ -38,7 +38,7 @@ static int ssb_pcihost_resume(struct pci_dev *dev) @@ -38,7 +38,7 @@ static int ssb_pcihost_resume(struct pci
struct ssb_bus *ssb = pci_get_drvdata(dev); struct ssb_bus *ssb = pci_get_drvdata(dev);
int err; int err;
@ -126,11 +118,9 @@ index 32ed1fa..69161bb 100644
err = pci_enable_device(dev); err = pci_enable_device(dev);
if (err) if (err)
return err; return err;
diff --git a/drivers/ssb/sprom.c b/drivers/ssb/sprom.c
index a3b2364..e753fbe 100644
--- a/drivers/ssb/sprom.c --- a/drivers/ssb/sprom.c
+++ b/drivers/ssb/sprom.c +++ b/drivers/ssb/sprom.c
@@ -54,7 +54,7 @@ static int hex2sprom(u16 *sprom, const char *dump, size_t len, @@ -54,7 +54,7 @@ static int hex2sprom(u16 *sprom, const c
while (cnt < sprom_size_words) { while (cnt < sprom_size_words) {
memcpy(tmp, dump, 4); memcpy(tmp, dump, 4);
dump += 4; dump += 4;
@ -139,11 +129,9 @@ index a3b2364..e753fbe 100644
if (err) if (err)
return err; return err;
sprom[cnt++] = swab16((u16)parsed); sprom[cnt++] = swab16((u16)parsed);
diff --git a/drivers/ssb/ssb_private.h b/drivers/ssb/ssb_private.h
index 4671f17..eb507a5 100644
--- a/drivers/ssb/ssb_private.h --- a/drivers/ssb/ssb_private.h
+++ b/drivers/ssb/ssb_private.h +++ b/drivers/ssb/ssb_private.h
@@ -243,6 +243,10 @@ static inline int ssb_sflash_init(struct ssb_chipcommon *cc) @@ -243,6 +243,10 @@ static inline int ssb_sflash_init(struct
extern struct platform_device ssb_pflash_dev; extern struct platform_device ssb_pflash_dev;
#endif #endif
@ -154,8 +142,6 @@ index 4671f17..eb507a5 100644
#ifdef CONFIG_SSB_DRIVER_EXTIF #ifdef CONFIG_SSB_DRIVER_EXTIF
extern u32 ssb_extif_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt, u32 ticks); extern u32 ssb_extif_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt, u32 ticks);
extern u32 ssb_extif_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt, u32 ms); extern u32 ssb_extif_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt, u32 ms);
diff --git a/include/linux/ssb/ssb_driver_mips.h b/include/linux/ssb/ssb_driver_mips.h
index afe79d4..6535e47 100644
--- a/include/linux/ssb/ssb_driver_mips.h --- a/include/linux/ssb/ssb_driver_mips.h
+++ b/include/linux/ssb/ssb_driver_mips.h +++ b/include/linux/ssb/ssb_driver_mips.h
@@ -20,6 +20,18 @@ struct ssb_pflash { @@ -20,6 +20,18 @@ struct ssb_pflash {
@ -187,8 +173,6 @@ index afe79d4..6535e47 100644
}; };
extern void ssb_mipscore_init(struct ssb_mipscore *mcore); extern void ssb_mipscore_init(struct ssb_mipscore *mcore);
diff --git a/include/linux/ssb/ssb_regs.h b/include/linux/ssb/ssb_regs.h
index 3a72569..f9f931c 100644
--- a/include/linux/ssb/ssb_regs.h --- a/include/linux/ssb/ssb_regs.h
+++ b/include/linux/ssb/ssb_regs.h +++ b/include/linux/ssb/ssb_regs.h
@@ -172,6 +172,7 @@ @@ -172,6 +172,7 @@

52
target/linux/generic/patches-3.10/025-bcma_backport.patch
View File

@ -1,5 +1,3 @@
diff --git a/drivers/bcma/Kconfig b/drivers/bcma/Kconfig
index 8b4221c..380a200 100644
--- a/drivers/bcma/Kconfig --- a/drivers/bcma/Kconfig
+++ b/drivers/bcma/Kconfig +++ b/drivers/bcma/Kconfig
@@ -26,6 +26,7 @@ config BCMA_HOST_PCI_POSSIBLE @@ -26,6 +26,7 @@ config BCMA_HOST_PCI_POSSIBLE
@ -10,8 +8,6 @@ index 8b4221c..380a200 100644
config BCMA_DRIVER_PCI_HOSTMODE config BCMA_DRIVER_PCI_HOSTMODE
bool "Driver for PCI core working in hostmode" bool "Driver for PCI core working in hostmode"
diff --git a/drivers/bcma/bcma_private.h b/drivers/bcma/bcma_private.h
index 79595a0..0215f9a 100644
--- a/drivers/bcma/bcma_private.h --- a/drivers/bcma/bcma_private.h
+++ b/drivers/bcma/bcma_private.h +++ b/drivers/bcma/bcma_private.h
@@ -22,6 +22,8 @@ @@ -22,6 +22,8 @@
@ -23,8 +19,6 @@ index 79595a0..0215f9a 100644
int bcma_bus_register(struct bcma_bus *bus); int bcma_bus_register(struct bcma_bus *bus);
void bcma_bus_unregister(struct bcma_bus *bus); void bcma_bus_unregister(struct bcma_bus *bus);
int __init bcma_bus_early_register(struct bcma_bus *bus, int __init bcma_bus_early_register(struct bcma_bus *bus,
diff --git a/drivers/bcma/core.c b/drivers/bcma/core.c
index 17b26ce..37a5ffe 100644
--- a/drivers/bcma/core.c --- a/drivers/bcma/core.c
+++ b/drivers/bcma/core.c +++ b/drivers/bcma/core.c
@@ -9,6 +9,25 @@ @@ -9,6 +9,25 @@
@ -53,7 +47,7 @@ index 17b26ce..37a5ffe 100644
bool bcma_core_is_enabled(struct bcma_device *core) bool bcma_core_is_enabled(struct bcma_device *core)
{ {
if ((bcma_aread32(core, BCMA_IOCTL) & (BCMA_IOCTL_CLK | BCMA_IOCTL_FGC)) if ((bcma_aread32(core, BCMA_IOCTL) & (BCMA_IOCTL_CLK | BCMA_IOCTL_FGC))
@@ -25,13 +44,15 @@ void bcma_core_disable(struct bcma_device *core, u32 flags) @@ -25,13 +44,15 @@ void bcma_core_disable(struct bcma_devic
if (bcma_aread32(core, BCMA_RESET_CTL) & BCMA_RESET_CTL_RESET) if (bcma_aread32(core, BCMA_RESET_CTL) & BCMA_RESET_CTL_RESET)
return; return;
@ -72,7 +66,7 @@ index 17b26ce..37a5ffe 100644
} }
EXPORT_SYMBOL_GPL(bcma_core_disable); EXPORT_SYMBOL_GPL(bcma_core_disable);
@@ -43,6 +64,7 @@ int bcma_core_enable(struct bcma_device *core, u32 flags) @@ -43,6 +64,7 @@ int bcma_core_enable(struct bcma_device
bcma_aread32(core, BCMA_IOCTL); bcma_aread32(core, BCMA_IOCTL);
bcma_awrite32(core, BCMA_RESET_CTL, 0); bcma_awrite32(core, BCMA_RESET_CTL, 0);
@ -80,11 +74,9 @@ index 17b26ce..37a5ffe 100644
udelay(1); udelay(1);
bcma_awrite32(core, BCMA_IOCTL, (BCMA_IOCTL_CLK | flags)); bcma_awrite32(core, BCMA_IOCTL, (BCMA_IOCTL_CLK | flags));
diff --git a/drivers/bcma/driver_chipcommon.c b/drivers/bcma/driver_chipcommon.c
index 036c674..b068f98 100644
--- a/drivers/bcma/driver_chipcommon.c --- a/drivers/bcma/driver_chipcommon.c
+++ b/drivers/bcma/driver_chipcommon.c +++ b/drivers/bcma/driver_chipcommon.c
@@ -140,8 +140,15 @@ void bcma_core_chipcommon_init(struct bcma_drv_cc *cc) @@ -140,8 +140,15 @@ void bcma_core_chipcommon_init(struct bc
bcma_core_chipcommon_early_init(cc); bcma_core_chipcommon_early_init(cc);
if (cc->core->id.rev >= 20) { if (cc->core->id.rev >= 20) {
@ -102,11 +94,9 @@ index 036c674..b068f98 100644
} }
if (cc->capabilities & BCMA_CC_CAP_PMU) if (cc->capabilities & BCMA_CC_CAP_PMU)
diff --git a/drivers/bcma/driver_chipcommon_pmu.c b/drivers/bcma/driver_chipcommon_pmu.c
index edca73a..5081a8c 100644
--- a/drivers/bcma/driver_chipcommon_pmu.c --- a/drivers/bcma/driver_chipcommon_pmu.c
+++ b/drivers/bcma/driver_chipcommon_pmu.c +++ b/drivers/bcma/driver_chipcommon_pmu.c
@@ -56,6 +56,109 @@ void bcma_chipco_regctl_maskset(struct bcma_drv_cc *cc, u32 offset, u32 mask, @@ -56,6 +56,109 @@ void bcma_chipco_regctl_maskset(struct b
} }
EXPORT_SYMBOL_GPL(bcma_chipco_regctl_maskset); EXPORT_SYMBOL_GPL(bcma_chipco_regctl_maskset);
@ -216,7 +206,7 @@ index edca73a..5081a8c 100644
static void bcma_pmu_resources_init(struct bcma_drv_cc *cc) static void bcma_pmu_resources_init(struct bcma_drv_cc *cc)
{ {
struct bcma_bus *bus = cc->core->bus; struct bcma_bus *bus = cc->core->bus;
@@ -66,6 +169,25 @@ static void bcma_pmu_resources_init(struct bcma_drv_cc *cc) @@ -66,6 +169,25 @@ static void bcma_pmu_resources_init(stru
min_msk = 0x200D; min_msk = 0x200D;
max_msk = 0xFFFF; max_msk = 0xFFFF;
break; break;
@ -242,7 +232,7 @@ index edca73a..5081a8c 100644
default: default:
bcma_debug(bus, "PMU resource config unknown or not needed for device 0x%04X\n", bcma_debug(bus, "PMU resource config unknown or not needed for device 0x%04X\n",
bus->chipinfo.id); bus->chipinfo.id);
@@ -165,6 +287,7 @@ void bcma_pmu_init(struct bcma_drv_cc *cc) @@ -165,6 +287,7 @@ void bcma_pmu_init(struct bcma_drv_cc *c
bcma_cc_set32(cc, BCMA_CC_PMU_CTL, bcma_cc_set32(cc, BCMA_CC_PMU_CTL,
BCMA_CC_PMU_CTL_NOILPONW); BCMA_CC_PMU_CTL_NOILPONW);
@ -250,8 +240,6 @@ index edca73a..5081a8c 100644
bcma_pmu_resources_init(cc); bcma_pmu_resources_init(cc);
bcma_pmu_workarounds(cc); bcma_pmu_workarounds(cc);
} }
diff --git a/drivers/bcma/driver_chipcommon_sflash.c b/drivers/bcma/driver_chipcommon_sflash.c
index e6ed4fe..4d07cce 100644
--- a/drivers/bcma/driver_chipcommon_sflash.c --- a/drivers/bcma/driver_chipcommon_sflash.c
+++ b/drivers/bcma/driver_chipcommon_sflash.c +++ b/drivers/bcma/driver_chipcommon_sflash.c
@@ -30,7 +30,7 @@ struct bcma_sflash_tbl_e { @@ -30,7 +30,7 @@ struct bcma_sflash_tbl_e {
@ -263,7 +251,7 @@ index e6ed4fe..4d07cce 100644
{ "M25P20", 0x11, 0x10000, 4, }, { "M25P20", 0x11, 0x10000, 4, },
{ "M25P40", 0x12, 0x10000, 8, }, { "M25P40", 0x12, 0x10000, 8, },
@@ -41,7 +41,7 @@ static struct bcma_sflash_tbl_e bcma_sflash_st_tbl[] = { @@ -41,7 +41,7 @@ static struct bcma_sflash_tbl_e bcma_sfl
{ 0 }, { 0 },
}; };
@ -272,7 +260,7 @@ index e6ed4fe..4d07cce 100644
{ "SST25WF512", 1, 0x1000, 16, }, { "SST25WF512", 1, 0x1000, 16, },
{ "SST25VF512", 0x48, 0x1000, 16, }, { "SST25VF512", 0x48, 0x1000, 16, },
{ "SST25WF010", 2, 0x1000, 32, }, { "SST25WF010", 2, 0x1000, 32, },
@@ -59,7 +59,7 @@ static struct bcma_sflash_tbl_e bcma_sflash_sst_tbl[] = { @@ -59,7 +59,7 @@ static struct bcma_sflash_tbl_e bcma_sfl
{ 0 }, { 0 },
}; };
@ -281,7 +269,7 @@ index e6ed4fe..4d07cce 100644
{ "AT45DB011", 0xc, 256, 512, }, { "AT45DB011", 0xc, 256, 512, },
{ "AT45DB021", 0x14, 256, 1024, }, { "AT45DB021", 0x14, 256, 1024, },
{ "AT45DB041", 0x1c, 256, 2048, }, { "AT45DB041", 0x1c, 256, 2048, },
@@ -89,7 +89,7 @@ int bcma_sflash_init(struct bcma_drv_cc *cc) @@ -89,7 +89,7 @@ int bcma_sflash_init(struct bcma_drv_cc
{ {
struct bcma_bus *bus = cc->core->bus; struct bcma_bus *bus = cc->core->bus;
struct bcma_sflash *sflash = &cc->sflash; struct bcma_sflash *sflash = &cc->sflash;
@ -290,11 +278,9 @@ index e6ed4fe..4d07cce 100644
u32 id, id2; u32 id, id2;
switch (cc->capabilities & BCMA_CC_CAP_FLASHT) { switch (cc->capabilities & BCMA_CC_CAP_FLASHT) {
diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c
index fbf2759..a355e63 100644
--- a/drivers/bcma/host_pci.c --- a/drivers/bcma/host_pci.c
+++ b/drivers/bcma/host_pci.c +++ b/drivers/bcma/host_pci.c
@@ -275,6 +275,7 @@ static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = { @@ -275,6 +275,7 @@ static DEFINE_PCI_DEVICE_TABLE(bcma_pci_
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4357) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4357) },
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4358) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4358) },
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4359) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4359) },
@ -302,11 +288,9 @@ index fbf2759..a355e63 100644
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },
{ 0, }, { 0, },
}; };
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index f72f52b..0067422 100644
--- a/drivers/bcma/main.c --- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c +++ b/drivers/bcma/main.c
@@ -93,6 +93,25 @@ struct bcma_device *bcma_find_core_unit(struct bcma_bus *bus, u16 coreid, @@ -93,6 +93,25 @@ struct bcma_device *bcma_find_core_unit(
return NULL; return NULL;
} }
@ -332,8 +316,6 @@ index f72f52b..0067422 100644
static void bcma_release_core_dev(struct device *dev) static void bcma_release_core_dev(struct device *dev)
{ {
struct bcma_device *core = container_of(dev, struct bcma_device, dev); struct bcma_device *core = container_of(dev, struct bcma_device, dev);
diff --git a/drivers/bcma/sprom.c b/drivers/bcma/sprom.c
index 8934298..72bf454 100644
--- a/drivers/bcma/sprom.c --- a/drivers/bcma/sprom.c
+++ b/drivers/bcma/sprom.c +++ b/drivers/bcma/sprom.c
@@ -72,12 +72,12 @@ fail: @@ -72,12 +72,12 @@ fail:
@ -353,7 +335,7 @@ index 8934298..72bf454 100644
} }
/************************************************** /**************************************************
@@ -124,29 +124,29 @@ static inline u8 bcma_crc8(u8 crc, u8 data) @@ -124,29 +124,29 @@ static inline u8 bcma_crc8(u8 crc, u8 da
return t[crc ^ data]; return t[crc ^ data];
} }
@ -389,7 +371,7 @@ index 8934298..72bf454 100644
expected_crc = tmp >> SSB_SPROM_REVISION_CRC_SHIFT; expected_crc = tmp >> SSB_SPROM_REVISION_CRC_SHIFT;
if (crc != expected_crc) if (crc != expected_crc)
return -EPROTO; return -EPROTO;
@@ -154,21 +154,25 @@ static int bcma_sprom_check_crc(const u16 *sprom) @@ -154,21 +154,25 @@ static int bcma_sprom_check_crc(const u1
return 0; return 0;
} }
@ -419,7 +401,7 @@ index 8934298..72bf454 100644
return 0; return 0;
} }
@@ -208,9 +212,6 @@ static void bcma_sprom_extract_r8(struct bcma_bus *bus, const u16 *sprom) @@ -208,9 +212,6 @@ static void bcma_sprom_extract_r8(struct
BUILD_BUG_ON(ARRAY_SIZE(pwr_info_offset) != BUILD_BUG_ON(ARRAY_SIZE(pwr_info_offset) !=
ARRAY_SIZE(bus->sprom.core_pwr_info)); ARRAY_SIZE(bus->sprom.core_pwr_info));
@ -429,7 +411,7 @@ index 8934298..72bf454 100644
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
v = sprom[SPOFF(SSB_SPROM8_IL0MAC) + i]; v = sprom[SPOFF(SSB_SPROM8_IL0MAC) + i];
*(((__be16 *)bus->sprom.il0mac) + i) = cpu_to_be16(v); *(((__be16 *)bus->sprom.il0mac) + i) = cpu_to_be16(v);
@@ -502,7 +503,7 @@ static bool bcma_sprom_onchip_available(struct bcma_bus *bus) @@ -502,7 +503,7 @@ static bool bcma_sprom_onchip_available(
case BCMA_CHIP_ID_BCM4331: case BCMA_CHIP_ID_BCM4331:
present = chip_status & BCMA_CC_CHIPST_4331_OTP_PRESENT; present = chip_status & BCMA_CC_CHIPST_4331_OTP_PRESENT;
break; break;
@ -500,8 +482,6 @@ index 8934298..72bf454 100644
- kfree(sprom); - kfree(sprom);
return err; return err;
} }
diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h
index 2e34db8..622fc50 100644
--- a/include/linux/bcma/bcma.h --- a/include/linux/bcma/bcma.h
+++ b/include/linux/bcma/bcma.h +++ b/include/linux/bcma/bcma.h
@@ -144,6 +144,7 @@ struct bcma_host_ops { @@ -144,6 +144,7 @@ struct bcma_host_ops {
@ -512,8 +492,6 @@ index 2e34db8..622fc50 100644
#define BCMA_CHIP_ID_BCM43224 43224 #define BCMA_CHIP_ID_BCM43224 43224
#define BCMA_PKG_ID_BCM43224_FAB_CSM 0x8 #define BCMA_PKG_ID_BCM43224_FAB_CSM 0x8
#define BCMA_PKG_ID_BCM43224_FAB_SMIC 0xa #define BCMA_PKG_ID_BCM43224_FAB_SMIC 0xa
diff --git a/include/linux/bcma/bcma_driver_chipcommon.h b/include/linux/bcma/bcma_driver_chipcommon.h
index b8b09ea..c49e1a1 100644
--- a/include/linux/bcma/bcma_driver_chipcommon.h --- a/include/linux/bcma/bcma_driver_chipcommon.h
+++ b/include/linux/bcma/bcma_driver_chipcommon.h +++ b/include/linux/bcma/bcma_driver_chipcommon.h
@@ -330,6 +330,8 @@ @@ -330,6 +330,8 @@

33
target/linux/generic/patches-3.10/531-debloat_lzma.patch
View File

@ -219,26 +219,26 @@
{ {
UInt32 dicSize; UInt32 dicSize;
Byte d; Byte d;
@@ -935,33 +883,11 @@ static SRes LzmaDec_AllocateProbs2(CLzma @@ -935,7 +883,7 @@ static SRes LzmaDec_AllocateProbs2(CLzma
return SZ_OK; return SZ_OK;
} }
-SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc) -SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
-{
- CLzmaProps propNew;
- RINOK(LzmaProps_Decode(&propNew, props, propsSize));
- RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
- p->prop = propNew;
- return SZ_OK;
-}
-
-SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
+static SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc) +static SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
{ {
CLzmaProps propNew; CLzmaProps propNew;
- SizeT dicBufSize;
RINOK(LzmaProps_Decode(&propNew, props, propsSize)); RINOK(LzmaProps_Decode(&propNew, props, propsSize));
RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc)); @@ -943,28 +891,6 @@ SRes LzmaDec_AllocateProbs(CLzmaDec *p,
p->prop = propNew;
return SZ_OK;
}
-
-SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc)
-{
- CLzmaProps propNew;
- SizeT dicBufSize;
- RINOK(LzmaProps_Decode(&propNew, props, propsSize));
- RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc));
- dicBufSize = propNew.dicSize; - dicBufSize = propNew.dicSize;
- if (p->dic == 0 || dicBufSize != p->dicBufSize) - if (p->dic == 0 || dicBufSize != p->dicBufSize)
- { - {
@ -251,9 +251,12 @@
- } - }
- } - }
- p->dicBufSize = dicBufSize; - p->dicBufSize = dicBufSize;
p->prop = propNew; - p->prop = propNew;
return SZ_OK; - return SZ_OK;
} -}
SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
--- a/include/linux/lzma/LzmaEnc.h --- a/include/linux/lzma/LzmaEnc.h
+++ b/include/linux/lzma/LzmaEnc.h +++ b/include/linux/lzma/LzmaEnc.h
@@ -31,9 +31,6 @@ typedef struct _CLzmaEncProps @@ -31,9 +31,6 @@ typedef struct _CLzmaEncProps

8
target/linux/generic/patches-3.10/610-netfilter_match_bypass_default_checks.patch
View File

@ -76,10 +76,11 @@
counters = alloc_counters(table); counters = alloc_counters(table);
if (IS_ERR(counters)) if (IS_ERR(counters))
@@ -961,6 +990,14 @@ copy_entries_to_user(unsigned int total_ @@ -960,6 +989,14 @@ copy_entries_to_user(unsigned int total_
ret = -EFAULT;
goto free_counters; goto free_counters;
} }
+
+ flags = e->ip.flags & IPT_F_MASK; + flags = e->ip.flags & IPT_F_MASK;
+ if (copy_to_user(userptr + off + if (copy_to_user(userptr + off
+ + offsetof(struct ipt_entry, ip.flags), + + offsetof(struct ipt_entry, ip.flags),
@ -87,7 +88,6 @@
+ ret = -EFAULT; + ret = -EFAULT;
+ goto free_counters; + goto free_counters;
+ } + }
+
for (i = sizeof(struct ipt_entry); for (i = sizeof(struct ipt_entry);
i < e->target_offset; i < e->target_offset;
i += m->u.match_size) {

6
target/linux/generic/patches-3.10/810-pci_disable_common_quirks.patch
View File

@ -23,7 +23,7 @@
/* The Mellanox Tavor device gives false positive parity errors /* The Mellanox Tavor device gives false positive parity errors
* Mark this device with a broken_parity_status, to allow * Mark this device with a broken_parity_status, to allow
* PCI scanning code to "skip" this now blacklisted device. * PCI scanning code to "skip" this now blacklisted device.
@@ -2864,6 +2865,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I @@ -2866,6 +2867,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata);
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata);
@ -31,7 +31,7 @@
static ktime_t fixup_debug_start(struct pci_dev *dev, static ktime_t fixup_debug_start(struct pci_dev *dev,
void (*fn)(struct pci_dev *dev)) void (*fn)(struct pci_dev *dev))
@@ -2895,6 +2897,8 @@ static void fixup_debug_report(struct pc @@ -2897,6 +2899,8 @@ static void fixup_debug_report(struct pc
} }
} }
@ -40,7 +40,7 @@
/* /*
* Some BIOS implementations leave the Intel GPU interrupts enabled, * Some BIOS implementations leave the Intel GPU interrupts enabled,
* even though no one is handling them (f.e. i915 driver is never loaded). * even though no one is handling them (f.e. i915 driver is never loaded).
@@ -2929,6 +2933,8 @@ static void disable_igfx_irq(struct pci_ @@ -2931,6 +2935,8 @@ static void disable_igfx_irq(struct pci_
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0102, disable_igfx_irq); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0102, disable_igfx_irq);
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq);

2
target/linux/generic/patches-3.10/902-debloat_proc.patch
View File

@ -111,7 +111,7 @@
if (!root_irq_dir) if (!root_irq_dir)
--- a/kernel/time/timer_list.c --- a/kernel/time/timer_list.c
+++ b/kernel/time/timer_list.c +++ b/kernel/time/timer_list.c
@@ -355,6 +355,8 @@ static int __init init_timer_list_procfs @@ -357,6 +357,8 @@ static int __init init_timer_list_procfs
{ {
struct proc_dir_entry *pe; struct proc_dir_entry *pe;

2
target/linux/imx23/Makefile
View File

@ -12,7 +12,7 @@ BOARDNAME:=Freescale i.MX23 series
FEATURES:=ext4 rtc usb gpio FEATURES:=ext4 rtc usb gpio
CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -fno-caller-saves CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -fno-caller-saves
MAINTAINER:=Zoltan HERPAI <wigyori@uid0.hu> MAINTAINER:=Zoltan HERPAI <wigyori@uid0.hu>
LINUX_VERSION:=3.10.1 LINUX_VERSION:=3.10.2
KERNELNAME:="zImage dtbs" KERNELNAME:="zImage dtbs"
#DEPENDS:=+imx-bootlets #DEPENDS:=+imx-bootlets

2
target/linux/imx6/Makefile
View File

@ -13,7 +13,7 @@ FEATURES:=audio display gpio pcie usb usbgadget squashfs targz
CFLAGS:=-Os -pipe -mtune=cortex-a9 -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp CFLAGS:=-Os -pipe -mtune=cortex-a9 -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp
MAINTAINER:=Luka Perkov <luka@openwrt.org> MAINTAINER:=Luka Perkov <luka@openwrt.org>
LINUX_VERSION:=3.10.1 LINUX_VERSION:=3.10.2
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

12
target/linux/imx6/patches-3.10/110-gw5400-a.patch
View File

@ -10,7 +10,7 @@
imx6q-sabresd.dtb \ imx6q-sabresd.dtb \
--- a/arch/arm/boot/dts/imx6q.dtsi --- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -94,6 +94,14 @@ @@ -98,6 +98,14 @@
MX6Q_PAD_CSI0_DAT6__AUD3_TXFS 0x80000000 MX6Q_PAD_CSI0_DAT6__AUD3_TXFS 0x80000000
>; >;
}; };
@ -25,7 +25,7 @@
}; };
ecspi1 { ecspi1 {
@@ -201,6 +209,12 @@ @@ -205,6 +213,12 @@
MX6Q_PAD_EIM_D16__I2C2_SDA 0x4001b8b1 MX6Q_PAD_EIM_D16__I2C2_SDA 0x4001b8b1
>; >;
}; };
@ -38,7 +38,7 @@
}; };
i2c3 { i2c3 {
@@ -210,6 +224,12 @@ @@ -214,6 +228,12 @@
MX6Q_PAD_EIM_D18__I2C3_SDA 0x4001b8b1 MX6Q_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
>; >;
}; };
@ -51,7 +51,7 @@
}; };
uart1 { uart1 {
@@ -219,6 +239,12 @@ @@ -223,6 +243,12 @@
MX6Q_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1 MX6Q_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
>; >;
}; };
@ -64,7 +64,7 @@
}; };
uart2 { uart2 {
@@ -228,6 +254,21 @@ @@ -232,6 +258,21 @@
MX6Q_PAD_EIM_D27__UART2_RX_DATA 0x1b0b1 MX6Q_PAD_EIM_D27__UART2_RX_DATA 0x1b0b1
>; >;
}; };
@ -86,7 +86,7 @@
}; };
uart4 { uart4 {
@@ -238,6 +279,15 @@ @@ -242,6 +283,15 @@
>; >;
}; };
}; };

2
target/linux/imx6/patches-3.10/200-imx6_pcie.patch
View File

@ -1,6 +1,6 @@
--- a/arch/arm/boot/dts/imx6q.dtsi --- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -328,6 +328,15 @@ @@ -382,6 +382,15 @@
}; };
}; };

2
target/linux/ixp4xx/Makefile
View File

@ -13,7 +13,7 @@ FEATURES:=squashfs
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
SUBTARGETS=generic harddisk SUBTARGETS=generic harddisk
LINUX_VERSION:=3.10.1 LINUX_VERSION:=3.10.2
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

2
target/linux/malta/Makefile
View File

@ -12,7 +12,7 @@ SUBTARGETS:=le be le64 be64
INITRAMFS_EXTRA_FILES:= INITRAMFS_EXTRA_FILES:=
MAINTAINER:=Florian Fainelli <florian@openwrt.org> MAINTAINER:=Florian Fainelli <florian@openwrt.org>
LINUX_VERSION:=3.10.1 LINUX_VERSION:=3.10.2
DEVICE_TYPE:=developerboard DEVICE_TYPE:=developerboard

2
target/linux/mpc85xx/Makefile
View File

@ -14,7 +14,7 @@ FEATURES:=spe_fpu squashfs
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
SUBTARGETS=generic p1020 SUBTARGETS=generic p1020
LINUX_VERSION:=3.10.1 LINUX_VERSION:=3.10.2
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk

2
target/linux/ramips/Makefile
View File

@ -13,7 +13,7 @@ SUBTARGETS:=rt288x rt305x rt3883 mt7620a
CFLAGS:=-Os -pipe -fno-caller-saves -mno-branch-likely CFLAGS:=-Os -pipe -fno-caller-saves -mno-branch-likely
FEATURES:=squashfs gpio FEATURES:=squashfs gpio
LINUX_VERSION:=3.10.1 LINUX_VERSION:=3.10.2
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES+=\ DEFAULT_PACKAGES+=\

9
target/linux/ramips/patches-3.10/0001-MIPS-use-set_mode-to-enable-disable-the-cevt-r4k-irq.patch
View File

@ -9,11 +9,9 @@ Subject: [PATCH 01/33] MIPS: use set_mode() to enable/disable the cevt-r4k
arch/mips/kernel/cevt-r4k.c | 39 ++++++++++++++++++++++++++------------- arch/mips/kernel/cevt-r4k.c | 39 ++++++++++++++++++++++++++-------------
1 file changed, 26 insertions(+), 13 deletions(-) 1 file changed, 26 insertions(+), 13 deletions(-)
diff --git a/arch/mips/kernel/cevt-r4k.c b/arch/mips/kernel/cevt-r4k.c
index 02033ea..da4a003 100644
--- a/arch/mips/kernel/cevt-r4k.c --- a/arch/mips/kernel/cevt-r4k.c
+++ b/arch/mips/kernel/cevt-r4k.c +++ b/arch/mips/kernel/cevt-r4k.c
@@ -38,12 +38,6 @@ static int mips_next_event(unsigned long delta, @@ -38,12 +38,6 @@ static int mips_next_event(unsigned long
#endif /* CONFIG_MIPS_MT_SMTC */ #endif /* CONFIG_MIPS_MT_SMTC */
@ -26,7 +24,7 @@ index 02033ea..da4a003 100644
DEFINE_PER_CPU(struct clock_event_device, mips_clockevent_device); DEFINE_PER_CPU(struct clock_event_device, mips_clockevent_device);
int cp0_timer_irq_installed; int cp0_timer_irq_installed;
@@ -90,6 +84,32 @@ struct irqaction c0_compare_irqaction = { @@ -90,6 +84,32 @@ struct irqaction c0_compare_irqaction =
.name = "timer", .name = "timer",
}; };
@ -73,6 +71,3 @@ index 02033ea..da4a003 100644
return 0; return 0;
} }
--
1.7.10.4

14
target/linux/ramips/patches-3.10/0002-MIPS-ralink-add-pinmux-driver.patch
View File

@ -16,8 +16,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
4 files changed, 82 insertions(+), 1 deletion(-) 4 files changed, 82 insertions(+), 1 deletion(-)
create mode 100644 arch/mips/ralink/pinmux.c create mode 100644 arch/mips/ralink/pinmux.c
diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile
index 38cf1a8..341b4de 100644
--- a/arch/mips/ralink/Makefile --- a/arch/mips/ralink/Makefile
+++ b/arch/mips/ralink/Makefile +++ b/arch/mips/ralink/Makefile
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
@ -29,19 +27,15 @@ index 38cf1a8..341b4de 100644
obj-$(CONFIG_SOC_RT288X) += rt288x.o obj-$(CONFIG_SOC_RT288X) += rt288x.o
obj-$(CONFIG_SOC_RT305X) += rt305x.o obj-$(CONFIG_SOC_RT305X) += rt305x.o
diff --git a/arch/mips/ralink/common.h b/arch/mips/ralink/common.h
index 83144c3..f113fd6 100644
--- a/arch/mips/ralink/common.h --- a/arch/mips/ralink/common.h
+++ b/arch/mips/ralink/common.h +++ b/arch/mips/ralink/common.h
@@ -50,4 +50,6 @@ extern void prom_soc_init(struct ralink_soc_info *soc_info); @@ -50,4 +50,6 @@ extern void prom_soc_init(struct ralink_
__iomem void *plat_of_remap_node(const char *node); __iomem void *plat_of_remap_node(const char *node);
+void ralink_pinmux(void); +void ralink_pinmux(void);
+ +
#endif /* _RALINK_COMMON_H__ */ #endif /* _RALINK_COMMON_H__ */
diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
index 6b5f340..b25c1f2 100644
--- a/arch/mips/ralink/of.c --- a/arch/mips/ralink/of.c
+++ b/arch/mips/ralink/of.c +++ b/arch/mips/ralink/of.c
@@ -110,6 +110,8 @@ static int __init plat_of_setup(void) @@ -110,6 +110,8 @@ static int __init plat_of_setup(void)
@ -53,9 +47,6 @@ index 6b5f340..b25c1f2 100644
return 0; return 0;
} }
diff --git a/arch/mips/ralink/pinmux.c b/arch/mips/ralink/pinmux.c
new file mode 100644
index 0000000..1720216
--- /dev/null --- /dev/null
+++ b/arch/mips/ralink/pinmux.c +++ b/arch/mips/ralink/pinmux.c
@@ -0,0 +1,77 @@ @@ -0,0 +1,77 @@
@ -136,6 +127,3 @@ index 0000000..1720216
+ +
+ rt_sysc_w32(mode, SYSC_REG_GPIO_MODE); + rt_sysc_w32(mode, SYSC_REG_GPIO_MODE);
+} +}
--
1.7.10.4

8
target/linux/ramips/patches-3.10/0003-MIPS-ralink-add-support-for-periodic-timer-irq.patch
View File

@ -12,8 +12,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
2 files changed, 193 insertions(+), 1 deletion(-) 2 files changed, 193 insertions(+), 1 deletion(-)
create mode 100644 arch/mips/ralink/timer.c create mode 100644 arch/mips/ralink/timer.c
diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile
index 341b4de..cae7d88 100644
--- a/arch/mips/ralink/Makefile --- a/arch/mips/ralink/Makefile
+++ b/arch/mips/ralink/Makefile +++ b/arch/mips/ralink/Makefile
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
@ -25,9 +23,6 @@ index 341b4de..cae7d88 100644
obj-$(CONFIG_SOC_RT288X) += rt288x.o obj-$(CONFIG_SOC_RT288X) += rt288x.o
obj-$(CONFIG_SOC_RT305X) += rt305x.o obj-$(CONFIG_SOC_RT305X) += rt305x.o
diff --git a/arch/mips/ralink/timer.c b/arch/mips/ralink/timer.c
new file mode 100644
index 0000000..0a6856c
--- /dev/null --- /dev/null
+++ b/arch/mips/ralink/timer.c +++ b/arch/mips/ralink/timer.c
@@ -0,0 +1,192 @@ @@ -0,0 +1,192 @@
@ -223,6 +218,3 @@ index 0000000..0a6856c
+MODULE_DESCRIPTION("Ralink RT2880 timer"); +MODULE_DESCRIPTION("Ralink RT2880 timer");
+MODULE_AUTHOR("John Crispin <blogic@openwrt.org"); +MODULE_AUTHOR("John Crispin <blogic@openwrt.org");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
--
1.7.10.4

7
target/linux/ramips/patches-3.10/0004-MIPS-ralink-add-rt_sysc_m32-helper.patch
View File

@ -8,11 +8,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
arch/mips/include/asm/mach-ralink/ralink_regs.h | 7 +++++++ arch/mips/include/asm/mach-ralink/ralink_regs.h | 7 +++++++
1 file changed, 7 insertions(+) 1 file changed, 7 insertions(+)
diff --git a/arch/mips/include/asm/mach-ralink/ralink_regs.h b/arch/mips/include/asm/mach-ralink/ralink_regs.h
index 5a508f9..bd93014 100644
--- a/arch/mips/include/asm/mach-ralink/ralink_regs.h --- a/arch/mips/include/asm/mach-ralink/ralink_regs.h
+++ b/arch/mips/include/asm/mach-ralink/ralink_regs.h +++ b/arch/mips/include/asm/mach-ralink/ralink_regs.h
@@ -26,6 +26,13 @@ static inline u32 rt_sysc_r32(unsigned reg) @@ -26,6 +26,13 @@ static inline u32 rt_sysc_r32(unsigned r
return __raw_readl(rt_sysc_membase + reg); return __raw_readl(rt_sysc_membase + reg);
} }
@ -26,6 +24,3 @@ index 5a508f9..bd93014 100644
static inline void rt_memc_w32(u32 val, unsigned reg) static inline void rt_memc_w32(u32 val, unsigned reg)
{ {
__raw_writel(val, rt_memc_membase + reg); __raw_writel(val, rt_memc_membase + reg);
--
1.7.10.4

7
target/linux/ramips/patches-3.10/0005-MIPS-ralink-make-mt7620-ram-detect-verbose.patch
View File

@ -10,11 +10,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
arch/mips/ralink/mt7620.c | 3 +++ arch/mips/ralink/mt7620.c | 3 +++
1 file changed, 3 insertions(+) 1 file changed, 3 insertions(+)
diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c
index 0018b1a..ccdec5a 100644
--- a/arch/mips/ralink/mt7620.c --- a/arch/mips/ralink/mt7620.c
+++ b/arch/mips/ralink/mt7620.c +++ b/arch/mips/ralink/mt7620.c
@@ -214,16 +214,19 @@ void prom_soc_init(struct ralink_soc_info *soc_info) @@ -214,16 +214,19 @@ void prom_soc_init(struct ralink_soc_inf
switch (dram_type) { switch (dram_type) {
case SYSCFG0_DRAM_TYPE_SDRAM: case SYSCFG0_DRAM_TYPE_SDRAM:
@ -34,6 +32,3 @@ index 0018b1a..ccdec5a 100644
soc_info->mem_size_min = MT7620_DDR2_SIZE_MIN; soc_info->mem_size_min = MT7620_DDR2_SIZE_MIN;
soc_info->mem_size_max = MT7620_DDR2_SIZE_MAX; soc_info->mem_size_max = MT7620_DDR2_SIZE_MAX;
break; break;
--
1.7.10.4

9
target/linux/ramips/patches-3.10/0006-MIPS-ralink-add-verbose-pmu-info.patch
View File

@ -10,8 +10,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
arch/mips/ralink/mt7620.c | 26 ++++++++++++++++++++++++++ arch/mips/ralink/mt7620.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+) 1 file changed, 26 insertions(+)
diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c
index ccdec5a..62356a0 100644
--- a/arch/mips/ralink/mt7620.c --- a/arch/mips/ralink/mt7620.c
+++ b/arch/mips/ralink/mt7620.c +++ b/arch/mips/ralink/mt7620.c
@@ -20,6 +20,22 @@ @@ -20,6 +20,22 @@
@ -37,7 +35,7 @@ index ccdec5a..62356a0 100644
/* does the board have sdram or ddram */ /* does the board have sdram or ddram */
static int dram_type; static int dram_type;
@@ -187,6 +203,8 @@ void prom_soc_init(struct ralink_soc_info *soc_info) @@ -187,6 +203,8 @@ void prom_soc_init(struct ralink_soc_inf
u32 n1; u32 n1;
u32 rev; u32 rev;
u32 cfg0; u32 cfg0;
@ -46,7 +44,7 @@ index ccdec5a..62356a0 100644
n0 = __raw_readl(sysc + SYSC_REG_CHIP_NAME0); n0 = __raw_readl(sysc + SYSC_REG_CHIP_NAME0);
n1 = __raw_readl(sysc + SYSC_REG_CHIP_NAME1); n1 = __raw_readl(sysc + SYSC_REG_CHIP_NAME1);
@@ -234,4 +252,12 @@ void prom_soc_init(struct ralink_soc_info *soc_info) @@ -234,4 +252,12 @@ void prom_soc_init(struct ralink_soc_inf
BUG(); BUG();
} }
soc_info->mem_base = MT7620_DRAM_BASE; soc_info->mem_base = MT7620_DRAM_BASE;
@ -59,6 +57,3 @@ index ccdec5a..62356a0 100644
+ pr_info("Digital PMU set to %s control\n", + pr_info("Digital PMU set to %s control\n",
+ (pmu1 & DIG_SW_SEL) ? ("sw") : ("hw")); + (pmu1 & DIG_SW_SEL) ? ("sw") : ("hw"));
} }
--
1.7.10.4

8
target/linux/ramips/patches-3.10/0007-MIPS-ralink-adds-a-bootrom-dumper-module.patch
View File

@ -13,8 +13,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
2 files changed, 50 insertions(+) 2 files changed, 50 insertions(+)
create mode 100644 arch/mips/ralink/bootrom.c create mode 100644 arch/mips/ralink/bootrom.c
diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile
index cae7d88..5fa6129 100644
--- a/arch/mips/ralink/Makefile --- a/arch/mips/ralink/Makefile
+++ b/arch/mips/ralink/Makefile +++ b/arch/mips/ralink/Makefile
@@ -15,4 +15,6 @@ obj-$(CONFIG_SOC_MT7620) += mt7620.o @@ -15,4 +15,6 @@ obj-$(CONFIG_SOC_MT7620) += mt7620.o
@ -24,9 +22,6 @@ index cae7d88..5fa6129 100644
+obj-$(CONFIG_DEBUG_FS) += bootrom.o +obj-$(CONFIG_DEBUG_FS) += bootrom.o
+ +
obj-y += dts/ obj-y += dts/
diff --git a/arch/mips/ralink/bootrom.c b/arch/mips/ralink/bootrom.c
new file mode 100644
index 0000000..f926f6f
--- /dev/null --- /dev/null
+++ b/arch/mips/ralink/bootrom.c +++ b/arch/mips/ralink/bootrom.c
@@ -0,0 +1,48 @@ @@ -0,0 +1,48 @@
@ -78,6 +73,3 @@ index 0000000..f926f6f
+} +}
+ +
+postcore_initcall(bootrom_setup); +postcore_initcall(bootrom_setup);
--
1.7.10.4

8
target/linux/ramips/patches-3.10/0008-MIPS-ralink-add-illegal-access-driver.patch
View File

@ -10,8 +10,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
2 files changed, 89 insertions(+) 2 files changed, 89 insertions(+)
create mode 100644 arch/mips/ralink/ill_acc.c create mode 100644 arch/mips/ralink/ill_acc.c
diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile
index 5fa6129..03af636 100644
--- a/arch/mips/ralink/Makefile --- a/arch/mips/ralink/Makefile
+++ b/arch/mips/ralink/Makefile +++ b/arch/mips/ralink/Makefile
@@ -8,6 +8,8 @@ @@ -8,6 +8,8 @@
@ -23,9 +21,6 @@ index 5fa6129..03af636 100644
obj-$(CONFIG_SOC_RT288X) += rt288x.o obj-$(CONFIG_SOC_RT288X) += rt288x.o
obj-$(CONFIG_SOC_RT305X) += rt305x.o obj-$(CONFIG_SOC_RT305X) += rt305x.o
obj-$(CONFIG_SOC_RT3883) += rt3883.o obj-$(CONFIG_SOC_RT3883) += rt3883.o
diff --git a/arch/mips/ralink/ill_acc.c b/arch/mips/ralink/ill_acc.c
new file mode 100644
index 0000000..4a3f696
--- /dev/null --- /dev/null
+++ b/arch/mips/ralink/ill_acc.c +++ b/arch/mips/ralink/ill_acc.c
@@ -0,0 +1,87 @@ @@ -0,0 +1,87 @@
@ -116,6 +111,3 @@ index 0000000..4a3f696
+} +}
+ +
+arch_initcall(ill_acc_of_setup); +arch_initcall(ill_acc_of_setup);
--
1.7.10.4

5
target/linux/ramips/patches-3.10/0009-MIPS-ralink-workaround-DTB-memory-issue.patch
View File

@ -11,8 +11,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
arch/mips/ralink/of.c | 2 +- arch/mips/ralink/of.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
index b25c1f2..8efb02b 100644
--- a/arch/mips/ralink/of.c --- a/arch/mips/ralink/of.c
+++ b/arch/mips/ralink/of.c +++ b/arch/mips/ralink/of.c
@@ -74,7 +74,7 @@ void __init device_tree_init(void) @@ -74,7 +74,7 @@ void __init device_tree_init(void)
@ -24,6 +22,3 @@ index b25c1f2..8efb02b 100644
} }
void __init plat_mem_setup(void) void __init plat_mem_setup(void)
--
1.7.10.4

5
target/linux/ramips/patches-3.10/0010-MIPS-ralink-add-spi-clock-definition-to-mt7620a.patch
View File

@ -8,8 +8,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
arch/mips/ralink/mt7620.c | 1 + arch/mips/ralink/mt7620.c | 1 +
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c
index 62356a0..96422e5 100644
--- a/arch/mips/ralink/mt7620.c --- a/arch/mips/ralink/mt7620.c
+++ b/arch/mips/ralink/mt7620.c +++ b/arch/mips/ralink/mt7620.c
@@ -183,6 +183,7 @@ void __init ralink_clk_init(void) @@ -183,6 +183,7 @@ void __init ralink_clk_init(void)
@ -20,6 +18,3 @@ index 62356a0..96422e5 100644
ralink_clk_add("10000c00.uartlite", 40000000); ralink_clk_add("10000c00.uartlite", 40000000);
} }
--
1.7.10.4

12
target/linux/ramips/patches-3.10/0011-PCI-MIPS-adds-rt2880-pci-support.patch
View File

@ -13,11 +13,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
3 files changed, 283 insertions(+) 3 files changed, 283 insertions(+)
create mode 100644 arch/mips/pci/pci-rt2880.c create mode 100644 arch/mips/pci/pci-rt2880.c
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
index 2cb1d31..77974ba 100644
--- a/arch/mips/pci/Makefile --- a/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile +++ b/arch/mips/pci/Makefile
@@ -41,6 +41,7 @@ obj-$(CONFIG_SIBYTE_BCM1x80) += pci-bcm1480.o pci-bcm1480ht.o @@ -41,6 +41,7 @@ obj-$(CONFIG_SIBYTE_BCM1x80) += pci-bcm1
obj-$(CONFIG_SNI_RM) += fixup-sni.o ops-sni.o obj-$(CONFIG_SNI_RM) += fixup-sni.o ops-sni.o
obj-$(CONFIG_LANTIQ) += fixup-lantiq.o obj-$(CONFIG_LANTIQ) += fixup-lantiq.o
obj-$(CONFIG_PCI_LANTIQ) += pci-lantiq.o ops-lantiq.o obj-$(CONFIG_PCI_LANTIQ) += pci-lantiq.o ops-lantiq.o
@ -25,9 +23,6 @@ index 2cb1d31..77974ba 100644
obj-$(CONFIG_TANBAC_TB0219) += fixup-tb0219.o obj-$(CONFIG_TANBAC_TB0219) += fixup-tb0219.o
obj-$(CONFIG_TANBAC_TB0226) += fixup-tb0226.o obj-$(CONFIG_TANBAC_TB0226) += fixup-tb0226.o
obj-$(CONFIG_TANBAC_TB0287) += fixup-tb0287.o obj-$(CONFIG_TANBAC_TB0287) += fixup-tb0287.o
diff --git a/arch/mips/pci/pci-rt2880.c b/arch/mips/pci/pci-rt2880.c
new file mode 100644
index 0000000..e2c4730
--- /dev/null --- /dev/null
+++ b/arch/mips/pci/pci-rt2880.c +++ b/arch/mips/pci/pci-rt2880.c
@@ -0,0 +1,281 @@ @@ -0,0 +1,281 @@
@ -312,8 +307,6 @@ index 0000000..e2c4730
+} +}
+ +
+arch_initcall(pcibios_init); +arch_initcall(pcibios_init);
diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
index 026e823..cd13da8 100644
--- a/arch/mips/ralink/Kconfig --- a/arch/mips/ralink/Kconfig
+++ b/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig
@@ -8,6 +8,7 @@ choice @@ -8,6 +8,7 @@ choice
@ -324,6 +317,3 @@ index 026e823..cd13da8 100644
config SOC_RT305X config SOC_RT305X
bool "RT305x" bool "RT305x"
--
1.7.10.4

12
target/linux/ramips/patches-3.10/0012-PCI-MIPS-adds-rt3883-pci-support.patch
View File

@ -13,11 +13,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
3 files changed, 642 insertions(+) 3 files changed, 642 insertions(+)
create mode 100644 arch/mips/pci/pci-rt3883.c create mode 100644 arch/mips/pci/pci-rt3883.c
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
index 77974ba..3cbfd9b 100644
--- a/arch/mips/pci/Makefile --- a/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile +++ b/arch/mips/pci/Makefile
@@ -42,6 +42,7 @@ obj-$(CONFIG_SNI_RM) += fixup-sni.o ops-sni.o @@ -42,6 +42,7 @@ obj-$(CONFIG_SNI_RM) += fixup-sni.o ops
obj-$(CONFIG_LANTIQ) += fixup-lantiq.o obj-$(CONFIG_LANTIQ) += fixup-lantiq.o
obj-$(CONFIG_PCI_LANTIQ) += pci-lantiq.o ops-lantiq.o obj-$(CONFIG_PCI_LANTIQ) += pci-lantiq.o ops-lantiq.o
obj-$(CONFIG_SOC_RT2880) += pci-rt2880.o obj-$(CONFIG_SOC_RT2880) += pci-rt2880.o
@ -25,9 +23,6 @@ index 77974ba..3cbfd9b 100644
obj-$(CONFIG_TANBAC_TB0219) += fixup-tb0219.o obj-$(CONFIG_TANBAC_TB0219) += fixup-tb0219.o
obj-$(CONFIG_TANBAC_TB0226) += fixup-tb0226.o obj-$(CONFIG_TANBAC_TB0226) += fixup-tb0226.o
obj-$(CONFIG_TANBAC_TB0287) += fixup-tb0287.o obj-$(CONFIG_TANBAC_TB0287) += fixup-tb0287.o
diff --git a/arch/mips/pci/pci-rt3883.c b/arch/mips/pci/pci-rt3883.c
new file mode 100644
index 0000000..212c90b
--- /dev/null --- /dev/null
+++ b/arch/mips/pci/pci-rt3883.c +++ b/arch/mips/pci/pci-rt3883.c
@@ -0,0 +1,640 @@ @@ -0,0 +1,640 @@
@ -671,8 +666,6 @@ index 0000000..212c90b
+} +}
+ +
+postcore_initcall(rt3883_pci_init); +postcore_initcall(rt3883_pci_init);
diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
index cd13da8..592e5f9 100644
--- a/arch/mips/ralink/Kconfig --- a/arch/mips/ralink/Kconfig
+++ b/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig
@@ -20,6 +20,7 @@ choice @@ -20,6 +20,7 @@ choice
@ -683,6 +676,3 @@ index cd13da8..592e5f9 100644
config SOC_MT7620 config SOC_MT7620
bool "MT7620" bool "MT7620"
--
1.7.10.4

10
target/linux/ramips/patches-3.10/0013-PCI-MIPS-adds-mt7620a-pcie-driver.patch
View File

@ -11,8 +11,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
3 files changed, 365 insertions(+) 3 files changed, 365 insertions(+)
create mode 100644 arch/mips/pci/pci-mt7620a.c create mode 100644 arch/mips/pci/pci-mt7620a.c
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
index 3cbfd9b..025d3a7 100644
--- a/arch/mips/pci/Makefile --- a/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile +++ b/arch/mips/pci/Makefile
@@ -43,6 +43,7 @@ obj-$(CONFIG_LANTIQ) += fixup-lantiq.o @@ -43,6 +43,7 @@ obj-$(CONFIG_LANTIQ) += fixup-lantiq.o
@ -23,9 +21,6 @@ index 3cbfd9b..025d3a7 100644
obj-$(CONFIG_TANBAC_TB0219) += fixup-tb0219.o obj-$(CONFIG_TANBAC_TB0219) += fixup-tb0219.o
obj-$(CONFIG_TANBAC_TB0226) += fixup-tb0226.o obj-$(CONFIG_TANBAC_TB0226) += fixup-tb0226.o
obj-$(CONFIG_TANBAC_TB0287) += fixup-tb0287.o obj-$(CONFIG_TANBAC_TB0287) += fixup-tb0287.o
diff --git a/arch/mips/pci/pci-mt7620a.c b/arch/mips/pci/pci-mt7620a.c
new file mode 100644
index 0000000..271763c
--- /dev/null --- /dev/null
+++ b/arch/mips/pci/pci-mt7620a.c +++ b/arch/mips/pci/pci-mt7620a.c
@@ -0,0 +1,363 @@ @@ -0,0 +1,363 @@
@ -392,8 +387,6 @@ index 0000000..271763c
+} +}
+ +
+arch_initcall(mt7620a_pci_init); +arch_initcall(mt7620a_pci_init);
diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
index 592e5f9..992e365 100644
--- a/arch/mips/ralink/Kconfig --- a/arch/mips/ralink/Kconfig
+++ b/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig
@@ -24,6 +24,7 @@ choice @@ -24,6 +24,7 @@ choice
@ -404,6 +397,3 @@ index 592e5f9..992e365 100644
endchoice endchoice
--
1.7.10.4

13
target/linux/ramips/patches-3.10/0014-NET-multi-phy-support.patch
View File

@ -9,11 +9,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
include/linux/phy.h | 2 +- include/linux/phy.h | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-) 2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 38f0b31..ad64a75 100644
--- a/drivers/net/phy/phy.c --- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c
@@ -773,7 +773,8 @@ void phy_state_machine(struct work_struct *work) @@ -820,7 +820,8 @@ void phy_state_machine(struct work_struc
* negotiation for now */ * negotiation for now */
if (!phydev->link) { if (!phydev->link) {
phydev->state = PHY_NOLINK; phydev->state = PHY_NOLINK;
@ -23,7 +21,7 @@ index 38f0b31..ad64a75 100644
phydev->adjust_link(phydev->attached_dev); phydev->adjust_link(phydev->attached_dev);
break; break;
} }
@@ -843,7 +844,8 @@ void phy_state_machine(struct work_struct *work) @@ -890,7 +891,8 @@ void phy_state_machine(struct work_struc
netif_carrier_on(phydev->attached_dev); netif_carrier_on(phydev->attached_dev);
} else { } else {
phydev->state = PHY_NOLINK; phydev->state = PHY_NOLINK;
@ -33,7 +31,7 @@ index 38f0b31..ad64a75 100644
} }
phydev->adjust_link(phydev->attached_dev); phydev->adjust_link(phydev->attached_dev);
@@ -855,7 +857,8 @@ void phy_state_machine(struct work_struct *work) @@ -902,7 +904,8 @@ void phy_state_machine(struct work_struc
case PHY_HALTED: case PHY_HALTED:
if (phydev->link) { if (phydev->link) {
phydev->link = 0; phydev->link = 0;
@ -43,8 +41,6 @@ index 38f0b31..ad64a75 100644
phydev->adjust_link(phydev->attached_dev); phydev->adjust_link(phydev->attached_dev);
} }
break; break;
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 9e11039..9a8ca78 100644
--- a/include/linux/phy.h --- a/include/linux/phy.h
+++ b/include/linux/phy.h +++ b/include/linux/phy.h
@@ -298,7 +298,7 @@ struct phy_device { @@ -298,7 +298,7 @@ struct phy_device {
@ -56,6 +52,3 @@ index 9e11039..9a8ca78 100644
enum phy_state state; enum phy_state state;
u32 dev_flags; u32 dev_flags;
--
1.7.10.4

9
target/linux/ramips/patches-3.10/0015-NET-add-of_get_mac_address_mtd.patch
View File

@ -14,8 +14,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
include/linux/of_net.h | 1 + include/linux/of_net.h | 1 +
2 files changed, 38 insertions(+) 2 files changed, 38 insertions(+)
diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c
index ffab033..15f4a71 100644
--- a/drivers/of/of_net.c --- a/drivers/of/of_net.c
+++ b/drivers/of/of_net.c +++ b/drivers/of/of_net.c
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
@ -26,7 +24,7 @@ index ffab033..15f4a71 100644
/** /**
* It maps 'enum phy_interface_t' found in include/linux/phy.h * It maps 'enum phy_interface_t' found in include/linux/phy.h
@@ -92,3 +93,39 @@ const void *of_get_mac_address(struct device_node *np) @@ -92,3 +93,39 @@ const void *of_get_mac_address(struct de
return NULL; return NULL;
} }
EXPORT_SYMBOL(of_get_mac_address); EXPORT_SYMBOL(of_get_mac_address);
@ -66,8 +64,6 @@ index ffab033..15f4a71 100644
+ return ret; + return ret;
+} +}
+EXPORT_SYMBOL_GPL(of_get_mac_address_mtd); +EXPORT_SYMBOL_GPL(of_get_mac_address_mtd);
diff --git a/include/linux/of_net.h b/include/linux/of_net.h
index 61bf53b..6e6b4a9 100644
--- a/include/linux/of_net.h --- a/include/linux/of_net.h
+++ b/include/linux/of_net.h +++ b/include/linux/of_net.h
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
@ -78,6 +74,3 @@ index 61bf53b..6e6b4a9 100644
#else #else
static inline const int of_get_phy_mode(struct device_node *np) static inline const int of_get_phy_mode(struct device_node *np)
{ {
--
1.7.10.4

60
target/linux/ramips/patches-3.10/0016-NET-MIPS-add-ralink-SoC-ethernet-driver.patch
View File

@ -46,9 +46,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
create mode 100644 drivers/net/ethernet/ralink/soc_rt305x.c create mode 100644 drivers/net/ethernet/ralink/soc_rt305x.c
create mode 100644 drivers/net/ethernet/ralink/soc_rt3883.c create mode 100644 drivers/net/ethernet/ralink/soc_rt3883.c
diff --git a/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h b/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h
new file mode 100644
index 0000000..2098c5c
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h +++ b/arch/mips/include/asm/mach-ralink/rt305x_esw_platform.h
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
@ -79,8 +76,6 @@ index 0000000..2098c5c
+}; +};
+ +
+#endif /* _RT305X_ESW_PLATFORM_H */ +#endif /* _RT305X_ESW_PLATFORM_H */
diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c
index ca7ee3a..1a6b458 100644
--- a/arch/mips/ralink/rt305x.c --- a/arch/mips/ralink/rt305x.c
+++ b/arch/mips/ralink/rt305x.c +++ b/arch/mips/ralink/rt305x.c
@@ -221,6 +221,7 @@ void __init ralink_clk_init(void) @@ -221,6 +221,7 @@ void __init ralink_clk_init(void)
@ -91,8 +86,6 @@ index ca7ee3a..1a6b458 100644
ralink_clk_add("10000b00.spi", sys_rate); ralink_clk_add("10000b00.spi", sys_rate);
ralink_clk_add("10000100.timer", wdt_rate); ralink_clk_add("10000100.timer", wdt_rate);
ralink_clk_add("10000120.watchdog", wdt_rate); ralink_clk_add("10000120.watchdog", wdt_rate);
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index ed956e0..0b3caa1 100644
--- a/drivers/net/ethernet/Kconfig --- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig
@@ -135,6 +135,7 @@ config ETHOC @@ -135,6 +135,7 @@ config ETHOC
@ -103,8 +96,6 @@ index ed956e0..0b3caa1 100644
source "drivers/net/ethernet/realtek/Kconfig" source "drivers/net/ethernet/realtek/Kconfig"
source "drivers/net/ethernet/renesas/Kconfig" source "drivers/net/ethernet/renesas/Kconfig"
source "drivers/net/ethernet/rdc/Kconfig" source "drivers/net/ethernet/rdc/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 8268d85..508c494 100644
--- a/drivers/net/ethernet/Makefile --- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile
@@ -53,6 +53,7 @@ obj-$(CONFIG_ETHOC) += ethoc.o @@ -53,6 +53,7 @@ obj-$(CONFIG_ETHOC) += ethoc.o
@ -115,9 +106,6 @@ index 8268d85..508c494 100644
obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/ obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/
obj-$(CONFIG_SH_ETH) += renesas/ obj-$(CONFIG_SH_ETH) += renesas/
obj-$(CONFIG_NET_VENDOR_RDC) += rdc/ obj-$(CONFIG_NET_VENDOR_RDC) += rdc/
diff --git a/drivers/net/ethernet/ralink/Kconfig b/drivers/net/ethernet/ralink/Kconfig
new file mode 100644
index 0000000..ca2c9ad
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/ralink/Kconfig +++ b/drivers/net/ethernet/ralink/Kconfig
@@ -0,0 +1,31 @@ @@ -0,0 +1,31 @@
@ -152,9 +140,6 @@ index 0000000..ca2c9ad
+ select PHYLIB + select PHYLIB
+ select SWCONFIG + select SWCONFIG
+endif +endif
diff --git a/drivers/net/ethernet/ralink/Makefile b/drivers/net/ethernet/ralink/Makefile
new file mode 100644
index 0000000..a38fa21
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/ralink/Makefile +++ b/drivers/net/ethernet/ralink/Makefile
@@ -0,0 +1,18 @@ @@ -0,0 +1,18 @@
@ -176,9 +161,6 @@ index 0000000..a38fa21
+ralink-eth-$(CONFIG_SOC_MT7620) += soc_mt7620.o +ralink-eth-$(CONFIG_SOC_MT7620) += soc_mt7620.o
+ +
+obj-$(CONFIG_NET_RALINK) += ralink-eth.o +obj-$(CONFIG_NET_RALINK) += ralink-eth.o
diff --git a/drivers/net/ethernet/ralink/esw_rt3052.c b/drivers/net/ethernet/ralink/esw_rt3052.c
new file mode 100644
index 0000000..b937062
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/ralink/esw_rt3052.c +++ b/drivers/net/ethernet/ralink/esw_rt3052.c
@@ -0,0 +1,1463 @@ @@ -0,0 +1,1463 @@
@ -1645,9 +1627,6 @@ index 0000000..b937062
+{ +{
+ platform_driver_unregister(&esw_driver); + platform_driver_unregister(&esw_driver);
+} +}
diff --git a/drivers/net/ethernet/ralink/esw_rt3052.h b/drivers/net/ethernet/ralink/esw_rt3052.h
new file mode 100644
index 0000000..2ced3dff
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/ralink/esw_rt3052.h +++ b/drivers/net/ethernet/ralink/esw_rt3052.h
@@ -0,0 +1,32 @@ @@ -0,0 +1,32 @@
@ -1683,9 +1662,6 @@ index 0000000..2ced3dff
+ +
+#endif +#endif
+#endif +#endif
diff --git a/drivers/net/ethernet/ralink/gsw_mt7620a.c b/drivers/net/ethernet/ralink/gsw_mt7620a.c
new file mode 100644
index 0000000..9fa6a54
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/ralink/gsw_mt7620a.c +++ b/drivers/net/ethernet/ralink/gsw_mt7620a.c
@@ -0,0 +1,1027 @@ @@ -0,0 +1,1027 @@
@ -2716,9 +2692,6 @@ index 0000000..9fa6a54
+ +
+ return 0; + return 0;
+} +}
diff --git a/drivers/net/ethernet/ralink/gsw_mt7620a.h b/drivers/net/ethernet/ralink/gsw_mt7620a.h
new file mode 100644
index 0000000..fd4add5
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/ralink/gsw_mt7620a.h +++ b/drivers/net/ethernet/ralink/gsw_mt7620a.h
@@ -0,0 +1,29 @@ @@ -0,0 +1,29 @@
@ -2751,9 +2724,6 @@ index 0000000..fd4add5
+extern int mt7620a_has_carrier(struct fe_priv *priv); +extern int mt7620a_has_carrier(struct fe_priv *priv);
+ +
+#endif +#endif
diff --git a/drivers/net/ethernet/ralink/mdio.c b/drivers/net/ethernet/ralink/mdio.c
new file mode 100644
index 0000000..b265c75
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/ralink/mdio.c +++ b/drivers/net/ethernet/ralink/mdio.c
@@ -0,0 +1,245 @@ @@ -0,0 +1,245 @@
@ -3002,9 +2972,6 @@ index 0000000..b265c75
+ of_node_put(priv->mii_bus->dev.of_node); + of_node_put(priv->mii_bus->dev.of_node);
+ kfree(priv->mii_bus); + kfree(priv->mii_bus);
+} +}
diff --git a/drivers/net/ethernet/ralink/mdio.h b/drivers/net/ethernet/ralink/mdio.h
new file mode 100644
index 0000000..c3910a0
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/ralink/mdio.h +++ b/drivers/net/ethernet/ralink/mdio.h
@@ -0,0 +1,29 @@ @@ -0,0 +1,29 @@
@ -3037,9 +3004,6 @@ index 0000000..c3910a0
+static inline void fe_mdio_cleanup(struct fe_priv *priv) {} +static inline void fe_mdio_cleanup(struct fe_priv *priv) {}
+#endif +#endif
+#endif +#endif
diff --git a/drivers/net/ethernet/ralink/mdio_rt2880.c b/drivers/net/ethernet/ralink/mdio_rt2880.c
new file mode 100644
index 0000000..701c7b6
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/ralink/mdio_rt2880.c +++ b/drivers/net/ethernet/ralink/mdio_rt2880.c
@@ -0,0 +1,232 @@ @@ -0,0 +1,232 @@
@ -3275,9 +3239,6 @@ index 0000000..701c7b6
+ +
+ return; + return;
+} +}
diff --git a/drivers/net/ethernet/ralink/mdio_rt2880.h b/drivers/net/ethernet/ralink/mdio_rt2880.h
new file mode 100644
index 0000000..51e3633
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/ralink/mdio_rt2880.h +++ b/drivers/net/ethernet/ralink/mdio_rt2880.h
@@ -0,0 +1,26 @@ @@ -0,0 +1,26 @@
@ -3307,9 +3268,6 @@ index 0000000..51e3633
+void rt2880_port_init(struct fe_priv *priv, struct device_node *np); +void rt2880_port_init(struct fe_priv *priv, struct device_node *np);
+ +
+#endif +#endif
diff --git a/drivers/net/ethernet/ralink/ralink_soc_eth.c b/drivers/net/ethernet/ralink/ralink_soc_eth.c
new file mode 100644
index 0000000..8c36dba
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/ralink/ralink_soc_eth.c +++ b/drivers/net/ethernet/ralink/ralink_soc_eth.c
@@ -0,0 +1,735 @@ @@ -0,0 +1,735 @@
@ -4048,9 +4006,6 @@ index 0000000..8c36dba
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_AUTHOR("John Crispin <blogic@openwrt.org>"); +MODULE_AUTHOR("John Crispin <blogic@openwrt.org>");
+MODULE_DESCRIPTION("Ethernet driver for Ralink SoC"); +MODULE_DESCRIPTION("Ethernet driver for Ralink SoC");
diff --git a/drivers/net/ethernet/ralink/ralink_soc_eth.h b/drivers/net/ethernet/ralink/ralink_soc_eth.h
new file mode 100644
index 0000000..85bc881
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/ralink/ralink_soc_eth.h +++ b/drivers/net/ethernet/ralink/ralink_soc_eth.h
@@ -0,0 +1,374 @@ @@ -0,0 +1,374 @@
@ -4428,9 +4383,6 @@ index 0000000..85bc881
+u32 fe_r32(unsigned reg); +u32 fe_r32(unsigned reg);
+ +
+#endif /* FE_ETH_H */ +#endif /* FE_ETH_H */
diff --git a/drivers/net/ethernet/ralink/soc_mt7620.c b/drivers/net/ethernet/ralink/soc_mt7620.c
new file mode 100644
index 0000000..55e303f
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/ralink/soc_mt7620.c +++ b/drivers/net/ethernet/ralink/soc_mt7620.c
@@ -0,0 +1,111 @@ @@ -0,0 +1,111 @@
@ -4545,9 +4497,6 @@ index 0000000..55e303f
+}; +};
+ +
+MODULE_DEVICE_TABLE(of, of_fe_match); +MODULE_DEVICE_TABLE(of, of_fe_match);
diff --git a/drivers/net/ethernet/ralink/soc_rt2880.c b/drivers/net/ethernet/ralink/soc_rt2880.c
new file mode 100644
index 0000000..1110947
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/ralink/soc_rt2880.c +++ b/drivers/net/ethernet/ralink/soc_rt2880.c
@@ -0,0 +1,51 @@ @@ -0,0 +1,51 @@
@ -4602,9 +4551,6 @@ index 0000000..1110947
+}; +};
+ +
+MODULE_DEVICE_TABLE(of, of_fe_match); +MODULE_DEVICE_TABLE(of, of_fe_match);
diff --git a/drivers/net/ethernet/ralink/soc_rt305x.c b/drivers/net/ethernet/ralink/soc_rt305x.c
new file mode 100644
index 0000000..482ca1f
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/ralink/soc_rt305x.c +++ b/drivers/net/ethernet/ralink/soc_rt305x.c
@@ -0,0 +1,113 @@ @@ -0,0 +1,113 @@
@ -4721,9 +4667,6 @@ index 0000000..482ca1f
+}; +};
+ +
+MODULE_DEVICE_TABLE(of, of_fe_match); +MODULE_DEVICE_TABLE(of, of_fe_match);
diff --git a/drivers/net/ethernet/ralink/soc_rt3883.c b/drivers/net/ethernet/ralink/soc_rt3883.c
new file mode 100644
index 0000000..c660529
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/ralink/soc_rt3883.c +++ b/drivers/net/ethernet/ralink/soc_rt3883.c
@@ -0,0 +1,60 @@ @@ -0,0 +1,60 @@
@ -4787,6 +4730,3 @@ index 0000000..c660529
+ +
+MODULE_DEVICE_TABLE(of, of_fe_match); +MODULE_DEVICE_TABLE(of, of_fe_match);
+ +
--
1.7.10.4

7
target/linux/ramips/patches-3.10/0017-USB-MIPS-ralink-fix-usb-issue-on-mt7620.patch
View File

@ -12,8 +12,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
arch/mips/ralink/mt7620.c | 8 ++++++++ arch/mips/ralink/mt7620.c | 8 ++++++++
2 files changed, 9 insertions(+) 2 files changed, 9 insertions(+)
diff --git a/arch/mips/include/asm/mach-ralink/mt7620.h b/arch/mips/include/asm/mach-ralink/mt7620.h
index 9809972..d469c69 100644
--- a/arch/mips/include/asm/mach-ralink/mt7620.h --- a/arch/mips/include/asm/mach-ralink/mt7620.h
+++ b/arch/mips/include/asm/mach-ralink/mt7620.h +++ b/arch/mips/include/asm/mach-ralink/mt7620.h
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
@ -24,8 +22,6 @@ index 9809972..d469c69 100644
#define SYSC_REG_CPLL_CONFIG0 0x54 #define SYSC_REG_CPLL_CONFIG0 0x54
#define SYSC_REG_CPLL_CONFIG1 0x58 #define SYSC_REG_CPLL_CONFIG1 0x58
diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c
index 96422e5..6f6b1c8 100644
--- a/arch/mips/ralink/mt7620.c --- a/arch/mips/ralink/mt7620.c
+++ b/arch/mips/ralink/mt7620.c +++ b/arch/mips/ralink/mt7620.c
@@ -185,6 +185,14 @@ void __init ralink_clk_init(void) @@ -185,6 +185,14 @@ void __init ralink_clk_init(void)
@ -43,6 +39,3 @@ index 96422e5..6f6b1c8 100644
} }
void __init ralink_of_remap(void) void __init ralink_of_remap(void)
--
1.7.10.4

12
target/linux/ramips/patches-3.10/0018-USB-phy-add-ralink-SoC-driver.patch
View File

@ -11,8 +11,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
3 files changed, 200 insertions(+) 3 files changed, 200 insertions(+)
create mode 100644 drivers/usb/phy/ralink-phy.c create mode 100644 drivers/usb/phy/ralink-phy.c
diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig
index 2311b1e..2944b8c 100644
--- a/drivers/usb/phy/Kconfig --- a/drivers/usb/phy/Kconfig
+++ b/drivers/usb/phy/Kconfig +++ b/drivers/usb/phy/Kconfig
@@ -210,4 +210,12 @@ config USB_ULPI_VIEWPORT @@ -210,4 +210,12 @@ config USB_ULPI_VIEWPORT
@ -28,18 +26,13 @@ index 2311b1e..2944b8c 100644
+ SoCs. + SoCs.
+ +
endif # USB_PHY endif # USB_PHY
diff --git a/drivers/usb/phy/Makefile b/drivers/usb/phy/Makefile
index a9169cb..f7da66b 100644
--- a/drivers/usb/phy/Makefile --- a/drivers/usb/phy/Makefile
+++ b/drivers/usb/phy/Makefile +++ b/drivers/usb/phy/Makefile
@@ -31,3 +31,4 @@ obj-$(CONFIG_USB_MXS_PHY) += phy-mxs-usb.o @@ -31,3 +31,4 @@ obj-$(CONFIG_USB_MXS_PHY) += phy-mxs-us
obj-$(CONFIG_USB_RCAR_PHY) += phy-rcar-usb.o obj-$(CONFIG_USB_RCAR_PHY) += phy-rcar-usb.o
obj-$(CONFIG_USB_ULPI) += phy-ulpi.o obj-$(CONFIG_USB_ULPI) += phy-ulpi.o
obj-$(CONFIG_USB_ULPI_VIEWPORT) += phy-ulpi-viewport.o obj-$(CONFIG_USB_ULPI_VIEWPORT) += phy-ulpi-viewport.o
+obj-$(CONFIG_RALINK_USBPHY) += ralink-phy.o +obj-$(CONFIG_RALINK_USBPHY) += ralink-phy.o
diff --git a/drivers/usb/phy/ralink-phy.c b/drivers/usb/phy/ralink-phy.c
new file mode 100644
index 0000000..269cff4
--- /dev/null --- /dev/null
+++ b/drivers/usb/phy/ralink-phy.c +++ b/drivers/usb/phy/ralink-phy.c
@@ -0,0 +1,191 @@ @@ -0,0 +1,191 @@
@ -234,6 +227,3 @@ index 0000000..269cff4
+MODULE_LICENSE("GPL v2"); +MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("Ralink USB phy"); +MODULE_DESCRIPTION("Ralink USB phy");
+MODULE_AUTHOR("John Crispin <blogic@openwrt.org>"); +MODULE_AUTHOR("John Crispin <blogic@openwrt.org>");
--
1.7.10.4

48
target/linux/ramips/patches-3.10/0019-USB-add-OHCI-EHCI-OF-binding.patch
View File

@ -13,11 +13,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
drivers/usb/host/ohci-platform.c | 37 ++++++++++++++++++++++++++++++++----- drivers/usb/host/ohci-platform.c | 37 ++++++++++++++++++++++++++++++++-----
4 files changed, 51 insertions(+), 10 deletions(-) 4 files changed, 51 insertions(+), 10 deletions(-)
Index: linux-3.10.1/arch/mips/ralink/Kconfig --- a/arch/mips/ralink/Kconfig
=================================================================== +++ b/arch/mips/ralink/Kconfig
--- linux-3.10.1.orig/arch/mips/ralink/Kconfig 2013-07-15 17:35:28.021178556 +0200 @@ -24,6 +24,8 @@ choice
+++ linux-3.10.1/arch/mips/ralink/Kconfig 2013-07-15 20:00:19.501385660 +0200
@@ -24,6 +24,8 @@
config SOC_MT7620 config SOC_MT7620
bool "MT7620" bool "MT7620"
@ -26,11 +24,9 @@ Index: linux-3.10.1/arch/mips/ralink/Kconfig
select HW_HAS_PCI select HW_HAS_PCI
endchoice endchoice
Index: linux-3.10.1/drivers/usb/Makefile --- a/drivers/usb/Makefile
=================================================================== +++ b/drivers/usb/Makefile
--- linux-3.10.1.orig/drivers/usb/Makefile 2013-07-13 20:42:41.000000000 +0200 @@ -10,6 +10,8 @@ obj-$(CONFIG_USB_DWC3) += dwc3/
+++ linux-3.10.1/drivers/usb/Makefile 2013-07-15 19:47:26.725367249 +0200
@@ -10,6 +10,8 @@
obj-$(CONFIG_USB_MON) += mon/ obj-$(CONFIG_USB_MON) += mon/
@ -39,7 +35,7 @@ Index: linux-3.10.1/drivers/usb/Makefile
obj-$(CONFIG_PCI) += host/ obj-$(CONFIG_PCI) += host/
obj-$(CONFIG_USB_EHCI_HCD) += host/ obj-$(CONFIG_USB_EHCI_HCD) += host/
obj-$(CONFIG_USB_ISP116X_HCD) += host/ obj-$(CONFIG_USB_ISP116X_HCD) += host/
@@ -44,7 +46,6 @@ @@ -44,7 +46,6 @@ obj-$(CONFIG_USB_MICROTEK) += image/
obj-$(CONFIG_USB_SERIAL) += serial/ obj-$(CONFIG_USB_SERIAL) += serial/
obj-$(CONFIG_USB) += misc/ obj-$(CONFIG_USB) += misc/
@ -47,10 +43,8 @@ Index: linux-3.10.1/drivers/usb/Makefile
obj-$(CONFIG_EARLY_PRINTK_DBGP) += early/ obj-$(CONFIG_EARLY_PRINTK_DBGP) += early/
obj-$(CONFIG_USB_ATM) += atm/ obj-$(CONFIG_USB_ATM) += atm/
Index: linux-3.10.1/drivers/usb/host/ehci-platform.c --- a/drivers/usb/host/ehci-platform.c
=================================================================== +++ b/drivers/usb/host/ehci-platform.c
--- linux-3.10.1.orig/drivers/usb/host/ehci-platform.c 2013-07-15 17:35:22.761178428 +0200
+++ linux-3.10.1/drivers/usb/host/ehci-platform.c 2013-07-15 19:47:14.525366961 +0200
@@ -29,6 +29,8 @@ @@ -29,6 +29,8 @@
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/usb/hcd.h> #include <linux/usb/hcd.h>
@ -60,7 +54,7 @@ Index: linux-3.10.1/drivers/usb/host/ehci-platform.c
#include "ehci.h" #include "ehci.h"
@@ -118,6 +120,15 @@ @@ -118,6 +120,15 @@ static int ehci_platform_probe(struct pl
hcd->rsrc_start = res_mem->start; hcd->rsrc_start = res_mem->start;
hcd->rsrc_len = resource_size(res_mem); hcd->rsrc_len = resource_size(res_mem);
@ -76,7 +70,7 @@ Index: linux-3.10.1/drivers/usb/host/ehci-platform.c
hcd->regs = devm_ioremap_resource(&dev->dev, res_mem); hcd->regs = devm_ioremap_resource(&dev->dev, res_mem);
if (IS_ERR(hcd->regs)) { if (IS_ERR(hcd->regs)) {
err = PTR_ERR(hcd->regs); err = PTR_ERR(hcd->regs);
@@ -155,6 +166,9 @@ @@ -155,6 +166,9 @@ static int ehci_platform_remove(struct p
if (pdata == &ehci_platform_defaults) if (pdata == &ehci_platform_defaults)
dev->dev.platform_data = NULL; dev->dev.platform_data = NULL;
@ -86,7 +80,7 @@ Index: linux-3.10.1/drivers/usb/host/ehci-platform.c
return 0; return 0;
} }
@@ -199,9 +213,8 @@ @@ -199,9 +213,8 @@ static int ehci_platform_resume(struct d
#define ehci_platform_resume NULL #define ehci_platform_resume NULL
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
@ -98,7 +92,7 @@ Index: linux-3.10.1/drivers/usb/host/ehci-platform.c
{} {}
}; };
@@ -225,7 +238,7 @@ @@ -225,7 +238,7 @@ static struct platform_driver ehci_platf
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "ehci-platform", .name = "ehci-platform",
.pm = &ehci_platform_pm_ops, .pm = &ehci_platform_pm_ops,
@ -107,10 +101,8 @@ Index: linux-3.10.1/drivers/usb/host/ehci-platform.c
} }
}; };
Index: linux-3.10.1/drivers/usb/host/ohci-platform.c --- a/drivers/usb/host/ohci-platform.c
=================================================================== +++ b/drivers/usb/host/ohci-platform.c
--- linux-3.10.1.orig/drivers/usb/host/ohci-platform.c 2013-07-13 20:42:41.000000000 +0200
+++ linux-3.10.1/drivers/usb/host/ohci-platform.c 2013-07-15 19:55:15.913378428 +0200
@@ -16,6 +16,10 @@ @@ -16,6 +16,10 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
@ -122,7 +114,7 @@ Index: linux-3.10.1/drivers/usb/host/ohci-platform.c
static int ohci_platform_reset(struct usb_hcd *hcd) static int ohci_platform_reset(struct usb_hcd *hcd)
{ {
@@ -88,14 +92,22 @@ @@ -88,14 +92,22 @@ static int ohci_platform_probe(struct pl
{ {
struct usb_hcd *hcd; struct usb_hcd *hcd;
struct resource *res_mem; struct resource *res_mem;
@ -150,7 +142,7 @@ Index: linux-3.10.1/drivers/usb/host/ohci-platform.c
if (usb_disabled()) if (usb_disabled())
return -ENODEV; return -ENODEV;
@@ -128,6 +140,12 @@ @@ -128,6 +140,12 @@ static int ohci_platform_probe(struct pl
hcd->rsrc_start = res_mem->start; hcd->rsrc_start = res_mem->start;
hcd->rsrc_len = resource_size(res_mem); hcd->rsrc_len = resource_size(res_mem);
@ -163,7 +155,7 @@ Index: linux-3.10.1/drivers/usb/host/ohci-platform.c
hcd->regs = devm_ioremap_resource(&dev->dev, res_mem); hcd->regs = devm_ioremap_resource(&dev->dev, res_mem);
if (IS_ERR(hcd->regs)) { if (IS_ERR(hcd->regs)) {
err = PTR_ERR(hcd->regs); err = PTR_ERR(hcd->regs);
@@ -162,6 +180,9 @@ @@ -162,6 +180,9 @@ static int ohci_platform_remove(struct p
if (pdata->power_off) if (pdata->power_off)
pdata->power_off(dev); pdata->power_off(dev);
@ -173,7 +165,7 @@ Index: linux-3.10.1/drivers/usb/host/ohci-platform.c
return 0; return 0;
} }
@@ -201,6 +222,11 @@ @@ -201,6 +222,11 @@ static int ohci_platform_resume(struct d
#define ohci_platform_resume NULL #define ohci_platform_resume NULL
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
@ -185,7 +177,7 @@ Index: linux-3.10.1/drivers/usb/host/ohci-platform.c
static const struct platform_device_id ohci_platform_table[] = { static const struct platform_device_id ohci_platform_table[] = {
{ "ohci-platform", 0 }, { "ohci-platform", 0 },
{ } { }
@@ -221,5 +247,6 @@ @@ -221,5 +247,6 @@ static struct platform_driver ohci_platf
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "ohci-platform", .name = "ohci-platform",
.pm = &ohci_platform_pm_ops, .pm = &ohci_platform_pm_ops,

7
target/linux/ramips/patches-3.10/0020-serial-ralink-adds-mt7620-serial.patch
View File

@ -10,11 +10,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
drivers/tty/serial/8250/Kconfig | 2 +- drivers/tty/serial/8250/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig
index 80fe91e..f6d6820 100644
--- a/drivers/tty/serial/8250/Kconfig --- a/drivers/tty/serial/8250/Kconfig
+++ b/drivers/tty/serial/8250/Kconfig +++ b/drivers/tty/serial/8250/Kconfig
@@ -296,7 +296,7 @@ config SERIAL_8250_EM @@ -300,7 +300,7 @@ config SERIAL_8250_EM
config SERIAL_8250_RT288X config SERIAL_8250_RT288X
bool "Ralink RT288x/RT305x/RT3662/RT3883 serial port support" bool "Ralink RT288x/RT305x/RT3662/RT3883 serial port support"
@ -23,6 +21,3 @@ index 80fe91e..f6d6820 100644
help help
If you have a Ralink RT288x/RT305x SoC based board and want to use the If you have a Ralink RT288x/RT305x SoC based board and want to use the
serial port, say Y to this option. The driver can handle up to 2 serial serial port, say Y to this option. The driver can handle up to 2 serial
--
1.7.10.4

7
target/linux/ramips/patches-3.10/0021-serial-of-allow-au1x00-and-rt288x-to-load-from-OF.patch
View File

@ -11,11 +11,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
drivers/tty/serial/of_serial.c | 5 ++++- drivers/tty/serial/of_serial.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-) 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c
index 39c7ea4..0f333f3 100644
--- a/drivers/tty/serial/of_serial.c --- a/drivers/tty/serial/of_serial.c
+++ b/drivers/tty/serial/of_serial.c +++ b/drivers/tty/serial/of_serial.c
@@ -103,7 +103,10 @@ static int of_platform_serial_setup(struct platform_device *ofdev, @@ -103,7 +103,10 @@ static int of_platform_serial_setup(stru
port->fifosize = prop; port->fifosize = prop;
port->irq = irq_of_parse_and_map(np, 0); port->irq = irq_of_parse_and_map(np, 0);
@ -27,6 +25,3 @@ index 39c7ea4..0f333f3 100644
if (of_property_read_u32(np, "reg-io-width", &prop) == 0) { if (of_property_read_u32(np, "reg-io-width", &prop) == 0) {
switch (prop) { switch (prop) {
case 1: case 1:
--
1.7.10.4

14
target/linux/ramips/patches-3.10/0022-clocksource-MIPS-ralink-add-support-for-systick-time.patch
View File

@ -14,8 +14,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
5 files changed, 172 insertions(+) 5 files changed, 172 insertions(+)
create mode 100644 drivers/clocksource/cevt-rt3352.c create mode 100644 drivers/clocksource/cevt-rt3352.c
diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
index 8f49ed7..f5d97b8 100644
--- a/arch/mips/ralink/Kconfig --- a/arch/mips/ralink/Kconfig
+++ b/arch/mips/ralink/Kconfig +++ b/arch/mips/ralink/Kconfig
@@ -15,6 +15,7 @@ choice @@ -15,6 +15,7 @@ choice
@ -34,8 +32,6 @@ index 8f49ed7..f5d97b8 100644
endchoice endchoice
diff --git a/arch/mips/ralink/clk.c b/arch/mips/ralink/clk.c
index 8dfa22f..bba0cdf 100644
--- a/arch/mips/ralink/clk.c --- a/arch/mips/ralink/clk.c
+++ b/arch/mips/ralink/clk.c +++ b/arch/mips/ralink/clk.c
@@ -69,4 +69,5 @@ void __init plat_time_init(void) @@ -69,4 +69,5 @@ void __init plat_time_init(void)
@ -44,8 +40,6 @@ index 8dfa22f..bba0cdf 100644
clk_put(clk); clk_put(clk);
+ clocksource_of_init(); + clocksource_of_init();
} }
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index f151c6c..0e58a49 100644
--- a/drivers/clocksource/Kconfig --- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig
@@ -7,6 +7,12 @@ config CLKSRC_I8253 @@ -7,6 +7,12 @@ config CLKSRC_I8253
@ -61,8 +55,6 @@ index f151c6c..0e58a49 100644
config I8253_LOCK config I8253_LOCK
bool bool
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
index 8d979c7..423a2ef 100644
--- a/drivers/clocksource/Makefile --- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_SH_TIMER_TMU) += sh_tmu.o @@ -10,6 +10,7 @@ obj-$(CONFIG_SH_TIMER_TMU) += sh_tmu.o
@ -73,9 +65,6 @@ index 8d979c7..423a2ef 100644
obj-$(CONFIG_DW_APB_TIMER) += dw_apb_timer.o obj-$(CONFIG_DW_APB_TIMER) += dw_apb_timer.o
obj-$(CONFIG_DW_APB_TIMER_OF) += dw_apb_timer_of.o obj-$(CONFIG_DW_APB_TIMER_OF) += dw_apb_timer_of.o
obj-$(CONFIG_CLKSRC_NOMADIK_MTU) += nomadik-mtu.o obj-$(CONFIG_CLKSRC_NOMADIK_MTU) += nomadik-mtu.o
diff --git a/drivers/clocksource/cevt-rt3352.c b/drivers/clocksource/cevt-rt3352.c
new file mode 100644
index 0000000..bd50edd
--- /dev/null --- /dev/null
+++ b/drivers/clocksource/cevt-rt3352.c +++ b/drivers/clocksource/cevt-rt3352.c
@@ -0,0 +1,162 @@ @@ -0,0 +1,162 @@
@ -241,6 +230,3 @@ index 0000000..bd50edd
+} +}
+ +
+CLOCKSOURCE_OF_DECLARE(systick, "ralink,cevt-systick", ralink_systick_init); +CLOCKSOURCE_OF_DECLARE(systick, "ralink,cevt-systick", ralink_systick_init);
--
1.7.10.4

17
target/linux/ramips/patches-3.10/0023-GPIO-MIPS-ralink-adds-ralink-gpio-support.patch
View File

@ -17,8 +17,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
create mode 100644 arch/mips/include/asm/mach-ralink/gpio.h create mode 100644 arch/mips/include/asm/mach-ralink/gpio.h
create mode 100644 drivers/gpio/gpio-ralink.c create mode 100644 drivers/gpio/gpio-ralink.c
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 7a58ab9..5737c4b 100644
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -443,6 +443,7 @@ config RALINK @@ -443,6 +443,7 @@ config RALINK
@ -29,9 +27,6 @@ index 7a58ab9..5737c4b 100644
config SGI_IP22 config SGI_IP22
bool "SGI IP22 (Indy/Indigo2)" bool "SGI IP22 (Indy/Indigo2)"
diff --git a/arch/mips/include/asm/mach-ralink/gpio.h b/arch/mips/include/asm/mach-ralink/gpio.h
new file mode 100644
index 0000000..f68ee16
--- /dev/null --- /dev/null
+++ b/arch/mips/include/asm/mach-ralink/gpio.h +++ b/arch/mips/include/asm/mach-ralink/gpio.h
@@ -0,0 +1,24 @@ @@ -0,0 +1,24 @@
@ -59,8 +54,6 @@ index 0000000..f68ee16
+#define gpio_to_irq __gpio_to_irq +#define gpio_to_irq __gpio_to_irq
+ +
+#endif /* __ASM_MACH_RALINK_GPIO_H */ +#endif /* __ASM_MACH_RALINK_GPIO_H */
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 573c449..4f2f7c2 100644
--- a/drivers/gpio/Kconfig --- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig
@@ -209,6 +209,12 @@ config GPIO_RCAR @@ -209,6 +209,12 @@ config GPIO_RCAR
@ -76,11 +69,9 @@ index 573c449..4f2f7c2 100644
config GPIO_SPEAR_SPICS config GPIO_SPEAR_SPICS
bool "ST SPEAr13xx SPI Chip Select as GPIO support" bool "ST SPEAr13xx SPI Chip Select as GPIO support"
depends on PLAT_SPEAR depends on PLAT_SPEAR
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 0cb2d65..feb9647 100644
--- a/drivers/gpio/Makefile --- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile
@@ -56,6 +56,7 @@ obj-$(CONFIG_GPIO_PCF857X) += gpio-pcf857x.o @@ -56,6 +56,7 @@ obj-$(CONFIG_GPIO_PCF857X) += gpio-pcf85
obj-$(CONFIG_GPIO_PCH) += gpio-pch.o obj-$(CONFIG_GPIO_PCH) += gpio-pch.o
obj-$(CONFIG_GPIO_PL061) += gpio-pl061.o obj-$(CONFIG_GPIO_PL061) += gpio-pl061.o
obj-$(CONFIG_GPIO_PXA) += gpio-pxa.o obj-$(CONFIG_GPIO_PXA) += gpio-pxa.o
@ -88,9 +79,6 @@ index 0cb2d65..feb9647 100644
obj-$(CONFIG_GPIO_RC5T583) += gpio-rc5t583.o obj-$(CONFIG_GPIO_RC5T583) += gpio-rc5t583.o
obj-$(CONFIG_GPIO_RDC321X) += gpio-rdc321x.o obj-$(CONFIG_GPIO_RDC321X) += gpio-rdc321x.o
obj-$(CONFIG_GPIO_RCAR) += gpio-rcar.o obj-$(CONFIG_GPIO_RCAR) += gpio-rcar.o
diff --git a/drivers/gpio/gpio-ralink.c b/drivers/gpio/gpio-ralink.c
new file mode 100644
index 0000000..12984f1
--- /dev/null --- /dev/null
+++ b/drivers/gpio/gpio-ralink.c +++ b/drivers/gpio/gpio-ralink.c
@@ -0,0 +1,326 @@ @@ -0,0 +1,326 @@
@ -420,6 +408,3 @@ index 0000000..12984f1
+} +}
+ +
+subsys_initcall(ralink_gpio_init); +subsys_initcall(ralink_gpio_init);
--
1.7.10.4

14
target/linux/ramips/patches-3.10/0024-SPI-ralink-add-Ralink-SoC-spi-driver.patch
View File

@ -13,11 +13,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
3 files changed, 482 insertions(+) 3 files changed, 482 insertions(+)
create mode 100644 drivers/spi/spi-ralink.c create mode 100644 drivers/spi/spi-ralink.c
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 92a9345..30e73ea 100644
--- a/drivers/spi/Kconfig --- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig
@@ -345,6 +345,12 @@ config SPI_RSPI @@ -354,6 +354,12 @@ config SPI_RSPI
help help
SPI driver for Renesas RSPI blocks. SPI driver for Renesas RSPI blocks.
@ -30,11 +28,9 @@ index 92a9345..30e73ea 100644
config SPI_S3C24XX config SPI_S3C24XX
tristate "Samsung S3C24XX series SPI" tristate "Samsung S3C24XX series SPI"
depends on ARCH_S3C24XX depends on ARCH_S3C24XX
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 33f9c09..724e8de1 100644
--- a/drivers/spi/Makefile --- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile +++ b/drivers/spi/Makefile
@@ -55,6 +55,7 @@ spi-pxa2xx-platform-$(CONFIG_SPI_PXA2XX_DMA) += spi-pxa2xx-dma.o @@ -56,6 +56,7 @@ spi-pxa2xx-platform-$(CONFIG_SPI_PXA2XX_
obj-$(CONFIG_SPI_PXA2XX) += spi-pxa2xx-platform.o obj-$(CONFIG_SPI_PXA2XX) += spi-pxa2xx-platform.o
obj-$(CONFIG_SPI_PXA2XX_PCI) += spi-pxa2xx-pci.o obj-$(CONFIG_SPI_PXA2XX_PCI) += spi-pxa2xx-pci.o
obj-$(CONFIG_SPI_RSPI) += spi-rspi.o obj-$(CONFIG_SPI_RSPI) += spi-rspi.o
@ -42,9 +38,6 @@ index 33f9c09..724e8de1 100644
obj-$(CONFIG_SPI_S3C24XX) += spi-s3c24xx-hw.o obj-$(CONFIG_SPI_S3C24XX) += spi-s3c24xx-hw.o
spi-s3c24xx-hw-y := spi-s3c24xx.o spi-s3c24xx-hw-y := spi-s3c24xx.o
spi-s3c24xx-hw-$(CONFIG_SPI_S3C24XX_FIQ) += spi-s3c24xx-fiq.o spi-s3c24xx-hw-$(CONFIG_SPI_S3C24XX_FIQ) += spi-s3c24xx-fiq.o
diff --git a/drivers/spi/spi-ralink.c b/drivers/spi/spi-ralink.c
new file mode 100644
index 0000000..b07cbaa
--- /dev/null --- /dev/null
+++ b/drivers/spi/spi-ralink.c +++ b/drivers/spi/spi-ralink.c
@@ -0,0 +1,475 @@ @@ -0,0 +1,475 @@
@ -523,6 +516,3 @@ index 0000000..b07cbaa
+MODULE_AUTHOR("Sergiy <piratfm@gmail.com>"); +MODULE_AUTHOR("Sergiy <piratfm@gmail.com>");
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>"); +MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
--
1.7.10.4

12
target/linux/ramips/patches-3.10/0025-watchdog-adds-ralink-wdt.patch
View File

@ -14,8 +14,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
4 files changed, 216 insertions(+) 4 files changed, 216 insertions(+)
create mode 100644 drivers/watchdog/rt2880_wdt.c create mode 100644 drivers/watchdog/rt2880_wdt.c
diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c
index 6f6b1c8..14c28b0 100644
--- a/arch/mips/ralink/mt7620.c --- a/arch/mips/ralink/mt7620.c
+++ b/arch/mips/ralink/mt7620.c +++ b/arch/mips/ralink/mt7620.c
@@ -182,6 +182,7 @@ void __init ralink_clk_init(void) @@ -182,6 +182,7 @@ void __init ralink_clk_init(void)
@ -26,8 +24,6 @@ index 6f6b1c8..14c28b0 100644
ralink_clk_add("10000500.uart", 40000000); ralink_clk_add("10000500.uart", 40000000);
ralink_clk_add("10000b00.spi", 40000000); ralink_clk_add("10000b00.spi", 40000000);
ralink_clk_add("10000c00.uartlite", 40000000); ralink_clk_add("10000c00.uartlite", 40000000);
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index e89fc31..5e34760 100644
--- a/drivers/watchdog/Kconfig --- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig
@@ -1104,6 +1104,13 @@ config LANTIQ_WDT @@ -1104,6 +1104,13 @@ config LANTIQ_WDT
@ -44,8 +40,6 @@ index e89fc31..5e34760 100644
# PARISC Architecture # PARISC Architecture
# POWERPC Architecture # POWERPC Architecture
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index a300b94..2681e3d 100644
--- a/drivers/watchdog/Makefile --- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile
@@ -134,6 +134,7 @@ obj-$(CONFIG_TXX9_WDT) += txx9wdt.o @@ -134,6 +134,7 @@ obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
@ -56,9 +50,6 @@ index a300b94..2681e3d 100644
# PARISC Architecture # PARISC Architecture
diff --git a/drivers/watchdog/rt2880_wdt.c b/drivers/watchdog/rt2880_wdt.c
new file mode 100644
index 0000000..ebba535
--- /dev/null --- /dev/null
+++ b/drivers/watchdog/rt2880_wdt.c +++ b/drivers/watchdog/rt2880_wdt.c
@@ -0,0 +1,207 @@ @@ -0,0 +1,207 @@
@ -269,6 +260,3 @@ index 0000000..ebba535
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org"); +MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org");
+MODULE_LICENSE("GPL v2"); +MODULE_LICENSE("GPL v2");
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); +MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
--
1.7.10.4

13
target/linux/ramips/patches-3.10/0026-i2c-MIPS-adds-ralink-I2C-driver.patch
View File

@ -13,9 +13,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
create mode 100644 Documentation/devicetree/bindings/i2c/i2c-ralink.txt create mode 100644 Documentation/devicetree/bindings/i2c/i2c-ralink.txt
create mode 100644 drivers/i2c/busses/i2c-ralink.c create mode 100644 drivers/i2c/busses/i2c-ralink.c
diff --git a/Documentation/devicetree/bindings/i2c/i2c-ralink.txt b/Documentation/devicetree/bindings/i2c/i2c-ralink.txt
new file mode 100644
index 0000000..8fa8ac3
--- /dev/null --- /dev/null
+++ b/Documentation/devicetree/bindings/i2c/i2c-ralink.txt +++ b/Documentation/devicetree/bindings/i2c/i2c-ralink.txt
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
@ -46,8 +43,6 @@ index 0000000..8fa8ac3
+ }; + };
+ }; + };
+}; +};
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 631736e..e2c2381 100644
--- a/drivers/i2c/busses/Kconfig --- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig
@@ -628,6 +628,10 @@ config I2C_PXA_SLAVE @@ -628,6 +628,10 @@ config I2C_PXA_SLAVE
@ -61,8 +56,6 @@ index 631736e..e2c2381 100644
config HAVE_S3C2410_I2C config HAVE_S3C2410_I2C
bool bool
help help
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
index 8f4fc23..7e39a13 100644
--- a/drivers/i2c/busses/Makefile --- a/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile
@@ -62,6 +62,7 @@ obj-$(CONFIG_I2C_PNX) += i2c-pnx.o @@ -62,6 +62,7 @@ obj-$(CONFIG_I2C_PNX) += i2c-pnx.o
@ -73,9 +66,6 @@ index 8f4fc23..7e39a13 100644
obj-$(CONFIG_I2C_S3C2410) += i2c-s3c2410.o obj-$(CONFIG_I2C_S3C2410) += i2c-s3c2410.o
obj-$(CONFIG_I2C_S6000) += i2c-s6000.o obj-$(CONFIG_I2C_S6000) += i2c-s6000.o
obj-$(CONFIG_I2C_SH7760) += i2c-sh7760.o obj-$(CONFIG_I2C_SH7760) += i2c-sh7760.o
diff --git a/drivers/i2c/busses/i2c-ralink.c b/drivers/i2c/busses/i2c-ralink.c
new file mode 100644
index 0000000..f4dc13d
--- /dev/null --- /dev/null
+++ b/drivers/i2c/busses/i2c-ralink.c +++ b/drivers/i2c/busses/i2c-ralink.c
@@ -0,0 +1,274 @@ @@ -0,0 +1,274 @@
@ -353,6 +343,3 @@ index 0000000..f4dc13d
+MODULE_DESCRIPTION("Ralink I2c host driver"); +MODULE_DESCRIPTION("Ralink I2c host driver");
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:Ralink-I2C"); +MODULE_ALIAS("platform:Ralink-I2C");
--
1.7.10.4

15
target/linux/ramips/patches-3.10/0027-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
View File

@ -13,8 +13,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
create mode 100644 drivers/mmc/host/mt6575_sd.h create mode 100644 drivers/mmc/host/mt6575_sd.h
create mode 100644 drivers/mmc/host/sdhci-mt7620.c create mode 100644 drivers/mmc/host/sdhci-mt7620.c
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 9ab8f8d..ef6bf59 100644
--- a/drivers/mmc/host/Kconfig --- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig
@@ -260,6 +260,17 @@ config MMC_SDHCI_BCM2835 @@ -260,6 +260,17 @@ config MMC_SDHCI_BCM2835
@ -35,11 +33,9 @@ index 9ab8f8d..ef6bf59 100644
config MMC_OMAP config MMC_OMAP
tristate "TI OMAP Multimedia Card Interface support" tristate "TI OMAP Multimedia Card Interface support"
depends on ARCH_OMAP depends on ARCH_OMAP
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
index cd32280..c800bed 100644
--- a/drivers/mmc/host/Makefile --- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile
@@ -61,6 +61,7 @@ obj-$(CONFIG_MMC_SDHCI_TEGRA) += sdhci-tegra.o @@ -62,6 +62,7 @@ obj-$(CONFIG_MMC_SDHCI_TEGRA) += sdhci-
obj-$(CONFIG_MMC_SDHCI_OF_ESDHC) += sdhci-of-esdhc.o obj-$(CONFIG_MMC_SDHCI_OF_ESDHC) += sdhci-of-esdhc.o
obj-$(CONFIG_MMC_SDHCI_OF_HLWD) += sdhci-of-hlwd.o obj-$(CONFIG_MMC_SDHCI_OF_HLWD) += sdhci-of-hlwd.o
obj-$(CONFIG_MMC_SDHCI_BCM2835) += sdhci-bcm2835.o obj-$(CONFIG_MMC_SDHCI_BCM2835) += sdhci-bcm2835.o
@ -47,9 +43,6 @@ index cd32280..c800bed 100644
ifeq ($(CONFIG_CB710_DEBUG),y) ifeq ($(CONFIG_CB710_DEBUG),y)
CFLAGS-cb710-mmc += -DDEBUG CFLAGS-cb710-mmc += -DDEBUG
diff --git a/drivers/mmc/host/mt6575_sd.h b/drivers/mmc/host/mt6575_sd.h
new file mode 100644
index 0000000..406382c
--- /dev/null --- /dev/null
+++ b/drivers/mmc/host/mt6575_sd.h +++ b/drivers/mmc/host/mt6575_sd.h
@@ -0,0 +1,1068 @@ @@ -0,0 +1,1068 @@
@ -1121,9 +1114,6 @@ index 0000000..406382c
+ +
+#endif +#endif
+ +
diff --git a/drivers/mmc/host/sdhci-mt7620.c b/drivers/mmc/host/sdhci-mt7620.c
new file mode 100644
index 0000000..a3cb5e4
--- /dev/null --- /dev/null
+++ b/drivers/mmc/host/sdhci-mt7620.c +++ b/drivers/mmc/host/sdhci-mt7620.c
@@ -0,0 +1,2314 @@ @@ -0,0 +1,2314 @@
@ -3441,6 +3431,3 @@ index 0000000..a3cb5e4
+MODULE_AUTHOR("Infinity Chen <infinity.chen@mediatek.com>"); +MODULE_AUTHOR("Infinity Chen <infinity.chen@mediatek.com>");
+ +
+EXPORT_SYMBOL(msdc_6575_host); +EXPORT_SYMBOL(msdc_6575_host);
--
1.7.10.4

9
target/linux/ramips/patches-3.10/0028-reset-MIPS-ralink-add-core-device-reset-wrapper.patch
View File

@ -12,8 +12,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
arch/mips/ralink/reset.c | 1 + arch/mips/ralink/reset.c | 1 +
3 files changed, 61 insertions(+) 3 files changed, 61 insertions(+)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 5737c4b..8258e8e 100644
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -444,6 +444,7 @@ config RALINK @@ -444,6 +444,7 @@ config RALINK
@ -24,8 +22,6 @@ index 5737c4b..8258e8e 100644
config SGI_IP22 config SGI_IP22
bool "SGI IP22 (Indy/Indigo2)" bool "SGI IP22 (Indy/Indigo2)"
diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
index 8efb02b..2faf478 100644
--- a/arch/mips/ralink/of.c --- a/arch/mips/ralink/of.c
+++ b/arch/mips/ralink/of.c +++ b/arch/mips/ralink/of.c
@@ -14,16 +14,22 @@ @@ -14,16 +14,22 @@
@ -118,8 +114,6 @@ index 8efb02b..2faf478 100644
ralink_pinmux(); ralink_pinmux();
return 0; return 0;
diff --git a/arch/mips/ralink/reset.c b/arch/mips/ralink/reset.c
index 22120e5..6c15f4f 100644
--- a/arch/mips/ralink/reset.c --- a/arch/mips/ralink/reset.c
+++ b/arch/mips/ralink/reset.c +++ b/arch/mips/ralink/reset.c
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
@ -130,6 +124,3 @@ index 22120e5..6c15f4f 100644
#include <asm/reboot.h> #include <asm/reboot.h>
--
1.7.10.4

33
target/linux/ramips/patches-3.10/0029-owrt-GPIO-add-gpio_export_with_name.patch
View File

@ -14,8 +14,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
include/linux/gpio.h | 26 ++++++++- include/linux/gpio.h | 26 ++++++++-
5 files changed, 172 insertions(+), 12 deletions(-) 5 files changed, 172 insertions(+), 12 deletions(-)
diff --git a/Documentation/devicetree/bindings/gpio/gpio.txt b/Documentation/devicetree/bindings/gpio/gpio.txt
index d933af3..c264748 100644
--- a/Documentation/devicetree/bindings/gpio/gpio.txt --- a/Documentation/devicetree/bindings/gpio/gpio.txt
+++ b/Documentation/devicetree/bindings/gpio/gpio.txt +++ b/Documentation/devicetree/bindings/gpio/gpio.txt
@@ -112,3 +112,63 @@ where, @@ -112,3 +112,63 @@ where,
@ -82,8 +80,6 @@ index d933af3..c264748 100644
+ gpio-export,output = <1>; + gpio-export,output = <1>;
+ }; + };
+}; +};
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
index 665f953..15ec5e5 100644
--- a/drivers/gpio/gpiolib-of.c --- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c
@@ -21,6 +21,8 @@ @@ -21,6 +21,8 @@
@ -95,7 +91,7 @@ index 665f953..15ec5e5 100644
/* Private data structure for of_gpiochip_find_and_xlate */ /* Private data structure for of_gpiochip_find_and_xlate */
struct gg_data { struct gg_data {
@@ -242,3 +244,69 @@ void of_gpiochip_remove(struct gpio_chip *chip) @@ -242,3 +244,69 @@ void of_gpiochip_remove(struct gpio_chip
if (chip->of_node) if (chip->of_node)
of_node_put(chip->of_node); of_node_put(chip->of_node);
} }
@ -165,11 +161,9 @@ index 665f953..15ec5e5 100644
+ return platform_driver_probe(&gpio_export_driver, of_gpio_export_probe); + return platform_driver_probe(&gpio_export_driver, of_gpio_export_probe);
+} +}
+device_initcall(of_gpio_export_init); +device_initcall(of_gpio_export_init);
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index c2534d6..8697c82 100644
--- a/drivers/gpio/gpiolib.c --- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c
@@ -96,7 +96,7 @@ static int gpiod_get_value(const struct gpio_desc *desc); @@ -96,7 +96,7 @@ static int gpiod_get_value(const struct
static void gpiod_set_value(struct gpio_desc *desc, int value); static void gpiod_set_value(struct gpio_desc *desc, int value);
static int gpiod_cansleep(const struct gpio_desc *desc); static int gpiod_cansleep(const struct gpio_desc *desc);
static int gpiod_to_irq(const struct gpio_desc *desc); static int gpiod_to_irq(const struct gpio_desc *desc);
@ -178,7 +172,7 @@ index c2534d6..8697c82 100644
static int gpiod_export_link(struct device *dev, const char *name, static int gpiod_export_link(struct device *dev, const char *name,
struct gpio_desc *desc); struct gpio_desc *desc);
static int gpiod_sysfs_set_active_low(struct gpio_desc *desc, int value); static int gpiod_sysfs_set_active_low(struct gpio_desc *desc, int value);
@@ -674,7 +674,7 @@ static ssize_t export_store(struct class *class, @@ -674,7 +674,7 @@ static ssize_t export_store(struct class
status = -ENODEV; status = -ENODEV;
goto done; goto done;
} }
@ -208,7 +202,7 @@ index c2534d6..8697c82 100644
{ {
unsigned long flags; unsigned long flags;
int status; int status;
@@ -783,6 +784,8 @@ static int gpiod_export(struct gpio_desc *desc, bool direction_may_change) @@ -783,6 +784,8 @@ static int gpiod_export(struct gpio_desc
goto fail_unlock; goto fail_unlock;
} }
@ -232,7 +226,7 @@ index c2534d6..8697c82 100644
static int match_export(struct device *dev, const void *data) static int match_export(struct device *dev, const void *data)
{ {
@@ -1092,7 +1095,7 @@ static inline void gpiochip_unexport(struct gpio_chip *chip) @@ -1092,7 +1095,7 @@ static inline void gpiochip_unexport(str
} }
static inline int gpiod_export(struct gpio_desc *desc, static inline int gpiod_export(struct gpio_desc *desc,
@ -241,7 +235,7 @@ index c2534d6..8697c82 100644
{ {
return -ENOSYS; return -ENOSYS;
} }
@@ -1521,6 +1524,9 @@ int gpio_request_one(unsigned gpio, unsigned long flags, const char *label) @@ -1521,6 +1524,9 @@ int gpio_request_one(unsigned gpio, unsi
if (flags & GPIOF_OPEN_SOURCE) if (flags & GPIOF_OPEN_SOURCE)
set_bit(FLAG_OPEN_SOURCE, &desc->flags); set_bit(FLAG_OPEN_SOURCE, &desc->flags);
@ -251,7 +245,7 @@ index c2534d6..8697c82 100644
if (flags & GPIOF_DIR_IN) if (flags & GPIOF_DIR_IN)
err = gpiod_direction_input(desc); err = gpiod_direction_input(desc);
else else
@@ -1531,7 +1537,7 @@ int gpio_request_one(unsigned gpio, unsigned long flags, const char *label) @@ -1531,7 +1537,7 @@ int gpio_request_one(unsigned gpio, unsi
goto free_gpio; goto free_gpio;
if (flags & GPIOF_EXPORT) { if (flags & GPIOF_EXPORT) {
@ -260,11 +254,9 @@ index c2534d6..8697c82 100644
if (err) if (err)
goto free_gpio; goto free_gpio;
} }
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index bde6469..3290572 100644
--- a/include/asm-generic/gpio.h --- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h +++ b/include/asm-generic/gpio.h
@@ -202,7 +202,8 @@ extern void gpio_free_array(const struct gpio *array, size_t num); @@ -202,7 +202,8 @@ extern void gpio_free_array(const struct
* A sysfs interface can be exported by individual drivers if they want, * A sysfs interface can be exported by individual drivers if they want,
* but more typically is configured entirely from userspace. * but more typically is configured entirely from userspace.
*/ */
@ -284,8 +276,6 @@ index bde6469..3290572 100644
{ {
return -ENOSYS; return -ENOSYS;
} }
diff --git a/include/linux/gpio.h b/include/linux/gpio.h
index 552e3f4..07bbbcc7 100644
--- a/include/linux/gpio.h --- a/include/linux/gpio.h
+++ b/include/linux/gpio.h +++ b/include/linux/gpio.h
@@ -27,6 +27,9 @@ @@ -27,6 +27,9 @@
@ -298,7 +288,7 @@ index 552e3f4..07bbbcc7 100644
/** /**
* struct gpio - a structure describing a GPIO with configuration * struct gpio - a structure describing a GPIO with configuration
* @gpio: the GPIO number * @gpio: the GPIO number
@@ -169,7 +172,8 @@ static inline void gpio_set_value_cansleep(unsigned gpio, int value) @@ -169,7 +172,8 @@ static inline void gpio_set_value_cansle
WARN_ON(1); WARN_ON(1);
} }
@ -308,7 +298,7 @@ index 552e3f4..07bbbcc7 100644
{ {
/* GPIO can never have been requested or set as {in,out}put */ /* GPIO can never have been requested or set as {in,out}put */
WARN_ON(1); WARN_ON(1);
@@ -236,4 +240,24 @@ int devm_gpio_request_one(struct device *dev, unsigned gpio, @@ -236,4 +240,24 @@ int devm_gpio_request_one(struct device
unsigned long flags, const char *label); unsigned long flags, const char *label);
void devm_gpio_free(struct device *dev, unsigned int gpio); void devm_gpio_free(struct device *dev, unsigned int gpio);
@ -333,6 +323,3 @@ index 552e3f4..07bbbcc7 100644
+} +}
+ +
#endif /* __LINUX_GPIO_H */ #endif /* __LINUX_GPIO_H */
--
1.7.10.4

17
target/linux/ramips/patches-3.10/0030-owrt-MIPS-ralink-add-pseudo-pwm-led-trigger-based-on.patch
View File

@ -9,8 +9,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
arch/mips/ralink/timer.c | 213 ++++++++++++++++++++++++++++++++++++++++++---- arch/mips/ralink/timer.c | 213 ++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 197 insertions(+), 16 deletions(-) 1 file changed, 197 insertions(+), 16 deletions(-)
diff --git a/arch/mips/ralink/timer.c b/arch/mips/ralink/timer.c
index 0a6856c..b156419 100644
--- a/arch/mips/ralink/timer.c --- a/arch/mips/ralink/timer.c
+++ b/arch/mips/ralink/timer.c +++ b/arch/mips/ralink/timer.c
@@ -12,6 +12,8 @@ @@ -12,6 +12,8 @@
@ -63,7 +61,7 @@ index 0a6856c..b156419 100644
}; };
static inline void rt_timer_w32(struct rt_timer *rt, u8 reg, u32 val) static inline void rt_timer_w32(struct rt_timer *rt, u8 reg, u32 val)
@@ -48,18 +68,46 @@ static inline u32 rt_timer_r32(struct rt_timer *rt, u8 reg) @@ -48,18 +68,46 @@ static inline u32 rt_timer_r32(struct rt
static irqreturn_t rt_timer_irq(int irq, void *_rt) static irqreturn_t rt_timer_irq(int irq, void *_rt)
{ {
struct rt_timer *rt = (struct rt_timer *) _rt; struct rt_timer *rt = (struct rt_timer *) _rt;
@ -114,7 +112,7 @@ index 0a6856c..b156419 100644
if (err) { if (err) {
dev_err(rt->dev, "failed to request irq\n"); dev_err(rt->dev, "failed to request irq\n");
} else { } else {
@@ -81,8 +129,6 @@ static int rt_timer_config(struct rt_timer *rt, unsigned long divisor) @@ -81,8 +129,6 @@ static int rt_timer_config(struct rt_tim
else else
rt->timer_div = divisor; rt->timer_div = divisor;
@ -123,7 +121,7 @@ index 0a6856c..b156419 100644
return 0; return 0;
} }
@@ -108,11 +154,128 @@ static void rt_timer_disable(struct rt_timer *rt) @@ -108,11 +154,128 @@ static void rt_timer_disable(struct rt_t
rt_timer_w32(rt, TIMER_REG_TMR0CTL, t); rt_timer_w32(rt, TIMER_REG_TMR0CTL, t);
} }
@ -252,7 +250,7 @@ index 0a6856c..b156419 100644
if (!res) { if (!res) {
dev_err(&pdev->dev, "no memory resource found\n"); dev_err(&pdev->dev, "no memory resource found\n");
@@ -147,12 +310,29 @@ static int rt_timer_probe(struct platform_device *pdev) @@ -147,12 +310,29 @@ static int rt_timer_probe(struct platfor
if (!rt->timer_freq) if (!rt->timer_freq)
return -EINVAL; return -EINVAL;
@ -285,7 +283,7 @@ index 0a6856c..b156419 100644
dev_info(&pdev->dev, "maximum frequncy is %luHz\n", rt->timer_freq); dev_info(&pdev->dev, "maximum frequncy is %luHz\n", rt->timer_freq);
@@ -163,6 +343,7 @@ static int rt_timer_remove(struct platform_device *pdev) @@ -163,6 +343,7 @@ static int rt_timer_remove(struct platfo
{ {
struct rt_timer *rt = platform_get_drvdata(pdev); struct rt_timer *rt = platform_get_drvdata(pdev);
@ -293,7 +291,7 @@ index 0a6856c..b156419 100644
rt_timer_disable(rt); rt_timer_disable(rt);
rt_timer_free(rt); rt_timer_free(rt);
@@ -187,6 +368,6 @@ static struct platform_driver rt_timer_driver = { @@ -187,6 +368,6 @@ static struct platform_driver rt_timer_d
module_platform_driver(rt_timer_driver); module_platform_driver(rt_timer_driver);
@ -301,6 +299,3 @@ index 0a6856c..b156419 100644
+MODULE_DESCRIPTION("Ralink RT2880 timer / pseudo pwm"); +MODULE_DESCRIPTION("Ralink RT2880 timer / pseudo pwm");
MODULE_AUTHOR("John Crispin <blogic@openwrt.org"); MODULE_AUTHOR("John Crispin <blogic@openwrt.org");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
--
1.7.10.4

17
target/linux/ramips/patches-3.10/0031-owrt-MIPS-add-OWRTDTB-secion.patch
View File

@ -10,13 +10,11 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
arch/mips/ralink/of.c | 4 +++- arch/mips/ralink/of.c | 4 +++-
3 files changed, 7 insertions(+), 2 deletions(-) 3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S
index c61cdae..b4e55bb 100644
--- a/arch/mips/kernel/head.S --- a/arch/mips/kernel/head.S
+++ b/arch/mips/kernel/head.S +++ b/arch/mips/kernel/head.S
@@ -140,6 +140,9 @@ FEXPORT(__kernel_entry) @@ -146,6 +146,9 @@ EXPORT(__image_cmdline)
j kernel_entry .fill 0x400
#endif #endif /* CONFIG_IMAGE_CMDLINE_HACK */
+ .ascii "OWRTDTB:" + .ascii "OWRTDTB:"
+ EXPORT(__image_dtb) + EXPORT(__image_dtb)
@ -24,18 +22,14 @@ index c61cdae..b4e55bb 100644
__REF __REF
NESTED(kernel_entry, 16, sp) # kernel entry point NESTED(kernel_entry, 16, sp) # kernel entry point
diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile
index 03af636..9b32626 100644
--- a/arch/mips/ralink/Makefile --- a/arch/mips/ralink/Makefile
+++ b/arch/mips/ralink/Makefile +++ b/arch/mips/ralink/Makefile
@@ -19,4 +19,4 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o @@ -19,4 +19,4 @@ obj-$(CONFIG_EARLY_PRINTK) += early_prin
obj-$(CONFIG_DEBUG_FS) += bootrom.o obj-$(CONFIG_DEBUG_FS) += bootrom.o
-obj-y += dts/ -obj-y += dts/
+#obj-y += dts/ +#obj-y += dts/
diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
index 2faf478..d87222f 100644
--- a/arch/mips/ralink/of.c --- a/arch/mips/ralink/of.c
+++ b/arch/mips/ralink/of.c +++ b/arch/mips/ralink/of.c
@@ -83,6 +83,8 @@ void __init device_tree_init(void) @@ -83,6 +83,8 @@ void __init device_tree_init(void)
@ -56,6 +50,3 @@ index 2faf478..d87222f 100644
if (soc_info.mem_size) if (soc_info.mem_size)
add_memory_region(soc_info.mem_base, soc_info.mem_size * SZ_1M, add_memory_region(soc_info.mem_base, soc_info.mem_size * SZ_1M,
--
1.7.10.4

9
target/linux/ramips/patches-3.10/0032-mtd-fix-cfi-cmdset-0002-erase-status-check.patch
View File

@ -7,11 +7,9 @@ Subject: [PATCH 32/33] mtd: fix cfi cmdset 0002 erase status check
drivers/mtd/chips/cfi_cmdset_0002.c | 4 ++-- drivers/mtd/chips/cfi_cmdset_0002.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index fff665d..ab8eb03 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c --- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -1956,7 +1956,7 @@ static int __xipram do_erase_chip(struct map_info *map, struct flchip *chip) @@ -1957,7 +1957,7 @@ static int __xipram do_erase_chip(struct
chip->erase_suspended = 0; chip->erase_suspended = 0;
} }
@ -20,7 +18,7 @@ index fff665d..ab8eb03 100644
break; break;
if (time_after(jiffies, timeo)) { if (time_after(jiffies, timeo)) {
@@ -2045,7 +2045,7 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip, @@ -2046,7 +2046,7 @@ static int __xipram do_erase_oneblock(st
chip->erase_suspended = 0; chip->erase_suspended = 0;
} }
@ -29,6 +27,3 @@ index fff665d..ab8eb03 100644
xip_enable(map, chip, adr); xip_enable(map, chip, adr);
break; break;
} }
--
1.7.10.4

15
target/linux/ramips/patches-3.10/0033-mtd-cfi-cmdset-0002-force-word-write.patch
View File

@ -7,8 +7,6 @@ Subject: [PATCH 33/33] mtd: cfi cmdset 0002 force word write
drivers/mtd/chips/cfi_cmdset_0002.c | 9 +++++++-- drivers/mtd/chips/cfi_cmdset_0002.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-) 1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index ab8eb03..d84668d 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c --- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
@ -30,7 +28,7 @@ index ab8eb03..d84668d 100644
static int cfi_amdstd_erase_chip(struct mtd_info *, struct erase_info *); static int cfi_amdstd_erase_chip(struct mtd_info *, struct erase_info *);
static int cfi_amdstd_erase_varsize(struct mtd_info *, struct erase_info *); static int cfi_amdstd_erase_varsize(struct mtd_info *, struct erase_info *);
static void cfi_amdstd_sync (struct mtd_info *); static void cfi_amdstd_sync (struct mtd_info *);
@@ -192,6 +194,7 @@ static void fixup_amd_bootblock(struct mtd_info *mtd) @@ -192,6 +194,7 @@ static void fixup_amd_bootblock(struct m
} }
#endif #endif
@ -38,7 +36,7 @@ index ab8eb03..d84668d 100644
static void fixup_use_write_buffers(struct mtd_info *mtd) static void fixup_use_write_buffers(struct mtd_info *mtd)
{ {
struct map_info *map = mtd->priv; struct map_info *map = mtd->priv;
@@ -201,6 +204,7 @@ static void fixup_use_write_buffers(struct mtd_info *mtd) @@ -201,6 +204,7 @@ static void fixup_use_write_buffers(stru
mtd->_write = cfi_amdstd_write_buffers; mtd->_write = cfi_amdstd_write_buffers;
} }
} }
@ -46,7 +44,7 @@ index ab8eb03..d84668d 100644
/* Atmel chips don't use the same PRI format as AMD chips */ /* Atmel chips don't use the same PRI format as AMD chips */
static void fixup_convert_atmel_pri(struct mtd_info *mtd) static void fixup_convert_atmel_pri(struct mtd_info *mtd)
@@ -1461,6 +1465,7 @@ static int cfi_amdstd_write_words(struct mtd_info *mtd, loff_t to, size_t len, @@ -1461,6 +1465,7 @@ static int cfi_amdstd_write_words(struct
/* /*
* FIXME: interleaved mode not tested, and probably not supported! * FIXME: interleaved mode not tested, and probably not supported!
*/ */
@ -54,7 +52,7 @@ index ab8eb03..d84668d 100644
static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
unsigned long adr, const u_char *buf, unsigned long adr, const u_char *buf,
int len) int len)
@@ -1584,7 +1589,6 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, @@ -1585,7 +1590,6 @@ static int __xipram do_write_buffer(stru
return ret; return ret;
} }
@ -62,7 +60,7 @@ index ab8eb03..d84668d 100644
static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len, static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
size_t *retlen, const u_char *buf) size_t *retlen, const u_char *buf)
{ {
@@ -1659,6 +1663,7 @@ static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len, @@ -1660,6 +1664,7 @@ static int cfi_amdstd_write_buffers(stru
return 0; return 0;
} }
@ -70,6 +68,3 @@ index ab8eb03..d84668d 100644
/* /*
* Wait for the flash chip to become ready to write data * Wait for the flash chip to become ready to write data
--
1.7.10.4

8
target/linux/ramips/patches-3.10/0034-mtd-split-remove-padding.patch
View File

@ -1,8 +1,6 @@
Index: linux-3.10.1/drivers/mtd/mtdpart.c --- a/drivers/mtd/mtdpart.c
=================================================================== +++ b/drivers/mtd/mtdpart.c
--- linux-3.10.1.orig/drivers/mtd/mtdpart.c 2013-07-15 11:39:25.376669514 +0200 @@ -807,10 +807,6 @@ static void split_uimage(struct mtd_info
+++ linux-3.10.1/drivers/mtd/mtdpart.c 2013-07-15 11:49:53.040684471 +0200
@@ -807,10 +807,6 @@
return; return;
len = be32_to_cpu(hdr.size) + 0x40; len = be32_to_cpu(hdr.size) + 0x40;

8
target/linux/ramips/patches-3.10/0035-USB-dwc2.patch
View File

@ -1,7 +1,5 @@
Index: linux-3.10.1/drivers/staging/dwc2/hcd.c --- a/drivers/staging/dwc2/hcd.c
=================================================================== +++ b/drivers/staging/dwc2/hcd.c
--- linux-3.10.1.orig/drivers/staging/dwc2/hcd.c 2013-07-13 20:42:41.000000000 +0200
+++ linux-3.10.1/drivers/staging/dwc2/hcd.c 2013-07-15 18:23:20.193246998 +0200
@@ -47,6 +47,7 @@ @@ -47,6 +47,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/slab.h> #include <linux/slab.h>
@ -10,7 +8,7 @@ Index: linux-3.10.1/drivers/staging/dwc2/hcd.c
#include <linux/usb/hcd.h> #include <linux/usb/hcd.h>
#include <linux/usb/ch11.h> #include <linux/usb/ch11.h>
@@ -2712,6 +2713,8 @@ @@ -2712,6 +2713,8 @@ int dwc2_hcd_init(struct dwc2_hsotg *hso
dev_dbg(hsotg->dev, "DWC OTG HCD INIT\n"); dev_dbg(hsotg->dev, "DWC OTG HCD INIT\n");

2
target/linux/realview/Makefile
View File

@ -13,7 +13,7 @@ FEATURES:=fpu ramdisk
CFLAGS:=-Os -pipe -march=armv6k -mtune=mpcore -mfloat-abi=softfp -mfpu=vfp -fno-caller-saves CFLAGS:=-Os -pipe -march=armv6k -mtune=mpcore -mfloat-abi=softfp -mfpu=vfp -fno-caller-saves
MAINTAINER:=Florian Fainelli <florian@openwrt.org> MAINTAINER:=Florian Fainelli <florian@openwrt.org>
LINUX_VERSION:=3.10.1 LINUX_VERSION:=3.10.2
DEVICE_TYPE:=developerboard DEVICE_TYPE:=developerboard